From 5e65215aac0cb48bea91aa571de6a7fe05dd0794 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 20 Mar 2007 22:23:47 +0000
Subject: [PATCH] Regenerated all .pot files. Merged .po files with .pot files.

---
 dselect/po/ChangeLog    |     6 +
 dselect/po/bs.po        |   180 +-
 dselect/po/ca.po        |   207 +-
 dselect/po/cs.po        |   203 +-
 dselect/po/da.po        |   202 +-
 dselect/po/de.po        |   333 +-
 dselect/po/dselect.pot  |   180 +-
 dselect/po/el.po        |   203 +-
 dselect/po/es.po        |   213 +-
 dselect/po/eu.po        |   206 +-
 dselect/po/fr.po        |   217 +-
 dselect/po/gl.po        |   203 +-
 dselect/po/hu.po        |   337 +-
 dselect/po/id.po        |   573 +-
 dselect/po/it.po        |   210 +-
 dselect/po/ja.po        |   209 +-
 dselect/po/ko.po        |   209 +-
 dselect/po/nb.po        |   459 +-
 dselect/po/nl.po        |   472 +-
 dselect/po/nn.po        |   203 +-
 dselect/po/pl.po        |   220 +-
 dselect/po/pt.po        |   218 +-
 dselect/po/pt_BR.po     |   207 +-
 dselect/po/ro.po        |   208 +-
 dselect/po/ru.po        |   217 +-
 dselect/po/sk.po        |   203 +-
 dselect/po/sv.po        |   452 +-
 dselect/po/tl.po        |   203 +-
 dselect/po/vi.po        |   308 +-
 dselect/po/zh_CN.po     |   204 +-
 dselect/po/zh_TW.po     |   203 +-
 man/ChangeLog           |     5 +
 man/po/de.po            |  9783 +++++++++++++------------
 man/po/dpkg-man.pot     |  6647 +++++++++--------
 man/po/es.po            | 14585 ++++++++++++++++++++------------------
 man/po/fr.po            |  8470 ++++++++++++----------
 man/po/hu.po            |  7840 ++++++++++----------
 man/po/ja.po            |  9739 +++++++++++++------------
 man/po/pl.po            |  2787 ++++----
 man/po/pt_BR.po         |  8508 +++++++++++-----------
 man/po/ru.po            |  8633 +++++++++++-----------
 man/po/sv.po            |  7421 +++++++++----------
 po/ChangeLog            |     6 +
 po/bs.po                |   770 +-
 po/ca.po                |   807 +--
 po/cs.po                |   807 +--
 po/da.po                |   910 +--
 po/de.po                |   807 +--
 po/dpkg.pot             |   766 +-
 po/dz.po                |  1593 +++--
 po/el.po                |   799 ++-
 po/es.po                |   807 +--
 po/eu.po                |   923 +--
 po/fr.po                |   807 +--
 po/gl.po                |   807 +--
 po/hu.po                |  1402 ++--
 po/id.po                |   799 ++-
 po/it.po                |  1039 +--
 po/ja.po                |  1056 +--
 po/km.po                |   854 +--
 po/ko.po                |   919 +--
 po/nb.po                |  1507 ++--
 po/ne.po                |   866 +--
 po/nl.po                |  1677 +++--
 po/nn.po                |   799 ++-
 po/pa.po                |   821 +--
 po/pl.po                |   818 +--
 po/pt.po                |   807 +--
 po/pt_BR.po             |   893 +--
 po/ro.po                |   984 +--
 po/ru.po                |   961 +--
 po/sk.po                |   894 +--
 po/sv.po                |  1507 ++--
 po/tl.po                |   799 ++-
 po/vi.po                |  1577 +++--
 po/zh_CN.po             |   807 +--
 po/zh_TW.po             |  1276 ++--
 scripts/po/ChangeLog    |     4 +
 scripts/po/ca.po        |   817 ++-
 scripts/po/dpkg-dev.pot |   801 ++-
 scripts/po/fr.po        |   814 +--
 81 files changed, 66599 insertions(+), 61594 deletions(-)

diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog
index 52aa5d56..2096bef5 100644
--- a/dselect/po/ChangeLog
+++ b/dselect/po/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-21  Guillem Jover  <guillem@debian.org>
+
+	* dselect.pot: Regenerated.
+	* *.po: Merged with dselect.pot. Formerly completed translations
+	become 276t8f1u.
+
 2006-12-31  Sunjae Park  <darehanl@gmail.com>
 
 	* ko.po: Updated to 298t.
diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 3c0b3567..cdb51146 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -125,7 +125,7 @@ msgid ""
 msgstr ""
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+msgid "Keybindings"
 msgstr ""
 
 #: dselect/baselist.cc:307
@@ -280,14 +280,14 @@ msgstr ""
 msgid "Quit without changing selected access method"
 msgstr ""
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr ""
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -316,11 +316,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr ""
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -351,11 +351,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr ""
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -376,11 +376,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -415,11 +415,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -451,11 +451,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -482,11 +482,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -510,14 +510,14 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -790,7 +790,7 @@ msgstr "Metod pristupa `%s'."
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Opis"
 
@@ -810,15 +810,15 @@ msgstr ""
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr ""
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr ""
 
@@ -1144,194 +1144,198 @@ msgid "pre-depends on"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:75
-msgid "conflicts with"
+msgid "breaks with"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:76
-msgid "provides"
+msgid "conflicts with"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:77
-msgid "replaces"
+msgid "provides"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:78
+msgid "replaces"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Oštećeni"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Novi"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Ažurirani"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Zastarjeli/lokalni"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Ažurirani"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Dostupni"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Uklonjeni"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Nepravilno instalirani paketi"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Novi dostupni paketi"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Ažurirani paketi (novija verzija je dostupna)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Zastarjeli i lokalni paketi prisutni na sistemu"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Ažurirani instalirani paketi"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Dostupni paketi (trenutno nisu instalirani)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Uklonjeni i više nedostupni paketi"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Instalirani paketi"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Uklonjeni paketi (konfiguracijske datoteke još prisutne)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Očišćeni paketi i oni koji nisu prije bili instalirani"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalirano"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Očišćeno"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr ""
 
@@ -1347,40 +1351,20 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr ""
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
-msgstr ""
-
-#: dselect/pkginfo.cc:108
-msgid "description of "
+#: dselect/pkginfo.cc:95
+msgid "Interrelationships"
 msgstr ""
 
 #: dselect/pkginfo.cc:112
-msgid "no description available."
-msgstr ""
-
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr ""
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr ""
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+msgid "No description available."
 msgstr ""
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:130
+msgid "Installed control file information"
 msgstr ""
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
+#: dselect/pkginfo.cc:146
+msgid "Available control file information"
 msgstr ""
 
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 8676e06a..e4dade9d 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-11 14:25+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -138,7 +138,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "assignacions de tecles"
 
 #: dselect/baselist.cc:307
@@ -293,14 +294,15 @@ msgstr "Selecciona el mètode d'accés actualment ressaltat"
 msgid "Quit without changing selected access method"
 msgstr "Surt sense canviar el mètode d'accés seleccionat"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Assignacions de tecles"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -361,11 +363,11 @@ msgstr ""
 "   D    deixa-ho tot en l'estat requerit          \\   repeteix la darrera "
 "cerca\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introducció a les seleccions de paquets"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -421,11 +423,11 @@ msgstr ""
 "\n"
 "Premeu <espai> per a abandonar l'ajuda i entrar ara al llistat.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introducció al navegador només lectura del llistat de paquets"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -462,11 +464,11 @@ msgstr ""
 "\n"
 "Premeu <espai> per a abandonar l'ajuda i entrar ara al llistat.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducció a la subllista de resolució de conflictes/dependències"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -529,11 +531,11 @@ msgstr ""
 "Premeu <espai> per a abandonar l'ajuda i entrar en la subllista; recordeu:\n"
 "premeu «?» per a obtindre ajuda.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Mostra, primera part: llistat de paquets i caràcters d'estat"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -596,11 +598,11 @@ msgstr ""
 "instal·lada de cada paquet (majús-V per a mostrar/amagar) i descripció\n"
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Mostra, segona part: llista ressaltada; mostra la info."
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -652,11 +654,11 @@ msgstr ""
 "tota\n"
 "  la pantalla.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introducció al mètode de selecció mostrat"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -700,14 +702,15 @@ msgstr ""
 "Una completa llista amb les combinacions de tecles es troba disponible al\n"
 "prémer «k», o des del menú d'ajuda al que s'accedeix prement «?».\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Assignacions de tecles per a la selecció del mètode"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -874,7 +877,9 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "Forma d'ús: %s [<opció> ...] [<acció> ...]\n\n"
+msgstr ""
+"Forma d'ús: %s [<opció> ...] [<acció> ...]\n"
+"\n"
 
 #: dselect/main.cc:175
 #, c-format
@@ -1028,7 +1033,7 @@ msgstr "Mètode d'accés «%s»."
 msgid "Abbrev."
 msgstr "Abreujament"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descripció"
 
@@ -1048,15 +1053,16 @@ msgstr "no s'ha pogut tornar a blocar SIGWINCH"
 msgid "getch failed"
 msgstr "getch ha fallat"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[cap]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicació de "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "No hi ha explicació disponible."
 
@@ -1391,194 +1397,198 @@ msgid "pre-depends on"
 msgstr "predepèn de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "entra en conflicte amb"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "proveeix"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "reemplaça"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "amplia"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Trencat"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nou"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Amb actualització disponible"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Obsolet/local"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Actualitzat"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Disponible"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Desinstal·lats"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Paquets mal instal·lats"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nous paquets disponibles"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Actualització disponible"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Paquets obsolets i presents en el sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paquets actualitzats, no hi ha versió més nova"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Paquets disponibles (no instal·lats actualment)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Paquets desinstal·lats que ja no estan disponibles"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Paquets instal·lats"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Paquets desinstal·lats (falta la configuració)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Paquets purgats o que no mai foren instal·lats"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instal·lat"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgats"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - llista recursiva de paquets"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecció de l'estat dels paquets"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - llistat de paquets"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (per secció)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (disp., secció)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (estat, secció)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (per prioritat)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (disp., prioritat)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (estat, prioritat)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabèticament)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (per disponibilitat)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (per estat)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- concís:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- depuració:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " concís:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " depuració:v ajuda:?"
 
@@ -1602,42 +1612,26 @@ msgstr ""
 "Podeu emprar «o» i «O» per a canviar l'ordre dels paquets llistats permetent-"
 "vos marcar els paquets per diferents classes o grups."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelacions que afecten "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelacions"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descripció de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "no hi ha cap descripció disponible."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descripció"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "info. de control actualment instal·lada"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "info. de control instal·lada per a "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versió disponible de la info. del fitxer de control"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "info. de control de la versió disponible de "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nul>"
@@ -1735,3 +1729,18 @@ msgstr "Ver.inst."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.disp."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelacions que afecten "
+
+#~ msgid "description of "
+#~ msgstr "descripció de "
+
+#~ msgid "description"
+#~ msgstr "descripció"
+
+#~ msgid "currently installed control info"
+#~ msgstr "info. de control actualment instal·lada"
+
+#~ msgid "available version of control info for "
+#~ msgstr "info. de control de la versió disponible de "
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 6e2a0a52..2acb956f 100644
--- a/dselect/po/cs.po
+++ b/dselect/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-08 13:54+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -140,7 +140,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "funkce kláves"
 
 #: dselect/baselist.cc:307
@@ -295,14 +296,15 @@ msgstr "Volba aktuálně vysvícené přístupové metody"
 msgid "Quit without changing selected access method"
 msgstr "Ukončení beze změny zvolené přístupové metody"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Funkce kláves"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -357,11 +359,11 @@ msgstr ""
 "   D     nastavení všeho žádaného stavu       n, \\  opakuje poslední "
 "hledání\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Úvod do práce se seznamem balíků"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -415,11 +417,11 @@ msgstr ""
 "\n"
 "Pro opuštění nápovědy nyní stiskněte <mezeru>.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Úvod do prohlížeče seznamu balíků (přístup pouze pro čtení)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -455,12 +457,12 @@ msgstr ""
 "\n"
 "Klávesou <mezera> opustíte nápovědu a dostanete se do seznamu.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Úvod do práce s podseznamem pro řešení problémů s konflikty a závislostmi"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -521,11 +523,11 @@ msgstr ""
 "Klávesou <mezera> opustíte nápovědu a dostanete se do podseznamu.\n"
 "Nezapomeňte: nápovědu získáte stiskem `?'.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Zobrazení, část 1: seznam balíků a stavové znaky"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -583,11 +585,11 @@ msgstr ""
 "Pro každý balík se též zobrazuje jeho priorita, stav, jméno, stav instalace\n"
 "a dostupné verze (lze zobrazit/skrýt pomocí velkého `V') a stručný popis.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Zobrazení, část 2: zvýraznění; informační obrazovka"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -635,11 +637,11 @@ msgstr ""
 "`I'\n"
 "  pak můžete schovat nebo roztáhnout část obrazovky s informacemi.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Úvod do výběru přístupové metody"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -682,14 +684,15 @@ msgstr ""
 "`k',\n"
 "nebo z nabídky nápovědy dostupné klávesou `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Klávesy pro volbu metody"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1012,7 +1015,7 @@ msgstr "Přístupová metoda `%s'."
 msgid "Abbrev."
 msgstr "Zkratka"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Popis"
 
@@ -1032,15 +1035,16 @@ msgstr "nepovedlo se znovu zablokovat SIGWINCH"
 msgid "getch failed"
 msgstr "nepovedlo se getch"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[none]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "popis "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Popis není k dispozici."
 
@@ -1371,194 +1375,198 @@ msgid "pre-depends on"
 msgstr "před-závisí na"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "je v konfliktu s"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "poskytuje"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "nahrazuje"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "vylepšuje"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Vyž"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Důl"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Dop"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Vol"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Dod"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "CHB"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Poškozené"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nové"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Zastaralé/lokální"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Aktuální"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Dostupné"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Odstraněné"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Chybně nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nově dostupné balíky"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Aktualizované balíky (je k dispozici nová verze)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Zastaralé a lokální balíky v systému"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Aktuální nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Dostupné balíky (momentálně nenainstalované)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Odstraněné a již nedostupné balíky"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Odstraněné balíky (konfigurace zatím zachována)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Vyčištěné a nikdy nenainstalované balíky"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Nainstalované"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Vyčištěné"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzivní výpis balíků"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspekce stavů balíků"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hlavní seznam balíků"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (podle sekce)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dostup., sekce)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (stav, sekce)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (podle priority)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dostup., priorita)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (stav, priorita)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (abecedně)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (podle dostupnosti)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (podle stavu)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " znač:+/=/- struč:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " znač:+/=/- podrob:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " struč:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " podrob:v pomoc:?"
 
@@ -1582,42 +1590,26 @@ msgstr ""
 "Pořadí třídění balíků lze změnit klávesami `o' a `O', což vám umožní označit "
 "balíky v různých typech skupin."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "závislosti ovlivňující "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "závislosti"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "popis "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "popis není k dispozici."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "popis"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "informace o aktuálně instalovaných"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "informace o instalovaném balíku "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "informace o dostupných verzích"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "informace o dostupné verzi pro "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<null>"
@@ -1715,3 +1707,18 @@ msgstr "Inst.ver"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Dostup.ver"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "závislosti ovlivňující "
+
+#~ msgid "description of "
+#~ msgstr "popis "
+
+#~ msgid "description"
+#~ msgstr "popis"
+
+#~ msgid "currently installed control info"
+#~ msgstr "informace o aktuálně instalovaných"
+
+#~ msgid "available version of control info for "
+#~ msgstr "informace o dostupné verzi pro "
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 0e825ef2..6a8f609d 100644
--- a/dselect/po/da.po
+++ b/dselect/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-06 16:32+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -141,7 +141,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "tastebindinger"
 
 #: dselect/baselist.cc:307
@@ -296,14 +297,15 @@ msgstr "V
 msgid "Quit without changing selected access method"
 msgstr "Afslut uden at ændre den valgte adgangsmetode"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Taster"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -359,11 +361,11 @@ msgstr ""
 "fortryde)\n"
 "   D     sæt alle til direkte ønsket status   n \\  gentag sidste søgning\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduktion til pakkevalg"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -420,11 +422,11 @@ msgstr ""
 "\n"
 "Tryk mellemrum for at forlade hjælpen og gå til listen.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introduktion til skrivebeskyttet pakkeliste-søger"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -462,11 +464,11 @@ msgstr ""
 "\n"
 "Tryk <mellemrum> for at forlade hjælpen og gå til listen nu.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduktion til konflikt/afhængighedsløsnings-dellisten"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -528,11 +530,11 @@ msgstr ""
 "Tryk mellemrum for at forlade hjælp og gå til dellisten. Husk:'?' for "
 "hjælp.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visning, del 1: pakkeliste og statustegn"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -593,11 +595,11 @@ msgstr ""
 "Også hver pakkes prioritet, gruppe, navn, versionsnumre for installeret og\n"
 "tilgængelig version (skift-V for vis/skjul) og kort beskrivelse vises.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visning, del 2: listemarkering, informationsvisning"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -644,11 +646,11 @@ msgstr ""
 "  Brug 'i'-tasten for at skifte mellem visningerne og 'I' for at gemme\n"
 "  informationsvisningen eller udvide den til næsten hele skærmen.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduktion til metodevalgs-visningen"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -692,14 +694,15 @@ msgstr ""
 "dem i\n"
 "hjælpemenuen ved at trykke '?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Taster til metodevalg"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1019,7 +1022,7 @@ msgstr "Tilgangsmetode '%s'."
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -1039,15 +1042,16 @@ msgstr "kunne ikke genblokere SIGWINCH"
 msgid "getch failed"
 msgstr "'getch' mislykkedes"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ingen]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "forklaring af"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Ingen tilgængelig forklaring."
 
@@ -1378,194 +1382,198 @@ msgid "pre-depends on"
 msgstr "forhånds-afhænger af"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "er i konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "giver"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "erstatter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "forbedrer"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Vgt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Anb"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Fri"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Ødelagte"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Opdaterede"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Forældede/lokale"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Helt opdaterede"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Tilgængelige"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Afinstallerede"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Ødelagte installerede pakker"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nyligt tilgængelige pakker"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Opdaterede pakker (nyere version tilgængelig)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Forældede og lokale pakker på systemet"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Installerede pakker i nyeste version"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Tilgængelige pakker (ikke installerede)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Afinstallerede og ikke længere tilgængelige pakker"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Installerede pakker"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Afinstallerede pakker (opsætning bevaret)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Udrensede og aldrig installerede pakker"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installerede"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Udrensede"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkevisning"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspektion af pakkestatus"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hoved-pakkevisning"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (efter gruppe)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (tilg., gruppe)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, gruppe)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (efter prioritet)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (tilg., prioritet)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (efter tilgæng.)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (efter status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markér:+/=/- koncis:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markér:+/=/- detalj:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " koncis:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " detaljer:v hjælp:?"
 
@@ -1589,42 +1597,26 @@ msgstr ""
 "Du kan bruge 'o' eller'O' til at ændre sorteringsrækkefølgen og give dit "
 "selv mulighed for at markere pakkerne i andre grupper."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "sammenhænge der berører "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "sammenhænge"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "beskrivelse af "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "ingen tilgængelig beskrivelse."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "beskrivelse"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "aktuelt installeret kontrolinformation"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "installeret kontrolinformation for"
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "tilgængelig version af kontrolinformation for fil"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "tilgængelig version af kontrolinformation for "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<tom>"
@@ -1723,3 +1715,17 @@ msgstr "Inst.ver"
 msgid "Avail.ver"
 msgstr "Tilg.ver"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "sammenhænge der berører "
+
+#~ msgid "description of "
+#~ msgstr "beskrivelse af "
+
+#~ msgid "description"
+#~ msgstr "beskrivelse"
+
+#~ msgid "currently installed control info"
+#~ msgstr "aktuelt installeret kontrolinformation"
+
+#~ msgid "available version of control info for "
+#~ msgstr "tilgængelig version af kontrolinformation for "
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 1ab8d423..27be680a 100644
--- a/dselect/po/de.po
+++ b/dselect/po/de.po
@@ -12,7 +12,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: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-08-22 20:29+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -34,7 +34,8 @@ msgstr "Hilfe: "
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "»?« für Hilfemenü, ».« für nächstes Thema, <Leer> zum Verlassen der Hilfe."
+msgstr ""
+"»?« für Hilfemenü, ».« für nächstes Thema, <Leer> zum Verlassen der Hilfe."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -143,7 +144,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "Tastenzuordnungen"
 
 #: dselect/baselist.cc:307
@@ -303,14 +305,15 @@ msgstr "Derzeit hervorgehobene Zugriffsmethode auswählen"
 msgid "Quit without changing selected access method"
 msgstr "Beenden, ohne die Zugriffsmethode zu ändern"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tastenkürzel"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -338,30 +341,37 @@ msgid ""
 "cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
-"Bewegungstasten: Nächstes/Vorheriges, Anfang/Ende, Hoch/Runter, Rück-/Vorwärts:\n"
+"Bewegungstasten: Nächstes/Vorheriges, Anfang/Ende, Hoch/Runter, Rück-/"
+"Vorwärts:\n"
 "  Pfeil ab, j         Pfeil hoch, k           Hervorhebung bewegen\n"
 "  N, Bild ab, Leert.  P, Bild hoch, Rückschr. Liste um 1 Seite scrollen\n"
 "  ^n                  ^p                      Liste um 1 Zeile scrollen\n"
-"  t, Pos1             e, Ende                 springe zu Anfang/Ende der Liste\n"
+"  t, Pos1             e, Ende                 springe zu Anfang/Ende der "
+"Liste\n"
 "  u                   d                       Info um 1 Seite scrollen\n"
 "  ^u                  ^d                      Info um 1 Zeile scrollen\n"
-"  B, Pfeil links      F, Pfeil rechts         Anz. um 1/3 Bildschirm schieben\n"
+"  B, Pfeil links      F, Pfeil rechts         Anz. um 1/3 Bildschirm "
+"schieben\n"
 "  ^b                  ^f                      Anzeige um 1 Zeichen schieben\n"
 "\n"
 "Pakete für spätere Bearbeitung markieren:\n"
 " +, Einfg   install. oder aktual.  =, H  im momentanen Zustand halten\n"
-" -, Entf    löschen                :, G  loslassen: aktual. oder uninst. lassen\n"
+" -, Entf    löschen                :, G  loslassen: aktual. oder uninst. "
+"lassen\n"
 " _          löschen und Konfiguration säubern\n"
 "                                             Verschiedenes:\n"
-"Beenden, überstimmen (groß/klein beachten!):  ?, F1 Hilfe (auch Hilfe-Taste)\n"
+"Beenden, überstimmen (groß/klein beachten!):  ?, F1 Hilfe (auch Hilfe-"
+"Taste)\n"
 " Eingabe Bestät., Ende (Abh. überprüfen)      i, I  Info-Anzeige umschalten\n"
 "   Q     Bestät., Ende (Abh. überstimmen)     o, O  Sortierung ändern\n"
 " X, Esc  Abbruch, alle Änderungen verwerfen   v, V  Zustandsanzeige ändern\n"
 "   R     zu Zustand vor Liste zurückkehren     ^l   Anzeige neu zeichnen\n"
-"   U     alle auf vorgeschl. Zustand setzen     /   suchen (Eingabe bricht ab)\n"
-"   D     alle auf direkt angef. Zust. setzen  n, \\  letzte Suche wiederholen\n"
+"   U     alle auf vorgeschl. Zustand setzen     /   suchen (Eingabe bricht "
+"ab)\n"
+"   D     alle auf direkt angef. Zust. setzen  n, \\  letzte Suche "
+"wiederholen\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Einführung in die Paketauswahl"
 
@@ -370,7 +380,7 @@ msgstr "Einführung in die Paketauswahl"
 # passt. Auf diesen ist nämlich sonst die Hilfe abgeschnitten!
 # Sven Joachim: In UTF-8-Terminals kann die Hilfe trotzdem abgeschnitten
 # werden, da dselect annimmt, dass jedes Zeichen nur 1 Byte breit ist.
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -409,25 +419,30 @@ msgstr ""
 "Anfang sehen Sie »Alle Pakete« hervorgehoben. »+«, »-« usw. wirken dann auf\n"
 "alle Pakete, die durch die hervorgehobene Zeile beschrieben werden.\n"
 "\n"
-"Gelegentlich ergeben sich Konflikte oder Abhängigkeitsprobleme; eine Teilliste\n"
-"betroffener Pakete wird angezeigt, in der Sie dann die Probleme lösen können.\n"
+"Gelegentlich ergeben sich Konflikte oder Abhängigkeitsprobleme; eine "
+"Teilliste\n"
+"betroffener Pakete wird angezeigt, in der Sie dann die Probleme lösen "
+"können.\n"
 "\n"
 "Sie sollten die Liste der Tasten und die Erklärung der Anzeige durchlesen.\n"
-"Es ist viel Hilfe verfügbar, bitte nutzen Sie sie - drücken Sie jederzeit »?«,\n"
+"Es ist viel Hilfe verfügbar, bitte nutzen Sie sie - drücken Sie jederzeit "
+"»?«,\n"
 "um die Hilfe aufzurufen.\n"
 "\n"
-"Wenn Sie mit ihrer Wahl zufrieden sind, drücken Sie <Eingabe>, um Änderungen\n"
+"Wenn Sie mit ihrer Wahl zufrieden sind, drücken Sie <Eingabe>, um "
+"Änderungen\n"
 "zu bestätigen oder »X«, um die Paketliste ohne Änderungen zu verlassen. Es\n"
 "gibt noch eine abschließende Konflikt- und Abhängigkeitsprüfung - eventuell\n"
 "erscheint wieder eine Teilliste.\n"
 "\n"
-"Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu gelangen.\n"
+"Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu "
+"gelangen.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Einführung in den Nur-Lese-Paketlisten-Browser"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -452,8 +467,10 @@ msgstr ""
 "Sie bekommen eine Liste von Paketen angezeigt, die installiert oder zur\n"
 "Installation verfügbar sind. Da Sie nicht die zum Aktualisieren des Status\n"
 "von Paketen nötigen Privilegien besitzen, sind Sie im Nur-Lese-Modus. Mit\n"
-"den Pfeiltasten können Sie sich durch die Liste bewegen (bitte lesen Sie die\n"
-"Tastaturkürzel-Hilfe), den Zustand von Paketen begutachten und Informationen\n"
+"den Pfeiltasten können Sie sich durch die Liste bewegen (bitte lesen Sie "
+"die\n"
+"Tastaturkürzel-Hilfe), den Zustand von Paketen begutachten und "
+"Informationen\n"
 "über sie erhalten.\n"
 "\n"
 "Sie sollten die Liste der Tasten und die Erklärung der Anzeige durchlesen.\n"
@@ -463,14 +480,15 @@ msgstr ""
 "Wenn Sie mit dem Durchforsten fertig sind, drücken Sie »Q« oder die\n"
 "Eingabetaste zum Beenden.\n"
 "\n"
-"Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu gelangen.\n"
+"Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu "
+"gelangen.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Hinweise zur Teilliste zum Auflösen von Konflikten/Abhängigkeiten"
 
 # Auch dieser Hilfebildschirm sollte die 22 Zeilen nicht überschreiten.
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -506,17 +524,23 @@ msgid ""
 msgstr ""
 "Abhängigkeits/Konflikt-Auflösung - Einführung.\n"
 "\n"
-"Eine oder mehrere Ihrer Auswahlen haben einen Konflikt oder ein Abhängigkeits-\n"
-"problem ausgelöst - einige Pakete sollten nur zusammen mit bestimmten anderen\n"
+"Eine oder mehrere Ihrer Auswahlen haben einen Konflikt oder ein "
+"Abhängigkeits-\n"
+"problem ausgelöst - einige Pakete sollten nur zusammen mit bestimmten "
+"anderen\n"
 "und wieder andere dürfen nicht gemeinsam installiert werden.\n"
 "\n"
-"Sie werden eine Teilliste der betroffenen Pakete sehen. Die untere Hälfte der\n"
+"Sie werden eine Teilliste der betroffenen Pakete sehen. Die untere Hälfte "
+"der\n"
 "Anzeige zeigt relevante Konflikte und Abhängigkeiten; benutzen Sie »i« zum\n"
-"Umschalten zwischen diesen Infos, Paketbeschreibungen und int. Control-Infos.\n"
+"Umschalten zwischen diesen Infos, Paketbeschreibungen und int. Control-"
+"Infos.\n"
 "\n"
-"Eine Zahl »befürworteter« Pakete wurde berechnet und anfängliche Markierungen\n"
+"Eine Zahl »befürworteter« Pakete wurde berechnet und anfängliche "
+"Markierungen\n"
 "entsprechend gesetzt, so dass Sie einfach alles mit der Eingabetaste über-\n"
-"nehmen können, wenn Sie möchten. Sie können die Änderung(en), die zu Problemen\n"
+"nehmen können, wenn Sie möchten. Sie können die Änderung(en), die zu "
+"Problemen\n"
 "führte(n), mit »X« rückgängig machen und zur Hauptliste zurückkehren.\n"
 "\n"
 "Ebenso können Sie sich in der Liste bewegen und Markierungen nach ihrem\n"
@@ -525,14 +549,15 @@ msgstr ""
 "erzwingen, die momentane Situation anzunehmen, für den Fall, dass Sie eine\n"
 "Empfehlung überstimmen wollen oder denken, das Programm habe sich geirrt.\n"
 "\n"
-"Zur der Liste kommen Sie mit der Leertaste; zur Erinnerung: »?« bringt Hilfe.\n"
+"Zur der Liste kommen Sie mit der Leertaste; zur Erinnerung: »?« bringt "
+"Hilfe.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Anzeige, Teil 1: Paketliste und Statuskürzel"
 
 # Und wieder: auf 22 Zeilen beschränken!
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -563,15 +588,19 @@ msgid ""
 "available version numbers (shift-V to display/hide) and summary "
 "description.\n"
 msgstr ""
-"Die obere Hälfte des Bildschirms zeigt eine Liste der Pakete. Für jedes Paket\n"
-"gibt es vier Spalten für momentanen Status auf dem System und die Markierung.\n"
+"Die obere Hälfte des Bildschirms zeigt eine Liste der Pakete. Für jedes "
+"Paket\n"
+"gibt es vier Spalten für momentanen Status auf dem System und die "
+"Markierung.\n"
 "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 vorhanden;\n"
+"                       »-«  - nicht installiert, aber Konfiguration "
+"vorhanden;\n"
 "        Pakete in    { »U«  - entpackt, aber noch nicht konfiguriert;\n"
 "      diesem Status  { »C«  - halb konfiguriert (Fehler ist aufgetreten);\n"
 "     sind beschädigt { »I«  - halb installiert (Fehler ist aufgetreten).\n"
@@ -586,12 +615,12 @@ msgstr ""
 "Auch angezeigt werden Priorität, Bereich, Name, installierte und verfügbare\n"
 "Version (»V« zum Ein-/Ausblenden) der Pakete sowie eine kurze Beschreibung.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Anzeige, Teil 2: Listenhervorhebung; Informationsanzeige"
 
 # Daran denken: 22 Zeilen, 80 Zeichen!
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -620,29 +649,35 @@ msgstr ""
 "* Hervorhebung: Eine Zeile der Paketliste ist hervorgehoben. Sie zeigt\n"
 "  an, welches Paket von den Kommandos »+«, »-« und »_« beeinflusst wird.\n"
 "\n"
-"* Die Trennlinie in der Bildschirmmitte zeigt eine kurze Erklärung des Zustands\n"
-"  des hervorgehobenen Pakets oder eine Beschreibung der Gruppe, wenn eine her-\n"
-"  vorgehoben ist. Wenn Sie die Bedeutung einiger der angezeigten Statuszeichen\n"
-"  nicht verstehen, gehen Sie zum entsprechenden Paket und schauen Sie auf die\n"
-"  Trennlinie, oder benutzen Sie »v« für eine ausführliche Anzeige (und wieder\n"
+"* Die Trennlinie in der Bildschirmmitte zeigt eine kurze Erklärung des "
+"Zustands\n"
+"  des hervorgehobenen Pakets oder eine Beschreibung der Gruppe, wenn eine "
+"her-\n"
+"  vorgehoben ist. Wenn Sie die Bedeutung einiger der angezeigten "
+"Statuszeichen\n"
+"  nicht verstehen, gehen Sie zum entsprechenden Paket und schauen Sie auf "
+"die\n"
+"  Trennlinie, oder benutzen Sie »v« für eine ausführliche Anzeige (und "
+"wieder\n"
 "  »v«, um zur knappen Anzeige zurückzukehren).\n"
 "\n"
 "* Die untere Bildschirmhälfte zeigt noch mehr Informationen über das\n"
 "  gerade hervorgehobene Paket (wenn nur eins hervorgehoben ist).\n"
 "\n"
 "  Sie kann eine erweiterte Beschreibung des Pakets, die internen Paket-\n"
-"  Kontroll-Details (entweder für die installierte oder die verfügbare Version)\n"
+"  Kontroll-Details (entweder für die installierte oder die verfügbare "
+"Version)\n"
 "  oder Informationen über Konflikte und Abhängigkeiten, die das Paket\n"
 "  betreffen (in Konflikt-/Abhängigkeits-Teillisten), anzeigen.\n"
 "\n"
 "  Benutzen Sie »i«, um durch die Anzeigen zu wechseln und »I«, um die\n"
 "  Informationsanzeige zu verstecken oder sie zu vergrößern.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Einführung zum Methoden-Auswahl-Menü"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -668,7 +703,8 @@ msgstr ""
 "dselect und dpkg beherrschen automatische Installation, indem sie die zu\n"
 "installierenden Pakete von einem von mehreren möglichen Orten laden.\n"
 "\n"
-"Diese Liste bietet Ihnen die Möglichkeit, eine Installationsmethode zu wählen.\n"
+"Diese Liste bietet Ihnen die Möglichkeit, eine Installationsmethode zu "
+"wählen.\n"
 "\n"
 "Bitte wählen Sie Ihre Methode, die Sie verwenden wollen, und drücken die\n"
 "Eingabetaste. Sie werden dann nach den benötigten Informationen für die\n"
@@ -683,16 +719,17 @@ msgstr ""
 "Eine Liste aller Tastenkürzel erhalten Sie, wenn sie jetzt die »k«-Taste\n"
 "drücken, oder später aus dem Hilfemenü, erreichbar mit der Taste »?«.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tastenkürzel für die Methoden-Auswahl"
 
 # Fehler in der 2. Zeile im englischen Text (j und k statt n und p
 # ist richtig), siehe http://bugs.debian.org/383438.
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -713,19 +750,23 @@ msgid ""
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
 msgstr ""
-"Bewegungstasten: Nächstes/Vorheriges, Anfang/Ende, Hoch/Runter, Rück-/Vorwärts:\n"
+"Bewegungstasten: Nächstes/Vorheriges, Anfang/Ende, Hoch/Runter, Rück-/"
+"Vorwärts:\n"
 "  Pfeil ab, j         Pfeil hoch, k           Hervorhebung bewegen\n"
 "  N, Bild ab, Leert.  P, Bild hoch, Rückschr. Liste um 1 Seite scrollen\n"
 "  ^n                  ^p                      Liste um 1 Zeile scrollen\n"
-"  t, Pos1             e, Ende                 springe zu Anfang/Ende der Liste\n"
+"  t, Pos1             e, Ende                 springe zu Anfang/Ende der "
+"Liste\n"
 "  u                   d                       Info um 1 Seite scrollen\n"
 "  ^u                  ^d                      Info um 1 Zeile scrollen\n"
-"  B, Pfeil links      F, Pfeil rechts         Anz. um 1/3 Bildschirm schieben\n"
+"  B, Pfeil links      F, Pfeil rechts         Anz. um 1/3 Bildschirm "
+"schieben\n"
 "  ^b                  ^f                      Anzeige um 1 Zeichen schieben\n"
 "(Dies sind dieselben Bewegungstasten wie in der Paketliste.)\n"
 "\n"
 "Beenden:\n"
-" Eingabetaste   Auswahl dieser Methode und Wechsel in den Konfigurationsdialog\n"
+" Eingabetaste   Auswahl dieser Methode und Wechsel in den "
+"Konfigurationsdialog\n"
 " x, X           Beenden, ohne die Methode zu ändern oder einzurichten\n"
 "\n"
 "Verschiedenes:\n"
@@ -849,7 +890,8 @@ msgid ""
 "See %s --license for copyright and license details.\n"
 msgstr ""
 "Dies ist freie Software; lesen Sie die GNU General Public License in der\n"
-"Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung übernommen.\n"
+"Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
+"übernommen.\n"
 "Siehe %s --license für Details zum Copyright und zur Lizenz.\n"
 
 #: dselect/main.cc:171
@@ -857,7 +899,8 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "Aufruf: %s [<Option> ...] [<Aktion> ...]\n"
+msgstr ""
+"Aufruf: %s [<Option> ...] [<Aktion> ...]\n"
 "\n"
 
 #: dselect/main.cc:175
@@ -874,7 +917,8 @@ msgstr ""
 "Optionen:\n"
 "  --admindir <Verzeichnis>     <Verzeichnis> statt %s verwenden.\n"
 "  --expert                     Experten-Modus einschalten.\n"
-"  --debug <Datei> | -D<Datei>  Debuggen einschalten, Ausgaben an <Datei> senden\n"
+"  --debug <Datei> | -D<Datei>  Debuggen einschalten, Ausgaben an <Datei> "
+"senden\n"
 "  --colour | --color Element:[Vordergrund],[Hintergrund][:Attr[+Attr+..]]\n"
 "                               Bildschirmfarben konfigurieren.\n"
 "\n"
@@ -1012,7 +1056,7 @@ msgstr "Zugriffsmethode »%s«."
 msgid "Abbrev."
 msgstr "Abkürz."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1033,15 +1077,16 @@ msgid "getch failed"
 msgstr "getch fehlgeschlagen"
 
 # Debug-Ausgabe: Warum ist das überhaupt übersetzbar?
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[keine]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "Beschreibung von "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Keine Beschreibung verfügbar."
 
@@ -1087,7 +1132,8 @@ msgstr "Kann nicht auf %.250s warten"
 #: dselect/method.cc:175
 #, c-format
 msgid "got wrong child's status - asked for %ld, got %ld"
-msgstr "Status des falschen Kindprozesses erhalten - fragte nach %ld, bekam %ld"
+msgstr ""
+"Status des falschen Kindprozesses erhalten - fragte nach %ld, bekam %ld"
 
 #: dselect/method.cc:186
 #, c-format
@@ -1386,197 +1432,201 @@ msgid "pre-depends on"
 msgstr "hängt ab (vorher) von"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "kollidiert mit"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "liefert"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "ersetzt"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "erweitert"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Erf"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Wic"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Emp"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Bei"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Kaputte"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Neue"
 
 # FIXME: "Upgradable" (wie in aptitude) wäre besser
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Aktualisierte"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Veraltete/Lokale"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Aktuelle"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Verfügbare"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Entfernte"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Unvollständig installierte Pakete"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Neu verfügbare Pakete"
 
 # FIXME: "Upgradable", s.o.
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Aktualisierte Pakete (neuere Version ist verfügbar)"
 
 # CHECKME: »vorhanden« streichen?
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Veraltete und lokale Pakete im System vorhanden"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Aktuelle installierte Pakete"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Verfügbare Pakete (derzeit nicht installiert)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Entfernte und nicht mehr verfügbare Pakete"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Installierte Pakete"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Entfernte Paket (Konfigurationsdateien sind noch vorhanden)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Gesäuberte und noch nie installierte Pakete"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installiert"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Gesäubert"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - Rekursive Paketliste"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - Ansicht der Paketzustände"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - Hauptpaketliste"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (nach Bereich)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (Verfüg., Bereich)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (Status, Bereich)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (nach Priorität)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (Verfüg., Priorität)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (Status, Priorität)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alphabetisch)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (nach Verfügbarkeit)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (nach Status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " Mark:+/=/- knapp:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " Mark:+/=/- ausführlich:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " knapp:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " ausführlich:v Hilfe:?"
 
@@ -1592,50 +1642,34 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 "Die hervorgehobene Zeile repräsentiert viele Pakete; wenn Sie um "
-"Installieren, Löschen, Halten usw. bitten, so sind alle Pakete, auf die "
-"das angezeigte Kriterium zutrifft, betroffen.\n"
+"Installieren, Löschen, Halten usw. bitten, so sind alle Pakete, auf die das "
+"angezeigte Kriterium zutrifft, betroffen.\n"
 "\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."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "gegenseitige Beziehungen betreffend "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "gegenseitige Beziehungen"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "Beschreibung von "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "keine Beschreibung verfügbar."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "Beschreibung"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "Derzeit installierte Control-Info"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "Installierte Control-Info für "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "verfügbare Version der Control-Datei-Info"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "verfügbare Version der Control-Info für "
-
 # Debug-Ausgabe: Warum ist das überhaupt übersetzbar?
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
@@ -1739,3 +1773,18 @@ msgstr "Inst.Ver"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Verf.Ver"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "gegenseitige Beziehungen betreffend "
+
+#~ msgid "description of "
+#~ msgstr "Beschreibung von "
+
+#~ msgid "description"
+#~ msgstr "Beschreibung"
+
+#~ msgid "currently installed control info"
+#~ msgstr "Derzeit installierte Control-Info"
+
+#~ msgid "available version of control info for "
+#~ msgstr "verfügbare Version der Control-Info für "
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 9a0a366c..b61fc729 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,7 +126,7 @@ msgid ""
 msgstr ""
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+msgid "Keybindings"
 msgstr ""
 
 #: dselect/baselist.cc:307
@@ -281,14 +281,14 @@ msgstr ""
 msgid "Quit without changing selected access method"
 msgstr ""
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr ""
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -317,11 +317,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr ""
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -352,11 +352,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr ""
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -377,11 +377,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -416,11 +416,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -452,11 +452,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -483,11 +483,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -511,14 +511,14 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -785,7 +785,7 @@ msgstr ""
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr ""
 
@@ -805,15 +805,15 @@ msgstr ""
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr ""
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr ""
 
@@ -1139,194 +1139,198 @@ msgid "pre-depends on"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:75
-msgid "conflicts with"
+msgid "breaks with"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:76
-msgid "provides"
+msgid "conflicts with"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:77
-msgid "replaces"
+msgid "provides"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:78
+msgid "replaces"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr ""
 
@@ -1342,40 +1346,20 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr ""
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
-msgstr ""
-
-#: dselect/pkginfo.cc:108
-msgid "description of "
+#: dselect/pkginfo.cc:95
+msgid "Interrelationships"
 msgstr ""
 
 #: dselect/pkginfo.cc:112
-msgid "no description available."
-msgstr ""
-
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr ""
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr ""
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+msgid "No description available."
 msgstr ""
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:130
+msgid "Installed control file information"
 msgstr ""
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
+#: dselect/pkginfo.cc:146
+msgid "Available control file information"
 msgstr ""
 
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 5dde9a09..a0759def 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -148,7 +148,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "συνδυασμοί πλήκτρων"
 
 #: dselect/baselist.cc:307
@@ -303,14 +304,15 @@ msgstr "Επιλογή της τρέχουσας μεθόδου πρόσβαση
 msgid "Quit without changing selected access method"
 msgstr "Έξοδος χωρίς αλλαγή της επιλεγμένης μεθόδου"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Συνδυασμοί πλήκτρων"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -370,11 +372,11 @@ msgstr ""
 "   D     ορισμός όλων ως άμεσα αιτούμενα      n, \\  επανάληψη τελευταίας "
 "αναζήτησης\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Εισαγωγή στις επιλογές πακέτων"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -430,11 +432,11 @@ msgstr ""
 "μια δεύτερη λίστα.\n"
 "Πιέστε <space> για κλείσει η βοήθεια και να δείτε τη λίστα τώρα.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Εισαγωγή στην προβολή πακέτων για ανάγνωση μόνο"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -474,11 +476,11 @@ msgstr ""
 "\n"
 "Πιέστε <enter> για κλείσει η βοήθεια και να δείτε τη λίστα τώρα.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Εισαγωγή στην λίστα ανάλυσης εξαρτήσεων/συγκρούσεων"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -541,11 +543,11 @@ msgstr ""
 "Πιέστε <enter> για να φύγετε από τη βοήθεια και να δείτε την προτεινόμενη\n"
 "λίστα. Πιέστε `?' για βοήθεια.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Οθόνη, μέρος 1ο: εμφάνιση καταλόγου πακέτων και χαρακτήρων κατάστασης"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -608,11 +610,11 @@ msgstr ""
 "η διαθέσιμη έκδοση (πιέστε shift-V για να εμφανίσετε/κρύψετε) και μια "
 "περίληψη.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Οθόνη, μέρος 2ο: εστίαση λίστας, εμφάνιση πληροφοριών"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -664,11 +666,11 @@ msgstr ""
 "πληροφορίες\n"
 "  και το `Ι' για την απόκρυψη των πληροφοριών ή την επέκτασή τους.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Εισαγωγή στην οθόνη μεθόδου επιλογής"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -714,14 +716,15 @@ msgstr ""
 "`k'\n"
 "τώρα, ή από την επιλογή βοηθείας πιέζοντας `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Πλήκτρα για την επιλογή της μεθόδου"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1030,7 +1033,7 @@ msgstr "Μέθοδος πρόσβασης `%s'."
 msgid "Abbrev."
 msgstr "Σύντμηση"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -1050,15 +1053,16 @@ msgstr "απέτυχε η επανεμπλοκή του SIGWINCH"
 msgid "getch failed"
 msgstr "η getch απέτυχε"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[κανένα]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "εξήγηση του "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Καμία διαθέσιμη εξήγηση."
 
@@ -1390,194 +1394,198 @@ msgid "pre-depends on"
 msgstr "προεξαρτάται από "
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "ασύμβατο με"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "παρέχει"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "αντικαθιστά"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "επεκτείνει"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr ";"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Κατεστραμμένο"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Νέο"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Ενημερωμένο"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Απαρχαιωμένο/τοπικό"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Ενημερωμένο"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Διαθέσιμο"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Αφαιρέθηκε"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Χαλασμένα και εγκατεστημένα πακέτα"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Νέα διαθέσιμα πακέτα"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Ενημερωμένα πακέτα (νεώτερη έκδοση είναι διαθέσιμη)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Απαρχαιωμένα και τοπικά πακέτα που υπάρχουν στο σύστημα"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Εγκατεστημένα πακέτα σε τρέχουσα έκδοση"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Διαθέσιμα πακέτα (προς το παρόν όχι εγκατεστημένα)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Πακέτα που έχουν αφαιρεθεί και δεν είναι πλέον διαθέσιμα"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Εγκατεστημένα πακέτα"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Πακέτα που αφαιρέθηκαν (οι ρυθμίσεις παραμένουν)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Διεγραμμένα πακέτα καθώς και αυτά που ποτέ δεν εγκαταστάθηκαν"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Εγκατεστημένα"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Διεγραμμένα"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - αναδρομική λίστα πακέτων"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - έλεγχος κατάστασης των πακέτων"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - εμφάνιση κυρίων πακέτων"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (ανά ενότητα)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (διαθέσιμο, ενότητα)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (κατάσταση, ενότητα)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (ανά προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (διαθέσιμο, προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (κατάσταση, προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (αλφαβητικά)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (ανά διαθεσιμότητα)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (ανά κατάσταση)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " σημείωση:+/=/- σύντομα:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " σημείωση:+/=/- αναλυτικά:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " σύντομα:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " αναλυτικά: βοήθεια:?"
 
@@ -1601,42 +1609,26 @@ msgstr ""
 "Χρησιμοποιήστε το `o' και το `O' για να αλλάξετε τη σειρά ταξινόμησης και να "
 "επιλέξετε πακέτα από ομάδες διαφορετικών ειδών."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "εσωτερικές συσχετίσεις επηρεάζουν το"
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "εσωτερικές συσχετίσεις"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "περιγραφή του "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "καμία διαθέσιμη περιγραφή."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "περιγραφή"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "τρέχουσα εγκατεστημένη πληροφορία ελέγχου"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "εγκατεστημένη πληροφορία ελέγχου για το "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "διαθέσιμη έκδοση πληροφορίας ελέγχου αρχείου"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "διαθέσιμη έκδοση πληροφορίας ελέγχου για το"
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<κενό>"
@@ -1734,3 +1726,18 @@ msgstr "Έκδ.εγκ."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Διαθ.εκδόσεις"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "εσωτερικές συσχετίσεις επηρεάζουν το"
+
+#~ msgid "description of "
+#~ msgstr "περιγραφή του "
+
+#~ msgid "description"
+#~ msgstr "περιγραφή"
+
+#~ msgid "currently installed control info"
+#~ msgstr "τρέχουσα εγκατεστημένη πληροφορία ελέγχου"
+
+#~ msgid "available version of control info for "
+#~ msgstr "διαθέσιμη έκδοση πληροφορίας ελέγχου για το"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index fd21e645..f29f7adc 100644
--- a/dselect/po/es.po
+++ b/dselect/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-05 20:49+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -141,7 +141,8 @@ msgstr ""
 " whatinfo_row=%d, list_row=%d;\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "asociaciones de teclas"
 
 #: dselect/baselist.cc:307
@@ -296,14 +297,15 @@ msgstr "Selecciona el m
 msgid "Quit without changing selected access method"
 msgstr "Salir sin cambiar el método de acceso seleccionado"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Pulsaciones"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -372,11 +374,11 @@ msgstr ""
 "  D      lo pone todo al estado Directamente solicitado\n"
 "                                           n, \\  repite la última búsqueda\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introducción a la selección de paquetes"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -432,11 +434,11 @@ msgstr ""
 "\n"
 "Pulse <espacio> para salir de la ayuda y entrar en la lista ahora.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introducción al navegador de lista de paquetes de sólo lectura"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -475,11 +477,11 @@ msgstr ""
 "\n"
 "Pulse <espacio> para abandonar la ayuda y entrar en la lista.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducción a la sublista de resolución de conflicto/dependencia"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -547,11 +549,11 @@ msgstr ""
 "Pulse <espacio> para abandonar la ayuda y entrar en la sublista;\n"
 "recuerde: pulse `?' para la ayuda.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Muestra, parte 1: listado de paquete y caracteres de estado"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -614,11 +616,11 @@ msgstr ""
 "e instalada de cada paquete (Mayús-V para mostrar/esconder) y descripción\n"
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Muestra, parte 2: destacado de la lista; muestra de información"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -671,11 +673,11 @@ msgstr ""
 "  esconder la muestra de información o expandirla para utilizar casi toda\n"
 "  la pantalla.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introducción a la muestra de selección de método"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -719,14 +721,15 @@ msgstr ""
 "al\n"
 "pulsar `k', o desde el menú de ayuda al que se accede pulsando `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Teclas para la selección de método"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -899,7 +902,9 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "Modo de uso: %s [<opción> ...] [<acción> ...]\n\n"
+msgstr ""
+"Modo de uso: %s [<opción> ...] [<acción> ...]\n"
+"\n"
 
 #: dselect/main.cc:175
 #, c-format
@@ -915,8 +920,10 @@ msgstr ""
 "Ociones:\n"
 "  --admindir <directorio>          Utiliza <directorio> en lugar de %s.\n"
 "  --expert                         Activa el modo experto.\n"
-"  --debug <fichero> | -D<fichero>  Activa la depuración y envía la salida a <fichero>.\n"
-"  --colour | --color screenpart:[primer_plano],[segundo_plano][:atrb[+atrb+..]]\n"
+"  --debug <fichero> | -D<fichero>  Activa la depuración y envía la salida a "
+"<fichero>.\n"
+"  --colour | --color screenpart:[primer_plano],[segundo_plano][:atrb[+atrb"
+"+..]]\n"
 "                                   Configura los colores de la pantalla.\n"
 "\n"
 
@@ -1052,7 +1059,7 @@ msgstr "M
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descripción"
 
@@ -1073,15 +1080,16 @@ msgid "getch failed"
 msgstr "getch falló"
 
 # FIXME: A translator comment should clarify about none's sex here. sv
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ninguno/a]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicación de "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "No hay explicación disponible."
 
@@ -1427,194 +1435,198 @@ msgid "pre-depends on"
 msgstr "predepende de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "entra en conflicto con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "provee"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "reemplaza a"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "amplía"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bICHO"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "¿?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "rotos"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "nuevos"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "con actualización disponible"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "obsoletos/locales"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "actualizados"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "disponibles"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Desinstalados"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Paquetes mal instalados"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Paquetes nuevos disponibles"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Actualización disponible"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Paquetes obsoletos y localmente instalados"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paquetes actualizados, no hay versión más nueva"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Paquetes disponibles (no instalados actualmente)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Paquetes desinstalados que ya no están disponibles"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Paquetes instalados"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Paquetes desinstalados (queda la configuración)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Paquetes purgados o que nunca fueron instalados"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalados"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgados"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de paquetes"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspección de los estados de los paquetes"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de paquetes"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (por sección)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (disp., sección)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (estado, sección)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (por prioridad)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (disp., prioridad)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (estado, prioridad)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabéticamente)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (por disponibilidad)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (por estado)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- conciso:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- literal:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " conciso:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " literal:v ayuda:?"
 
@@ -1638,42 +1650,26 @@ msgstr ""
 "Se puede usar `o' y `O' para cambiar el tipo de ordenación, esto permite\n"
 "marcar paquetes en distintos tipos de grupos."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelaciones que afectan "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelaciones"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descripción de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "no hay ninguna descripción disponible."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descripción"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "información de control actualmente instalada"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "información de control instalada para "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versión disponible de la información del fichero de control"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "información de control de la versión disponible de "
-
 # FIXME: Need a translator comment to know null's sex. sv
 # It seems it refers to a missing priority or a missing section.
 # Como tanto la sección como la prioridad son femeninos, pongo "nula". sv
@@ -1775,3 +1771,18 @@ msgstr "Ver.inst."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.disp."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelaciones que afectan "
+
+#~ msgid "description of "
+#~ msgstr "descripción de "
+
+#~ msgid "description"
+#~ msgstr "descripción"
+
+#~ msgid "currently installed control info"
+#~ msgstr "información de control actualmente instalada"
+
+#~ msgid "available version of control info for "
+#~ msgstr "información de control de la versión disponible de "
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index caa1641d..5c18a672 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale.org <librezale@librezale.org>\n"
@@ -141,7 +141,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "laster-teklak"
 
 #: dselect/baselist.cc:307
@@ -296,14 +297,15 @@ msgstr "Hautatu unean nabarmendutako atzipen-metodoa"
 msgid "Quit without changing selected access method"
 msgstr "Irten hautatutako atzipen-metodoa aldatu gabe"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tekla-sakatzeak"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -363,11 +365,11 @@ msgstr ""
 "   D     ezarri dena zuzenean eskatutako egoeran \n"
 "                                            \\   Errepikatu azken bilaketa\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Pakete-hautapenen sarrera"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -420,11 +422,11 @@ msgstr ""
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Soilik irakurtzeko paketeen zerrendaren arakatzailearen sarrera"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -460,11 +462,11 @@ msgstr ""
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Gatazka/mendekotasuna ebazteko azpizerrendaren sarrera"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -527,11 +529,11 @@ msgstr ""
 "Sakatu <sartu> laguntzatik irten eta azpizerrendara joateko; gogoratu: "
 "laguntza behar izanez gero, sakatu `?'.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Bistaratzea, 1. zatia: paketeen zerrenda eta egoera-karaktereak"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -594,11 +596,11 @@ msgstr ""
 "erabilgarri dauden bertsio-zenbakiak bistaratzen dira (maiuskula-V \n"
 "bistaratzeko/ezkutatzeko), baita laburpenaren azalpena ere.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Bistaratzea, 2. zatia: zerrenda nabarmentzea; informazioa bistaratzea"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -647,11 +649,11 @@ msgstr ""
 "  Erabili `i' tekla pantailetan zehar mugitzeko, eta `I' informazioa\n"
 "  ezkutatzeko edo ia pantaila osoa erabiltzeko zabaltzeko.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Metodo-hautapenaren sarrera"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -696,14 +698,15 @@ msgstr ""
 "menura\n"
 " `?' sakatuta\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Metodoa hautatzeko tekla-sakatzeak"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -890,7 +893,8 @@ msgstr ""
 "Aukerak:\n"
 "  --admindir <direktorioa>   <direktorioa> erabili %s beharrean.\n"
 "  --expert                   Modu aurreratura pasa.\n"
-"  --debug <fitx> | -D<fitx>  Arazpena gaitu irteera <fitxategia>-ra bidaliz.\n"
+"  --debug <fitx> | -D<fitx>  Arazpena gaitu irteera <fitxategia>-ra "
+"bidaliz.\n"
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
 "                             Pantaila koloreak konfiguratu.\n"
 "\n"
@@ -1028,7 +1032,7 @@ msgstr "`%s' atzipen-metodoa."
 msgid "Abbrev."
 msgstr "Laburd."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Azalpena"
 
@@ -1048,15 +1052,16 @@ msgstr "huts egin du SIGWINCH birblokeatzean"
 msgid "getch failed"
 msgstr "getch: huts egin du"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[bat ere ez]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "honen azalpena: "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Ez dago azalpen erabilgarririk."
 
@@ -1387,194 +1392,198 @@ msgid "pre-depends on"
 msgstr "honen aurremendekoa da:"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "gatazkan dago honekin:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "hau hornitzen du:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "hau ordezten du:"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "hau hobetzen du:"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Beh."
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Gar."
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Estd."
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Gom."
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Auk."
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "pER"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Hautsita"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Berria"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Zaharkitua/lokala"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Eguneratuta"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Erabilgarri"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Kenduta"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Gaizki instalatutako paketeak"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Pakete erabilgarri berriak"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Eguneratutako paketeak (bertsio berriago bat erabilgarri dago)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Sisteman dauden pakete zaharkituak eta lokalak"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Egunera dauden instalatutako paketeak (ez dago bertsio berriagorik)"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pakete erabilgarriak (ez daude instalatuta)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Kendu diren eta orain erabilgarri ez dauden paketeak"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Instalatutako paketeak"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Kendutako paketeak (konfigurazioa badago oraindik)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Purgatutako paketeak eta inoiz instalatu ez direnak"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalatuta"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgatuta"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - paketeen zerrenda errekurtsiboa"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - pakete-egoeraren egiaztapena"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - paketeen zerrenda nagusia"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (sekzioaren arabera)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (erabilg., sekzioa)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (egoera, sekzioa)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (lehentasunaren arabera)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (erabilg., lehentasuna)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (egoera, lehentasuna)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetikoki)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (erabilgarritasunaren arabera)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (egoeraren arabera)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marka:+/=/- labur:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marka:+/=/- xeheki:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " labur:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " xeheki:v laguntza:?"
 
@@ -1598,42 +1607,26 @@ msgstr ""
 "Erabili `o' eta `O' ordena aldatzeko eta aukera izateko talde-mota "
 "desberdinetako paketeak markatzeko."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "hauen arteko interrelazioak: "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelazioak"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "honen azalpena: "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "azalpen erabilgarririk ez."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "azalpena"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "instalatutako kontrol-informazioa"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "instalatutako kontrol-informazioa: "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "kontrol-fitxategiaren informazioaren bertsio erabilgarria"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "kontrol-informazioaren bertsio erabilgarria: "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nulua>"
@@ -1731,3 +1724,18 @@ msgstr "Inst. berts."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Berts. erabilg."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "hauen arteko interrelazioak: "
+
+#~ msgid "description of "
+#~ msgstr "honen azalpena: "
+
+#~ msgid "description"
+#~ msgstr "azalpena"
+
+#~ msgid "currently installed control info"
+#~ msgstr "instalatutako kontrol-informazioa"
+
+#~ msgid "available version of control info for "
+#~ msgstr "kontrol-informazioaren bertsio erabilgarria: "
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 52bea455..bf1731d0 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -62,7 +62,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-04 07:15+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -197,7 +197,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "affectations de touches"
 
 #: dselect/baselist.cc:307
@@ -352,14 +353,15 @@ msgstr "S
 msgid "Quit without changing selected access method"
 msgstr "Quitter sans changer la méthode d'accès précédemment sélectionnée"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Combinaisons de touches"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -421,11 +423,11 @@ msgstr ""
 "   D     tout posit. à l'état directem. requis  \\  répéter la dernière "
 "recherche\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduction à la sélection des paquets"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -483,13 +485,13 @@ msgstr ""
 "\n"
 "Appuyez sur <espace> pour quitter l'aide et voir la liste.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr ""
 "Introduction à la navigation dans la liste des paquets (mode lecture "
 "seulement)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -529,11 +531,11 @@ msgstr ""
 "\n"
 "Appuyez sur <espace> pour quitter l'aide et accéder à la liste.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduction à la sous-liste de résolution de conflits/dépendances"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -599,11 +601,11 @@ msgstr ""
 "Appuyez sur <espace> pour quitter l'aide et accéder à la sous-liste ;\n"
 "rappel : appuyez sur « ? » pour obtenir de l'aide.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Affichage, 1re partie : liste des paquets et caractères d'état"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -671,11 +673,12 @@ msgstr ""
 "numéros de versions installée et disponible (shift-V pour afficher/cacher)\n"
 "et une description résumée.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
-msgstr "Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
+msgstr ""
+"Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -728,11 +731,11 @@ msgstr ""
 "  masquer l'affichage d'informations ou l'étendre jusqu'à lui faire prendre\n"
 "  la quasi-totalité de l'écran.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduction à la sélection des méthodes"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -773,14 +776,15 @@ msgstr ""
 "Une liste complète des combinaisons de touches est disponible en appuyant\n"
 "ici sur « k », ou depuis le menu d'aide accessible en appuyant sur « ? ».\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Combinaisons de touches pour la sélection de méthodes"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1110,7 +1114,7 @@ msgstr "M
 msgid "Abbrev."
 msgstr "Abrév."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Description"
 
@@ -1130,15 +1134,16 @@ msgstr "
 msgid "getch failed"
 msgstr "échec de « getch »"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[néant]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "description de"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Aucune explication n'est disponible."
 
@@ -1241,7 +1246,8 @@ msgstr "script de requ
 #: dselect/methparse.cc:53
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
-msgstr "erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s"
+msgstr ""
+"erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s"
 
 #: dselect/methparse.cc:58
 #, c-format
@@ -1251,7 +1257,8 @@ 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
@@ -1270,7 +1277,8 @@ msgstr "impossible de lire le fichier des options de m
 
 #: dselect/methparse.cc:140
 msgid "non-digit where digit wanted"
-msgstr "caractère non numérique rencontré alors qu'un caractère numérique est attendu"
+msgstr ""
+"caractère non numérique rencontré alors qu'un caractère numérique est attendu"
 
 #: dselect/methparse.cc:143
 msgid "EOF in index string"
@@ -1322,7 +1330,8 @@ msgstr "impossible d'ouvrir le fichier de description d'option 
 #: dselect/methparse.cc:187
 #, c-format
 msgid "unable to stat option description file `%.250s'"
-msgstr "impossible d'analyser le nouveau fichier de description d'option « %.250s »"
+msgstr ""
+"impossible d'analyser le nouveau fichier de description d'option « %.250s »"
 
 #: dselect/methparse.cc:191
 #, c-format
@@ -1477,194 +1486,198 @@ msgid "pre-depends on"
 msgstr "pré-dépend de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "entre en conflit avec"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "fournit"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "remplace"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "améliore"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Néc"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Sup"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "Bog"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "défectueux"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "nouveaux"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "mis à jour"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "obsolètes/locaux"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "à jour"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "disponibles"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "supprimés"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Paquets incorrectement installés"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Paquets nouvellement disponibles"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Paquets mis à jour (une version plus récente est disponible)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Paquets obsolètes et locaux présents sur le système"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paquets à jour installés"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Paquets disponibles (pas installés pour l'instant)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Paquets supprimés et désormais indisponibles"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Paquets installés"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Paquets supprimés (configuration encore présente)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Paquets purgés et ceux qui n'ont jamais été installés"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installé"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgé"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - liste des paquets récursive"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspection de l'état des paquets"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - liste principale des paquets"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (par section)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dispo., section)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (état, section)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (par priorité)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dispo., priorité)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (état, priorité)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alphabétiquement)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (par disponibilité)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (par état)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marq:+/=/- concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marq:+/=/- verbeux:v aide:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " verbeux:v aide:?"
 
@@ -1689,42 +1702,26 @@ msgstr ""
 "vous permet de marquer des paquets appartenant à des groupes de types "
 "différents."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelations à propos de "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelations"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "description de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "description indisponible."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "description"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "informations de contrôle actuellement installée"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "information de contrôle installée pour "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "version disponible des informations du fichier de contrôle"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "version disponible des informations de contrôle pour "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<rien>"
@@ -1823,3 +1820,17 @@ msgstr "Vers. inst"
 msgid "Avail.ver"
 msgstr "Vers. dispo."
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelations à propos de "
+
+#~ msgid "description of "
+#~ msgstr "description de "
+
+#~ msgid "description"
+#~ msgstr "description"
+
+#~ msgid "currently installed control info"
+#~ msgstr "informations de contrôle actuellement installée"
+
+#~ msgid "available version of control info for "
+#~ msgstr "version disponible des informations de contrôle pour "
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 16ae6965..8bc95086 100644
--- a/dselect/po/gl.po
+++ b/dselect/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-03 11:49+0200\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -138,7 +138,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "asignacións de teclas"
 
 #: dselect/baselist.cc:307
@@ -293,14 +294,15 @@ msgstr "Escoller o método de acceso resaltado"
 msgid "Quit without changing selected access method"
 msgstr "Saír sen cambiar o método de acceso seleccionado"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Teclas"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -360,11 +362,11 @@ msgstr ""
 "   D     Estabrece o estado solicitado        n, \\\\  repetir a última "
 "busca\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introdución ás seleccións de paquetes"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -423,11 +425,11 @@ msgstr ""
 "\n"
 "Prema <Espazo> para saír da axuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introdución ao navegador de lista de paquetes de só lectura"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -468,11 +470,11 @@ msgstr ""
 "\n"
 "Prema <Espazo> para saír da axuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdución á sublista de resolución de conflictos/dependencias"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -536,11 +538,11 @@ msgstr ""
 "Prema <Espazo> para saír da axuda e entrar na sub-lista; prema \"?\" para "
 "axuda.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Pantalla, parte 1: listado de paquetes e caracteres de estado"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -600,11 +602,11 @@ msgstr ""
 "instalada e dispoñible (maiúsc-V para amosar/agochar) e descrición "
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Pantalla, parte 2: resaltado de listas; pantalla de información"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -655,11 +657,11 @@ msgstr ""
 "pantalla\n"
 "  de información ou para a expandir para que empregue case toda a pantalla.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introdución á pantalla de selección de métodos"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -701,14 +703,15 @@ msgstr ""
 "agora,\n"
 "ou no menú de axuda que se pode ver premendo \"?\".\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Teclas para a selección de métodos"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1031,7 +1034,7 @@ msgstr "Método de acceso \"%s\"."
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descrición"
 
@@ -1051,15 +1054,16 @@ msgstr "non se puido volver bloquear SIGWINCH"
 msgid "getch failed"
 msgstr "a chamada a getch fallou"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ningún]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicación de "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Non hai unha explicación dispoñible."
 
@@ -1391,194 +1395,198 @@ msgid "pre-depends on"
 msgstr "pre-depende de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "ten conflictos con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "fornece"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "substitúe a"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "mellora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Rotos"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Novos"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Actualizados"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Obsoletos/locais"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Ao día"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Dispoñibles"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Eliminados"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Paquetes instalados pero rotos"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Paquetes dispoñibles novos"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Paquetes actualizados (hai unha nova versión dispoñible)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Paquetes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paquetes instalados e ao día"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Paquetes dispoñibles (sen instalar)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Paquetes eliminados e que xa non están dispoñibles"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Paquetes instalados"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Paquetes eliminados (aínda está presente a configuración)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Paquetes purgados e non instalados nunca"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalados"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgados"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de paquetes"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspección dos estados dos paquetes"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de paquetes"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (por sección)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dispo., sección)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (estado, sección)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (por prioridade)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dispo., prioridade)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (estado, prioridade)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (por dispoñibilidade)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (por estado)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marcar:+/=/- breve:v axuda:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marcar:+/=/- expandido:v axuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr "breve:v axuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " expandido:v axuda:?"
 
@@ -1602,42 +1610,26 @@ msgstr ""
 "Pode empregar \"o\" e \"O\" para cambiar a orde e para ter a posibilidade de "
 "marcar paquetes de distintos tipos de grupos."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelacións que afectan a "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelacións"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descrición de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "non hai unha descrición dispoñible."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descrición"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "información de control instalada actualmente"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "información de control instalada para "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versión dispoñible da información do ficheiro de control"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "versión dispoñible da información de control para "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nulo>"
@@ -1735,3 +1727,18 @@ msgstr "Ver.Inst"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.Dispo"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelacións que afectan a "
+
+#~ msgid "description of "
+#~ msgstr "descrición de "
+
+#~ msgid "description"
+#~ msgstr "descrición"
+
+#~ msgid "currently installed control info"
+#~ msgstr "información de control instalada actualmente"
+
+#~ msgid "available version of control info for "
+#~ msgstr "versión dispoñible da información de control para "
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index f41aacde..7422f760 100644
--- a/dselect/po/hu.po
+++ b/dselect/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -125,7 +125,8 @@ msgid ""
 msgstr ""
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "billentyűk"
 
 #: dselect/baselist.cc:307
@@ -280,14 +281,14 @@ msgstr "Most kiemelt hozzáférési mód kiválasztása"
 msgid "Quit without changing selected access method"
 msgstr "Kilépés a választott hozzáférési mód változtatása nélkül"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Billentyűk"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -298,41 +299,53 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Bevezetés a csomagválasztásba"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -354,23 +367,26 @@ msgstr ""
 "Több Súgó is elérhető, használd bátran ezeket! - mindig üsd le a `?'-et\n"
 "a segítségért.\n"
 "\n"
-"A csomagkijelölés végeztével, üsd le az <enter>-t a változások megerősítéséhez,\n"
+"A csomagkijelölés végeztével, üsd le az <enter>-t a változások "
+"megerősítéséhez,\n"
 "vagy az `X'-et a változások mentése nélküli kilépéshez. Az ütközések és\n"
 "függőségek végső ellenőrzése megtörténik - ismét egy listát kapsz.\n"
 "Üsd le a <szóköz> billentyűt a súgó elhagyásához és lépj be a listába most!\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Bevezetés a csak-olvasható csomag lista böngészésbe"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -397,48 +413,62 @@ msgstr ""
 "\n"
 "Üsd le a <szóköz> billentyűt a súgó elhagyásához és lépj be a listába most!\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
 "\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:   Space - not installed;\n"
 "                     `*'  - installed;\n"
 "                     `-'  - not installed but config files remain;\n"
@@ -454,20 +484,24 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -485,38 +519,42 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -528,7 +566,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -730,8 +769,7 @@ msgstr "képernyőrész"
 msgid "Null colour specification\n"
 msgstr "nincs szín megadva\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "szín"
 
@@ -806,8 +844,7 @@ msgstr "`%s' elérési mód."
 msgid "Abbrev."
 msgstr "Röv."
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Leírás"
 
@@ -827,16 +864,15 @@ msgstr ""
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr ""
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr ""
 
@@ -1164,251 +1200,239 @@ msgid "pre-depends on"
 msgstr ""
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "ütközik ezzel:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Törött"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Új"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Friss"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Elavult vagy helyi"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Naprakész"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Elérhető"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Eltávolított"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Törötten telepített csomagok"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Legújabb csomagok"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Frissíthető csomagok (újabb változat elérhető)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Elavult és helyi csomagok a rendszeren"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Naprakész telepített csomagok"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Elérhető csomagok (most nincsenek telepítve)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Visszavont és többé nem elérhető csomagok"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Telepített csomagok"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Eltávolított csomagok (a beállítások még megvannak)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Törölt és soha nem telepített csomagok"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Telepített"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Törölt"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzív csomaglista"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - csomagállapotok vizsgálata"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - fő csomaglista"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (szakasz szerint)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (elérh., szakasz)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (állapot, szakasz)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (elsőbbség szerint)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (elérh., elsőbbség)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (állapot, elsőbbség)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (abc-ben)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (elérhetőség szerint)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (állapot szerint)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " jelölés:+/=/- rövid:v súgó:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " jelölés:+/=/- hosszú:v súgó:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " rövid:v súgó:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " hosszú:v súgó:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""
-"The line you have highlighted represents many packages; if you ask to install, remove, hold, etc. it you will affect all the packages which match the criterion shown.\n"
+"The line you have highlighted represents many packages; if you ask to "
+"install, remove, hold, etc. it you will affect all the packages which match "
+"the criterion shown.\n"
 "\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
-"A sor, amire állsz sok csomagot képvisel; ha telepítesz, eltávolítasz, stb., az minden mutatott kívánalomnak megfelelő csomagra hat.\n"
+"A sor, amire állsz sok csomagot képvisel; ha telepítesz, eltávolítasz, stb., "
+"az minden mutatott kívánalomnak megfelelő csomagra hat.\n"
 "\n"
-"Más a helyzet, ha egy bizonyos csomag sorára állsz, ilyenkor az adott csomagra látod a lehető legtöbb információt, például a leírását is.\n"
+"Más a helyzet, ha egy bizonyos csomag sorára állsz, ilyenkor az adott "
+"csomagra látod a lehető legtöbb információt, például a leírását is.\n"
 "Az `o' vagy `O' billentyűvel a rendezést is válthatod."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
+#: dselect/pkginfo.cc:95
+msgid "Interrelationships"
 msgstr ""
 
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
-msgstr ""
-
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "csomagleírás:"
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "nincs róla leírás"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "leírás"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "most telepített ellenőrző adatok"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "telepített ellenőrző adatok ehhez:"
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "ellenőrző fájl elérhető verziója ehhez:"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "ellenőrző adatok elérhető verziója ehhez:"
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<null>"
 
@@ -1506,3 +1530,14 @@ msgstr "Telep.ver"
 msgid "Avail.ver"
 msgstr "Elérh.ver"
 
+#~ msgid "description of "
+#~ msgstr "csomagleírás:"
+
+#~ msgid "description"
+#~ msgstr "leírás"
+
+#~ msgid "currently installed control info"
+#~ msgstr "most telepített ellenőrző adatok"
+
+#~ msgid "available version of control info for "
+#~ msgstr "ellenőrző adatok elérhető verziója ehhez:"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index c31f605c..8952811f 100644
--- a/dselect/po/id.po
+++ b/dselect/po/id.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-06 20:20+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
-"Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui.ac.id>\n"
+"Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
+"ac.id>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +36,8 @@ msgstr "Bantuan:"
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "Ketik ? untu menu panduan, . untuk topik selanjutnya, <spasi> untuk keluar."
+msgstr ""
+"Ketik ? untu menu panduan, . untuk topik selanjutnya, <spasi> untuk keluar."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -143,7 +145,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "relasi tombol"
 
 #: dselect/baselist.cc:307
@@ -298,14 +301,15 @@ msgstr "Pilih metode akses yang disorot"
 msgid "Quit without changing selected access method"
 msgstr "Keluar tanpa mengubah metode akses yang dipilih"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tombol singkat"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -316,63 +320,90 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Tombol Gerak: Berikutnya/Sebelumnya, Awal/Akhir, Atas/Bawah, Mundur/Maju:\n"
 "  panah-Bawah,j          panah-Atas,k            geser sorotan\n"
-"  N,Page-down, Spasi     P,Page-up,  Backspace   gulung daftar tiap satu halaman\n"
-"  ^n                     ^p                      gulung daftar tiap satu baris\n"
-"  t,Home                 e,End                   langsung ke awal/akhir daftar\n"
-"  u                      d                       gulung info tiap satu halaman\n"
-"  ^u                     ^d                      gulung info tiap satu baris\n"
-"  B,Panah-kiri           F,Panah-kanan           geser tampilan tiap 1/3 layar\n"
-"  ^b                     ^f                      geser tampilan tiap 1 karakter\n"
+"  N,Page-down, Spasi     P,Page-up,  Backspace   gulung daftar tiap satu "
+"halaman\n"
+"  ^n                     ^p                      gulung daftar tiap satu "
+"baris\n"
+"  t,Home                 e,End                   langsung ke awal/akhir "
+"daftar\n"
+"  u                      d                       gulung info tiap satu "
+"halaman\n"
+"  ^u                     ^d                      gulung info tiap satu "
+"baris\n"
+"  B,Panah-kiri           F,Panah-kanan           geser tampilan tiap 1/3 "
+"layar\n"
+"  ^b                     ^f                      geser tampilan tiap 1 "
+"karakter\n"
 "\n"
 "Tandai paket untuk diproses kemudian:\n"
 "  +, Insert     pasang atau perbaharui  =, H  cekal dalam keadaan sekarang\n"
-"  -, Delete     buang                   :, G  jangan dicekal, perbaharui, atau biarkan tak terpasang\n"
+"  -, Delete     buang                   :, G  jangan dicekal, perbaharui, "
+"atau biarkan tak terpasang\n"
 "  _             buang dan kosongkan konfigurasi\n"
 "                                                      Lain-lain:\n"
-"Keluar, batal, timpa (catat huruf besarnya!):                ?, F1   lihat panduan (juga Panduan)\n"
-" Return/Enter   Konfirmasi,keluar (periksa ketergantungan)   i, I    hidupkan/putar tampilan info\n"
-"     Q          Konfirmasi, keluar (timpa ketergantungan)    o, O    telusuri pilihan pengurutan\n"
-"   X, Esc       Keluar, batalkan semua perubahan             v, V    ubah pilihan layar status\n"
-"     R          Kembalikan ke keadaan sebelum daftar ini      ^I     sajikan ulang layar ini\n"
-"     U          setel semua ke keadaan  disarankan             /     cari (Return untuk batal)\n"
-"     D          setel semua ke keadaan langsung diminta      n, \\   ulangi pencarian terakhir\n"
-
-#: dselect/helpmsgs.cc:33
+"Keluar, batal, timpa (catat huruf besarnya!):                ?, F1   lihat "
+"panduan (juga Panduan)\n"
+" Return/Enter   Konfirmasi,keluar (periksa ketergantungan)   i, I    "
+"hidupkan/putar tampilan info\n"
+"     Q          Konfirmasi, keluar (timpa ketergantungan)    o, O    "
+"telusuri pilihan pengurutan\n"
+"   X, Esc       Keluar, batalkan semua perubahan             v, V    ubah "
+"pilihan layar status\n"
+"     R          Kembalikan ke keadaan sebelum daftar ini      ^I     sajikan "
+"ulang layar ini\n"
+"     U          setel semua ke keadaan  disarankan             /     cari "
+"(Return untuk batal)\n"
+"     D          setel semua ke keadaan langsung diminta      n, \\   ulangi "
+"pencarian terakhir\n"
+
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Pengantar ke pemilihan paket"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -383,12 +414,14 @@ msgstr ""
 "Anda akan disajikan dengan suatu daftar paket yang terpasang atau tersedia\n"
 "untuk dipasang. Anda dapat menelusuri seluruh daftar dengan tombol kursor,\n"
 "menandai paket untuk dipasang (dengan `+') atau dibuang (dengan `-').\n"
-"Paket dapat ditandai secara tunggal atau dalam sebuah grup. Mulanya, Anda akan melihat \n"
+"Paket dapat ditandai secara tunggal atau dalam sebuah grup. Mulanya, Anda "
+"akan melihat \n"
 "bahwa baris `Semua paket' terpilih. Tombol `+',`-', dan seterusnya akan \n"
 "melibatkan semua paket yang diwakili oleh baris yang tersorot.\n"
 "\n"
 "Beberapa pilihan Anda akan menyebabkan bentrok atau masalah ketergantungan.\n"
-"Anda akan diberikan sub-daftar paket-paket yang berkaitan, sehingga Anda dapat\n"
+"Anda akan diberikan sub-daftar paket-paket yang berkaitan, sehingga Anda "
+"dapat\n"
 "menyelesaikan masalah tersebut.\n"
 "\n"
 "Anda sebaiknya membaca daftar tombol dan penjelasan pada layar.\n"
@@ -397,23 +430,27 @@ msgstr ""
 "\n"
 "Apabila Anda telah selesai memilih paket, tekan <enter> untuk konfirmasi,\n"
 "atau `X' untuk keluar tanpa menyimpan perubahan. Pemeriksaan akhir\n"
-"atas kemungkinan bentrokan dan ketergantungan paket akan dilakukan - di sini\n"
+"atas kemungkinan bentrokan dan ketergantungan paket akan dilakukan - di "
+"sini\n"
 "juga mungkin Anda akan melihat sub-daftar.\n"
 "\n"
-"Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar paket.\n"
+"Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar "
+"paket.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Pengantar ke browser daftar paket hanya-baca"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -426,10 +463,13 @@ msgid ""
 msgstr ""
 "Selamat berjumpa dengan daftar paket utama dselect.\n"
 "\n"
-"Anda akan disajikan suatu daftar paket yang terpasang atau tersedia untuk dipasang.\n"
-"Oleh karena Anda tidak punya wewenang yang cukup untuk memperbaharui status \n"
+"Anda akan disajikan suatu daftar paket yang terpasang atau tersedia untuk "
+"dipasang.\n"
+"Oleh karena Anda tidak punya wewenang yang cukup untuk memperbaharui "
+"status \n"
 "paket, Anda berada pada modus hanya-baca. Anda dapat menelusuri daftar \n"
-"menggunakan tombol kursor (silakan lihat layar panduan `Tombol Singkat'), amati\n"
+"menggunakan tombol kursor (silakan lihat layar panduan `Tombol Singkat'), "
+"amati\n"
 "status paket dan bacalah keterangan tentangnya.\n"
 "\n"
 "Anda sebaiknya membaca daftar tombol dan penjelasannya di layar.\n"
@@ -438,76 +478,102 @@ msgstr ""
 "\n"
 "Apabila Anda telah selesai, tekan `Q' atau <enter> untuk keluar.\n"
 "\n"
-"Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar paket.\n"
+"Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar "
+"paket.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Pengantar ke sub-daftar pemecahan masalah bentrok/ketergantungan"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 "Pemecahan masalah ketergantungan/bentrokan - pengantar.\n"
 "\n"
-"Salah satu atau lebih pilihan Anda telah menyebabkan masalah bentrokan atau \n"
+"Salah satu atau lebih pilihan Anda telah menyebabkan masalah bentrokan "
+"atau \n"
 "ketergantungan paket - beberapa paket seharusnya hanya dipasang bersamaan \n"
-"dengan paket lain, dan beberapa kombinasi paket mungkin tidak dapat dipasang \n"
+"dengan paket lain, dan beberapa kombinasi paket mungkin tidak dapat "
+"dipasang \n"
 "secara bersamaan.\n"
 "\n"
-"Anda akan melihat sub-daftar berisi paket-paket yang terlibat. Setengah layar\n"
+"Anda akan melihat sub-daftar berisi paket-paket yang terlibat. Setengah "
+"layar\n"
 "bagian bawah menampilkan paket-paket yang bentrok dan saling tergantung.\n"
-"Gunakan `i'  untuk berpindah di antara penjelasan paket dan keterangan 'control' internal.\n"
+"Gunakan `i'  untuk berpindah di antara penjelasan paket dan keterangan "
+"'control' internal.\n"
 "\n"
 "Sekumpulan paket yang `disarankan' telah disiapkan, dan penandaan awal \n"
 "pada sub-daftar ini telah disetel agar sesuai, sehingga Anda cukup menekan \n"
-"'Return' untuk menerima saran tersebut. Anda juga dapat membatalkan perubahan\n"
+"'Return' untuk menerima saran tersebut. Anda juga dapat membatalkan "
+"perubahan\n"
 "yang menyebabkan masalah tersebut dan kembali ke daftar utama dengan \n"
 "menekan huruf `X' besar.\n"
 "\n"
-"Anda juga dapat menelusuri seluruh daftar dan mengubah penandaan sehingga semuanya\n"
-"sesuai dengan keinginan Anda, dan Anda juga dapat `menolak' saran saya dengan \n"
-"menggunakan tombol `D' atau `R' besar (lihat layar panduan relasi tombol). Anda dapat \n"
-"menggunakan `Q' besar untuk memaksa saya menerima keadaan yang ada sekarang, \n"
-"dalam hal Anda ingin menimpa suatu anjuran atau Anda berpikir bahwa ada suatu yang \n"
+"Anda juga dapat menelusuri seluruh daftar dan mengubah penandaan sehingga "
+"semuanya\n"
+"sesuai dengan keinginan Anda, dan Anda juga dapat `menolak' saran saya "
+"dengan \n"
+"menggunakan tombol `D' atau `R' besar (lihat layar panduan relasi tombol). "
+"Anda dapat \n"
+"menggunakan `Q' besar untuk memaksa saya menerima keadaan yang ada "
+"sekarang, \n"
+"dalam hal Anda ingin menimpa suatu anjuran atau Anda berpikir bahwa ada "
+"suatu yang \n"
 "salah pada program.\n"
 "\n"
-"Tekan <spasi> untuk meninggalkan panduan dan masuk ke sub-daftar; ingat: tekan `?' \n"
+"Tekan <spasi> untuk meninggalkan panduan dan masuk ke sub-daftar; ingat: "
+"tekan `?' \n"
 "untuk melihat panduan.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Tampilan, bagian 1: daftar paket dan karakter status"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
-"\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:   Space - not installed;\n"
 "                     `*'  - installed;\n"
 "                     `-'  - not installed but config files remain;\n"
@@ -523,21 +589,30 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 msgstr ""
-"Setengah layar bagian atas menampilkan suatu daftar paket. Untuk setiap paket Anda\n"
-"akan melihat empat kolom berisi status paket pada sistem dan suatu tanda. Dalam modus\n"
-"ringkas (gunakan `v' untuk tampilan terinci), ini adalah karakter tunggal, dari kiri ke kanan:\n"
-"\n"
-" Tanda kesalahan: Kosong - tidak ada kesalahan (tetapi paket mungkin saja rusak - lihat di bawah ini)\n"
-"                    `R'  - ada kesalahan serius selama pemasangan, perlu dipasang ulang;\n"
+"Setengah layar bagian atas menampilkan suatu daftar paket. Untuk setiap "
+"paket Anda\n"
+"akan melihat empat kolom berisi status paket pada sistem dan suatu tanda. "
+"Dalam modus\n"
+"ringkas (gunakan `v' untuk tampilan terinci), ini adalah karakter tunggal, "
+"dari kiri ke kanan:\n"
+"\n"
+" Tanda kesalahan: Kosong - tidak ada kesalahan (tetapi paket mungkin saja "
+"rusak - lihat di bawah ini)\n"
+"                    `R'  - ada kesalahan serius selama pemasangan, perlu "
+"dipasang ulang;\n"
 " Keadaan terpasang:  Spasi - tidak terpasang;\n"
 "                      `*'  - terpasang;\n"
-"                      `-'  - tidak terpasang tetapi berkas konfigurasi masih ada;\n"
+"                      `-'  - tidak terpasang tetapi berkas konfigurasi masih "
+"ada;\n"
 "       paket dalam  { `U'  - telah dibuka tetapi belum dikonfigurasi;\n"
-"       keadaan ini  { `C'  - terkonfigurasi separuh (telah terjadi kesalahan);\n"
+"       keadaan ini  { `C'  - terkonfigurasi separuh (telah terjadi "
+"kesalahan);\n"
 "       sedang rusak { `I'  - terpasang separuh (telah terjadi kesalahan).\n"
-" Tanda lama: hal yang telah diminta terhadap paket ini sebelum menampilkan daftar ini;\n"
+" Tanda lama: hal yang telah diminta terhadap paket ini sebelum menampilkan "
+"daftar ini;\n"
 " Tanda: hal yang diminta terhadap paket ini:\n"
 "  `*': ditandai untuk dipasang atau diperbaharui;\n"
 "  `-': ditandai untuk dibuang, tetapi konfigurasinya dibiarkan saja;\n"
@@ -545,21 +620,25 @@ msgstr ""
 "  `_': ditandai untuk dibuang seluruhnya - termasuk konfigurasinya;\n"
 "  `n': ini paket baru dan belum ditandai untuk dipasang/dibuang/dll.\n"
 "\n"
-"Juga akan ditampilkan untuk setiap paket: Prioritas, Bagian, Nama, nomor versi yang \n"
+"Juga akan ditampilkan untuk setiap paket: Prioritas, Bagian, Nama, nomor "
+"versi yang \n"
 "terpasang dan yang tersedia (shift-V untuk menampilkan/menyembunyikan) dan \n"
 "keterangan ringkas.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Tampilan, bagian 2: penyorotan daftar; tampilan keterangan"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -576,74 +655,95 @@ msgid ""
 "  Use the `i' key to cycle through the displays, and `I' to hide the\n"
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
-"* Penyorotan: Satu baris pada daftar paket akan disorot. Hal ini menunjukkan paket-paket\n"
+"* Penyorotan: Satu baris pada daftar paket akan disorot. Hal ini menunjukkan "
+"paket-paket\n"
 "   yang akan terpengaruh dengan menekan `+', `-', dan `_'.\n"
 "\n"
-"* Baris pemisah di tengah layar menampilkan penjelasan singkat tentang status paket yang \n"
-"  sedang disorot, atau suatu penjelasan tentang grup yang sedang disorot. Jika and tidak \n"
-"  mengerti arti dari beberapa karekter status yang ditampilkan, lihatlah paket yang \n"
-"  sehubungan dan bacalah keterangan yang ada di garis pemisah ini. Atau, gunakan tombol \n"
-"  `v' untuk tampilan terinci (tekan `v' lagi untuk kembali ke tampilan ringkas).\n"
-"\n"
-"* Bagian bawah layar menampilkan keterangan tentang paket yang sedang disorot \n"
+"* Baris pemisah di tengah layar menampilkan penjelasan singkat tentang "
+"status paket yang \n"
+"  sedang disorot, atau suatu penjelasan tentang grup yang sedang disorot. "
+"Jika and tidak \n"
+"  mengerti arti dari beberapa karekter status yang ditampilkan, lihatlah "
+"paket yang \n"
+"  sehubungan dan bacalah keterangan yang ada di garis pemisah ini. Atau, "
+"gunakan tombol \n"
+"  `v' untuk tampilan terinci (tekan `v' lagi untuk kembali ke tampilan "
+"ringkas).\n"
+"\n"
+"* Bagian bawah layar menampilkan keterangan tentang paket yang sedang "
+"disorot \n"
 "  (jika hanya ada satu paket).\n"
 "\n"
-"  Di bagian ini juga dapat menampilkan keterangan tambahan tentang paket tersebut.\n"
-"  rincian 'control' paket internal (baik untuk versi yang terpasang maupun yang tersedia),\n"
-"  atau keterangan tentang masalah bentrokan dan ketergantungan yang melibatkan paket\n"
+"  Di bagian ini juga dapat menampilkan keterangan tambahan tentang paket "
+"tersebut.\n"
+"  rincian 'control' paket internal (baik untuk versi yang terpasang maupun "
+"yang tersedia),\n"
+"  atau keterangan tentang masalah bentrokan dan ketergantungan yang "
+"melibatkan paket\n"
 "  tersebut (dalam sub-daftar pemecahan bentrokan/ketergantungan).\n"
 "\n"
 "  Gunakan tombol `i' untuk berpindah-pindah sepanjang layar, dan `I' untuk \n"
-"  menyembunyikan tampilan informasi atau memperlebarnya hingga memenuhi layar.\n"
+"  menyembunyikan tampilan informasi atau memperlebarnya hingga memenuhi "
+"layar.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Pengantar ke tampilan pemilihan metode"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
-"dselect dan dpkg dapat secara otomatis memasang, memuat berkas-berkas paket \n"
+"dselect dan dpkg dapat secara otomatis memasang, memuat berkas-berkas "
+"paket \n"
 "dari satu atau lebih kemungkinan tempat yang berbeda. \n"
 "\n"
 "Hal ini memungkinkan Anda memilih salah satu metode pemasangan.\n"
 "\n"
-"Pindahkan sorotan ke metode yang ingin Anda gunakan dan tekan Enter. Anda akan \n"
+"Pindahkan sorotan ke metode yang ingin Anda gunakan dan tekan Enter. Anda "
+"akan \n"
 "diminta memasukkan informasi yang diperlukan untuk pemasangan.\n"
 "\n"
-"Ketika Anda memindahkan sorotan, keterangan dari setiap metode, bila tersedia, akan \n"
+"Ketika Anda memindahkan sorotan, keterangan dari setiap metode, bila "
+"tersedia, akan \n"
 "ditampilkan di setengah layar bagian bawah.\n"
 "\n"
-"Jika Anda ingin keluar tanpa mengubah sesuatu apapun, gunakan tombol `x' saat \n"
+"Jika Anda ingin keluar tanpa mengubah sesuatu apapun, gunakan tombol `x' "
+"saat \n"
 "berada dalam daftar metode pemasangan.\n"
 "\n"
-"Sebuah daftar tombol singkat yang lengkap tersedia dengan menekan tombol `k' \n"
+"Sebuah daftar tombol singkat yang lengkap tersedia dengan menekan tombol "
+"`k' \n"
 "sekarang, atau dari menu panduan dengan menekan tombol `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "tombol singkat untuk pemilihan metode"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -655,7 +755,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -665,13 +766,20 @@ msgid ""
 msgstr ""
 "Tombol gerakan: Berikutnya/Sebelumnya, Awal/Akhir, Atas/Bawah, Mundur/Maju:\n"
 "  n, Panah-bawah         p,Panah-atas             pindahkan sorotan\n"
-"  N, Page-down,Spasi     P,Page-up,Backspace      gulung daftar tiap satu halaman\n"
-"  ^n                     ^p                       gulung daftar tiap satu baris\n"
-"  t, Home                e, End                   langsung ke awal/akhir daftar\n"
-"  u                      d                        gulung info tiap satu halaman\n"
-"  ^u                    ^d                        gulung info tiap satu baris\n"
-"  B, Panah-kiri          F, Panah-kanan           geser tampilan tiap 1/3 layar\n"
-"  ^b                    ^f                        geser tampilan tiap 1 karekter\n"
+"  N, Page-down,Spasi     P,Page-up,Backspace      gulung daftar tiap satu "
+"halaman\n"
+"  ^n                     ^p                       gulung daftar tiap satu "
+"baris\n"
+"  t, Home                e, End                   langsung ke awal/akhir "
+"daftar\n"
+"  u                      d                        gulung info tiap satu "
+"halaman\n"
+"  ^u                    ^d                        gulung info tiap satu "
+"baris\n"
+"  B, Panah-kiri          F, Panah-kanan           geser tampilan tiap 1/3 "
+"layar\n"
+"  ^b                    ^f                        geser tampilan tiap 1 "
+"karekter\n"
 "(Ini adalah tombol gerakan yang sama seperti dalam tampilan daftar paket.)\n"
 "\n"
 "Keluar:\n"
@@ -796,7 +904,8 @@ msgid ""
 "later for copying conditions. There is NO warranty.\n"
 "See %s --license for copyright and license details.\n"
 msgstr ""
-"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2 atau \n"
+"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2 "
+"atau \n"
 "selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
 "Lihat %s --license keterangan hak cipta dan rincian lisensi.\n"
 
@@ -823,8 +932,10 @@ msgstr ""
 "Pilihan:\n"
 "  --admindir <direktori>     Gunakan <direktori> dan bukannya %s. \n"
 "  --expert                  Hidupkan modus untuk yang ahli.\n"
-"  --debug <berkas> | -D <berkas>   Hidupkan proses debug, kirim hasilnya ke <berkas>.\n"
-"  --colour | --color screenpart:[latar-depan],[latar-belakang][:atribut[+atribut+...]].\n"
+"  --debug <berkas> | -D <berkas>   Hidupkan proses debug, kirim hasilnya ke "
+"<berkas>.\n"
+"  --colour | --color screenpart:[latar-depan],[latar-belakang][:atribut"
+"[+atribut+...]].\n"
 "                              Konfigurasi warna layar.\n"
 "\n"
 
@@ -885,8 +996,7 @@ msgstr "bagian layar"
 msgid "Null colour specification\n"
 msgstr "tidak ada spesifikasi warna\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "warna"
 
@@ -961,8 +1071,7 @@ msgstr "Metode akses `%s'"
 msgid "Abbrev."
 msgstr "Singkatan"
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Keterangan"
 
@@ -982,16 +1091,16 @@ msgstr "gagal melakukan 're-block' SIGWINCH"
 msgid "getch failed"
 msgstr "getch gagal"
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[tidak ada]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "penjelasan dari"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Tidak ada penjelasan tersedia."
 
@@ -1322,251 +1431,242 @@ msgid "pre-depends on"
 msgstr "pra-syarat awal"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "bentrok dengan"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "menyediakan"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "menggantikan"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "disempurnakan"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Bth"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Ptg"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rkm"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Plh"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Tbh"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Smb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "CACAT"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Rusak"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Baru"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Diperbaharui"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Usang/lokal"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Masih baru"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Tersedia"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Dibuang"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Paket terpasang yang rusak"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Paket baru yang tersedia"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Paket-paket terbaru (versi terbaru tersedia)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Paket-paket lokal dan usang ada pada sistem"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paket-paket terpasang yang terkini"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Paket-paket yagn tersedia (belum terpasang)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Paket-paket terbuang dan tak lagi tersedia"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Paket-paket yang terpasang"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Paket-paket yang dibuang (konfigurasi masih ada)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Paket-paket yang dimusnahkan dan yang belum pernah terpasang"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Terpasang"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Musnah"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - daftar paket terinci"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - peninjauan keadaan paket"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - daftar paket utama"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (berdasarkan bagian)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (tersedia, bag.)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, bag.)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (berdasarkan prioritas)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (tersedia, prioritas)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status,prioritas)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr "  (secara alfabet)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (berdasarkan ketersediaan)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (berdasarkan status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " tandai:+/=/-  ringkas:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " tandai:+/=/-  rinci:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " ringkas:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " rinci:v bantuan:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""
-"The line you have highlighted represents many packages; if you ask to install, remove, hold, etc. it you will affect all the packages which match the criterion shown.\n"
-"\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"The line you have highlighted represents many packages; if you ask to "
+"install, remove, hold, etc. it you will affect all the packages which match "
+"the criterion shown.\n"
+"\n"
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
-"Baris yang telah Anda sorot mewakili banyak paket. Jika Anda ingin memasang, membuang, mencekal, dll. paket ini, Anda akan melibatkan semua paket yang sesuai dengan kriteria yang tampak.\n"
-"\n"
-"Jika Anda memindahkan sorotan ke suatu baris untuk paket tertentu, Anda akan melihat keterangan tentang paket itu di sini.\n"
-"Anda dapat menggunakan `o' dan `O' untuk mengubah pengurutan dan memberikan Anda peluang untuk menandai paket dalam beragam grup berbeda."
-
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "antar hubungan yang mempengaruhi"
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+"Baris yang telah Anda sorot mewakili banyak paket. Jika Anda ingin memasang, "
+"membuang, mencekal, dll. paket ini, Anda akan melibatkan semua paket yang "
+"sesuai dengan kriteria yang tampak.\n"
+"\n"
+"Jika Anda memindahkan sorotan ke suatu baris untuk paket tertentu, Anda akan "
+"melihat keterangan tentang paket itu di sini.\n"
+"Anda dapat menggunakan `o' dan `O' untuk mengubah pengurutan dan memberikan "
+"Anda peluang untuk menandai paket dalam beragam grup berbeda."
+
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "antar hubungan"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr " Keterangan dari"
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr " tidak ada keterangan yang tersedia"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr " keterangan"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "Info 'control' yang terpasang saat ini"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr " Info 'control' yang terpasang untuk"
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versi info berkas 'control' yang tersedia"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "versi info 'control' yang tersedia untuk"
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nihil>"
 
@@ -1663,3 +1763,18 @@ msgstr "Ver. terpsg"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver. t'sedia"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "antar hubungan yang mempengaruhi"
+
+#~ msgid "description of "
+#~ msgstr " Keterangan dari"
+
+#~ msgid "description"
+#~ msgstr " keterangan"
+
+#~ msgid "currently installed control info"
+#~ msgstr "Info 'control' yang terpasang saat ini"
+
+#~ msgid "available version of control info for "
+#~ msgstr "versi info 'control' yang tersedia untuk"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index ba88b8bb..168b68f0 100644
--- a/dselect/po/it.po
+++ b/dselect/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -173,7 +173,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "funzionalità dei tasti"
 
 #: dselect/baselist.cc:307
@@ -328,14 +329,15 @@ msgstr "Seleziona il metodo evidenziato"
 msgid "Quit without changing selected access method"
 msgstr "Esci senza cambiare il metodo di accesso"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Funzionalità dei Tasti"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -396,11 +398,11 @@ msgstr ""
 "   D     imposta tutti a stato Dirett. chiesto  \\   ripeti l'ultima "
 "ricerca\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduzione alla selezione dei pacchetti"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -460,11 +462,11 @@ msgstr ""
 "\n"
 "Adesso premi <spazio> per uscire dall'aiuto ed entrare nella lista.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introduzione alla lista dei pacchetti (in sola lettura)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -503,12 +505,12 @@ msgstr ""
 "\n"
 "Adesso premi <spazio> per lasciare l'aiuto e visitare la lista.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Introduzione alla sotto-lista per la risoluzione dei conflitti/dipendenze"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -579,11 +581,11 @@ msgstr ""
 "Premi <spazio> per lasciare l'aiuto e visitare la sotto-lista; ricorda:"
 "`?'=aiuto\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visualizzazione, parte 1: lista dei pacchetti e caratteri di stato"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -649,12 +651,12 @@ msgstr ""
 "installata, quella disponibile (`V' per mostrarla/nasc.) e la descr. "
 "sommaria.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 "Visualizzazione, parte 2: evidenziazione nella lista; vis. informazioni"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -707,11 +709,11 @@ msgstr ""
 "  nascondere la schermata delle informazioni o espanderla su quasi \n"
 "  tutto lo schermo.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduzione alla selezione del metodo"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -753,14 +755,15 @@ msgstr ""
 "Una lista completa dei tasti è disponibile premendo `k' adesso, o dal menù\n"
 "di aiuto che è raggiungibile premendo `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tasti per la selezione del metodo"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -927,7 +930,9 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "Uso: %s [<opzione> ...] [<azione> ...]\n\n"
+msgstr ""
+"Uso: %s [<opzione> ...] [<azione> ...]\n"
+"\n"
 
 #: dselect/main.cc:175
 #, c-format
@@ -943,7 +948,8 @@ msgstr ""
 "Opzioni:\n"
 "  --admindir <directory>     Usa <directory> invece di %s.\n"
 "  --expert                   Abilita il modo esperto.\n"
-"  --debug <file> | -D<file>  Abilita il debugging, mandando l'output a <file>.\n"
+"  --debug <file> | -D<file>  Abilita il debugging, mandando l'output a "
+"<file>.\n"
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
 "                             Configura i colori dello schermo.\n"
 "\n"
@@ -1082,7 +1088,7 @@ msgstr "Metodo d'accesso `%s'."
 msgid "Abbrev."
 msgstr "Abbrev."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1102,15 +1108,16 @@ msgstr "impossibile ribloccare SIGWINCH"
 msgid "getch failed"
 msgstr "getch fallita"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[nessuna]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "spiegazioni su "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Nessuna spiegazione disponibile"
 
@@ -1443,194 +1450,198 @@ msgid "pre-depends on"
 msgstr "pre-dipende da"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "è in conflitto con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "fornisce"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "sostituisce"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "estende"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Ess"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rac"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opz"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "difettosi"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "nuovi"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "da aggiornare"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "obsoleti o locali"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "già aggiornati"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "disponibili"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "rimossi"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Pacchetti installati con difetti"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nuovi pacchetti disponibili"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Pacchetti aggiornabili (è disponibile una nuova versione)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Pacchetti obsoleti e locali presenti nel sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pacchetti aggiornati già installati"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pacchetti disponibili (non attualmente installati)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Pacchetti rimossi e non più disponibili"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Pacchetti installati"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Pacchetti rimossi (la configurazione è ancora presente)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pacchetti eliminati e quelli mai installati"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installato"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Eliminato"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista ricorsiva dei pacchetti "
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - ispezione dello stato del pacchetto"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principale"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (per sezione)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dispon., sezione)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (stato, sezione)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (per priorità)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dispon., priorità)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (stato, priorità)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (per disponibilità)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (per stato)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marc:+/=/- concisa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marc:+/=/- estesa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " concisa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " estesa:v aiuto:?"
 
@@ -1655,42 +1666,26 @@ msgstr ""
 "l'opportunità di contrassegnare i pacchetti in differenti tipi di "
 "raggruppamento."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelazioni relative a "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelazioni"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descrizione di "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "nessuna descrizione disponibile."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descrizione"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "info di controllo attualmente installate"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "info di controllo installate di "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "info di controllo della versione disponibile"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "info di controllo della versione disponibile di "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<null>"
@@ -1788,3 +1783,18 @@ msgstr "Ver.inst."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.disp."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelazioni relative a "
+
+#~ msgid "description of "
+#~ msgstr "descrizione di "
+
+#~ msgid "description"
+#~ msgstr "descrizione"
+
+#~ msgid "currently installed control info"
+#~ msgstr "info di controllo attualmente installate"
+
+#~ msgid "available version of control info for "
+#~ msgstr "info di controllo della versione disponibile di "
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index c0043eb6..f7cefed7 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-06 20:05+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -149,7 +149,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "キー設定"
 
 #: dselect/baselist.cc:307
@@ -304,14 +305,15 @@ msgstr "現在ハイライト表示されているアクセス方法を選択す
 msgid "Quit without changing selected access method"
 msgstr "選択されたアクセス方法を変更せずに終了する"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "キー操作"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -365,11 +367,11 @@ msgstr ""
 "   U     提案された状態にすべて従う      /     検索 (リターンでキャンセル)\n"
 "   D     直接要求された状態にすべて従う  n, \\  検索次候補\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "パッケージ選択の手引き"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -424,11 +426,11 @@ msgstr ""
 "\n"
 "<スペース> キーを押すとヘルプが終了し、パッケージ一覧画面になります。\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "パッケージ一覧ブラウザの手引き (リードオンリー)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -465,11 +467,11 @@ msgstr ""
 "閲覧を終えたら、`Q' またはリターンキーを押せば終了します。\n"
 "<スペース> キーを押すとヘルプが終了し、パッケージ一覧画面になります。\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "競合や依存関係解決用サブリストの手引き"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -529,11 +531,11 @@ msgstr ""
 "ヘルプを終了してサブリストに戻るには <スペース> キーを入力します。\n"
 "`?' キーでヘルプの参照ができることを覚えておいてください。\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "表示 (その1): パッケージ一覧とステータス文字"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -592,11 +594,11 @@ msgstr ""
 "トール済みバージョンと利用可能バージョン(Shift-V で表示/非表示切り替え)、\n"
 "パッケージ要約説明も表示されます。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "表示 (その2): パッケージ一覧のハイライト。情報画面"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -643,11 +645,11 @@ msgstr ""
 "  表示情報の切り替えは `i' キーで行えます。`I' キーで情報画面を非表示にし\n"
 "  てパッケージ一覧を全画面で表示させることができます。\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "メソッド選択画面の手引き"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -691,14 +693,15 @@ msgstr ""
 "キー操作一覧を参照するには、この画面で、または `?' キーを入力してヘルプメ\n"
 "ニュー画面に移ってから `k' キーを入力してください。\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "メソッド選択画面のキー操作"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -852,7 +855,8 @@ msgid ""
 "later for copying conditions. There is NO warranty.\n"
 "See %s --license for copyright and license details.\n"
 msgstr ""
-"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョン\n"
+"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書バージョ"
+"ン\n"
 "2 もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 "コピーライトおよびライセンスの詳細は %s --licence を参照してください。\n"
 
@@ -877,7 +881,8 @@ msgstr ""
 "オプション:\n"
 "  --admindir <ディレクトリ>  %s の代わりに <ディレクトリ> を使う\n"
 "  --expert                   上級者モードに切り替える\n"
-"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイル>に送る\n"
+"  --debug <ファイル> | -D<ファイル>  デバッグモードに切り替え、出力を<ファイ"
+"ル>に送る\n"
 "  --colour | --color 画面:[前景],[背景][:属性[+属性+..]]\n"
 "                             画面の色を設定する\n"
 "\n"
@@ -1014,7 +1019,7 @@ msgstr "アクセス方法 `%s'。"
 msgid "Abbrev."
 msgstr "頭文字"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "説明"
 
@@ -1034,15 +1039,16 @@ msgstr "SIGWINCH のリブロックに失敗しました"
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[なし]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "説明: "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "説明がありません。"
 
@@ -1373,194 +1379,198 @@ msgid "pre-depends on"
 msgstr "は以下のパッケージに先行依存しています:"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "は以下のパッケージと競合しています:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "は以下のパッケージを提供しています:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "置換"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "拡張"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "必"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "重"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "再"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "ä»»"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "特"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "寄"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "バ"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "壊れている"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "新規"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "更新されている"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "廃止/ローカル"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "最新"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "取得可能"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "削除"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "うまくインストールされていないパッケージ"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "取得可能新パッケージ"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "更新されているパッケージ (新バージョンが取得可能)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "システムに残っている、廃止されたまたはローカルなパッケージ"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "インストールされている最新パッケージ"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "取得可能パッケージ (未インストール)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "削除されて利用不可能なパッケージ"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "インストール済みのパッケージ"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "削除されているパッケージ (設定ファイルは存在)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "削除されて、一度もインストールされていない"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "導入済み"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "完全削除"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - 再帰的パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - パッケージ状態の閲覧"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr "(分類別)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr "(利用可、分類別)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr "(状態、分類別)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr "(優先度別)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr "(利用可、優先度別)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr "(状態、優先度別)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr "(アルファベット順)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr "(利用可別)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr "(状態別)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr "マーク:+/=/- 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr "マーク:+/=/- 詳細:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " 詳細:v ヘルプ:?"
 
@@ -1583,42 +1593,26 @@ msgstr ""
 "示されます。`o' および `O' を使用してパッケージソート順を変更し、異なるグ\n"
 "ループに属したパッケージ群にマークを付けることもできます。"
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "関連依存情報: "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "関連依存"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "説明: "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "説明がありません。"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "説明"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "導入済みバージョンの制御情報"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "導入済みバージョンの制御情報 "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "利用可能バージョンの制御情報"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "利用可能バージョンの制御情報 "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<なし>"
@@ -1716,3 +1710,18 @@ msgstr "導入Ver"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "可能Ver"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "関連依存情報: "
+
+#~ msgid "description of "
+#~ msgstr "説明: "
+
+#~ msgid "description"
+#~ msgstr "説明"
+
+#~ msgid "currently installed control info"
+#~ msgstr "導入済みバージョンの制御情報"
+
+#~ msgid "available version of control info for "
+#~ msgstr "利用可能バージョンの制御情報 "
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 6eeef6d1..50221b28 100644
--- a/dselect/po/ko.po
+++ b/dselect/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-12-29 08:18+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -137,7 +137,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "키바인딩"
 
 # FIXME: bad msgid
@@ -295,14 +296,15 @@ msgstr "현재 반전된 설치 방법을 선택"
 msgid "Quit without changing selected access method"
 msgstr "선택한 설치 방법을 바꾸지 않고 종료"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "키 입력"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -358,11 +360,11 @@ msgstr ""
 "   U     모두 제안하는 상태로                   /   찾기 (취소하려면 Return\n"
 "   D     모두 직접 요청된 상태로                \\  마지막 찾기 반복\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "꾸러미 선택에 관한 안내"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -415,11 +417,11 @@ msgstr ""
 "\n"
 "<space>를 누르시면 도움말을 나가서 꾸러미 목록으로 들어갑니다.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "꾸러미 목록 읽기 전용 브라우저 소개"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -454,11 +456,11 @@ msgstr ""
 "\n"
 "도움말을 종료하고 목록으로 들아가려면 <space>를 누르십시오.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "충돌/의존성 해결 하위 목록 소개"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -521,11 +523,11 @@ msgstr ""
 "도움말에서 빠져나가서 하위 목록으로 들어가려면 <space>를 누르십시오.\n"
 "기억하세요.  도움이 필요하면 `?'키를 누르십시오.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "화면 구성 첫번째: 꾸러미 목록 및 상태를 나타내는 문자"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -582,11 +584,11 @@ msgstr ""
 "각 꾸러미의 우선순위, 섹션, 이름, 설치된 버전과 사용 가능한 버전 (shift-V를\n"
 "누르면 보이기/숨기기) 및 요약된 설명을 표시합니다.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "화면 구성 두번째: 반전 막대, 정보 표시"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -635,11 +637,11 @@ msgstr ""
 "이\n"
 "  화면을 감추거나 정보 창을 크게 표시할 수도 있습니다.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "설치 방법 선택, 화면 구성 소개"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -678,14 +680,15 @@ msgstr ""
 "키 입력에 관한 설명을 보시려면 `k'를 누르시고, 도움말 메뉴를 보려면 `?'를\n"
 "누르십시오.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "설치 방법 선택, 키 입력"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1008,7 +1011,7 @@ msgstr "설치 방법 `%s'."
 msgid "Abbrev."
 msgstr "약어"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "설명"
 
@@ -1028,15 +1031,16 @@ msgstr "SIGWINCH 시그널을 블록을 다시 설정하는 데 실패했습니
 msgid "getch failed"
 msgstr "getch가 실패했습니다"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[없음]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "설명 : "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "설명 없습니다."
 
@@ -1367,194 +1371,198 @@ msgid "pre-depends on"
 msgstr "꾸러미는 다음 꾸러미에 선의존:"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "꾸러미는 다음 꾸러미와 충돌:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "꾸러미는 다음 꾸러미의 기능을 제공:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "꾸러미는 다음 꾸러미를 대치:"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "꾸러미는 다음 꾸러미를 확장:"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "필수"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "중요"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "표준"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "추천"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "옵션"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "별도"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "기여"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "버그"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "깨짐"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "새로움"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "업데이트한"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "과거/로컬"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "최신"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "이용가능"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "지움"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "깨져서 설치된 꾸러미"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "새롭게 이용가능한 꾸러미"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "업데이트한 꾸러미 (새로운 버전이 있음)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "시스템에 있지만 오래전 꾸러미 및 로컬 꾸러미"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "업데이트해 설치된 꾸러미"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "이용 가능한 꾸러미 (아직 설치되지 않음)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "지워서 더 이상 이용할 수 없는 꾸러미"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "설치한 꾸러미"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "지운 꾸러미 (설정 파일이 여전히 남아있음)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "깨끗이 한 꾸러미 및 설치한 적이 없는 꾸러미"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "설치됨"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "깨끗이함"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - 재귀 꾸러미 목록"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - 꾸러미 상태 감시"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - 주요 꾸러미 목록"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (섹션 순서)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (이용가능, 섹션)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (상태, 섹션)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (우선순위 순서)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (이용가능, 우선순위)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (상태, 우선순위)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (알파벳 순서)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (이용가능 순서)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (상태 순서)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 표시:+/=/- 간단히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 표시:+/=/- 자세히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " 간단히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " 자세히:v 도움말:?"
 
@@ -1578,46 +1586,27 @@ msgstr ""
 "수 있습니다."
 
 # FIXME: bad msgid
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "꾸러미 관계가 다음에 영향을 미칩니다: "
-
-# FIXME: bad msgid
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "꾸러미 관계"
 
-# FIXME: bad msgid
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "설명 : "
-
 # FIXME: bad msgid
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "상세 설명 없음."
 
-# FIXME: bad msgid
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "상세 설명"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "현재 설치된 제어 정보"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "설치된 제어 정보 : "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "제어 파일 정보의 유효 버전"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "제어 정보의 유효 버전 : "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<비어있음>"
@@ -1716,3 +1705,21 @@ msgstr "설치버전"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "이용가능"
+
+# FIXME: bad msgid
+#~ msgid "interrelationships affecting "
+#~ msgstr "꾸러미 관계가 다음에 영향을 미칩니다: "
+
+# FIXME: bad msgid
+#~ msgid "description of "
+#~ msgstr "설명 : "
+
+# FIXME: bad msgid
+#~ msgid "description"
+#~ msgstr "상세 설명"
+
+#~ msgid "currently installed control info"
+#~ msgstr "현재 설치된 제어 정보"
+
+#~ msgid "available version of control info for "
+#~ msgstr "제어 정보의 유효 버전 : "
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index bc93785f..72f9618a 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-08 20:27+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -32,7 +32,9 @@ msgstr "Hjelp: "
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "Trykk ? for å vise hjelpemenyen, . for neste emne, <mellomrom> for å avslutte hjelp."
+msgstr ""
+"Trykk ? for å vise hjelpemenyen, . for neste emne, <mellomrom> for å "
+"avslutte hjelp."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -140,7 +142,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "hurtigtaster"
 
 #: dselect/baselist.cc:307
@@ -295,14 +298,15 @@ msgstr "Velg den uthevede tilgangsmetoden"
 msgid "Quit without changing selected access method"
 msgstr "Avslutt uten å endre den valgte tilgangsmetoden"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Taster"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -313,22 +317,29 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Flyttetaster: Neste/Forrige, Topp/Slutt, Opp/Ned, Fram/Tilbake:\n"
 "  n, Pil ned, j           p, Pil opp, k          flytt markeringen\n"
 "  N, Page Down, Mellomrom P, Pil opp, Rettetast  bla lista 1 side\n"
 "  ^n                      ^p                     bla lista 1 linje\n"
-"  t, Home                 e, End                 hopp øverst/nederst i lista\n"
+"  t, Home                 e, End                 hopp øverst/nederst i "
+"lista\n"
 "  u                       d                      bla info 1 side\n"
 "  ^u                      ^d                     bla info 1 linje\n"
 "  B, Pil venstre          F, Pil høyre           sideveis 1/3 skjerm\n"
@@ -336,40 +347,51 @@ msgstr ""
 "\n"
 "Marker pakker for behandling senere:\n"
 " +, Insert  installer eller oppgrader  =, H  hold i nåværende status\n"
-" -, Delete  fjern                      :, G  frigjør: oppgrader eller la være ikke-installert\n"
+" -, Delete  fjern                      :, G  frigjør: oppgrader eller la "
+"være ikke-installert\n"
 " _          fjern og rens ut oppsettet\n"
 "                                             Diverse:\n"
-"Avslutt, avbryt, skriv over (husk store bokstaver): ?, F1 hjelp (også Hjelp)\n"
+"Avslutt, avbryt, skriv over (husk store bokstaver): ?, F1 hjelp (også "
+"Hjelp)\n"
 " Return  Bekreft, avslutt (sjekk pakkekrav)       i, I  bytt infofelt\n"
 "   Q     Bekreft, avslutt (overstyr pakkekrav)      o, O  bytt sortering\n"
-" X, Escape  Avslutt uten å gjennomføre endringer    v, V  endrestatusvisning\n"
-"   R     tilbake til status før denne lista          ^l  tegn skjermen omigjen\n"
-"   U     sett alle til foreslått status               /  søk (Return avbryt)\n"
+" X, Escape  Avslutt uten å gjennomføre endringer    v, V  "
+"endrestatusvisning\n"
+"   R     tilbake til status før denne lista          ^l  tegn skjermen "
+"omigjen\n"
+"   U     sett alle til foreslått status               /  søk (Return "
+"avbryt)\n"
 "   D     sett alle til direkte etterspurt status    n, \\ gjenta siste søk\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduksjon til pakkevalg"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -378,37 +400,46 @@ msgstr ""
 "Velkommen til hovedpakkelista i dselect.\n"
 "\n"
 "Du vil få se en liste over pakker som er installerte eller som kan \n"
-"installerest . Du kan bla gjennom lista ved hjelp av piltastene. Med tastene \n"
+"installerest . Du kan bla gjennom lista ved hjelp av piltastene. Med "
+"tastene \n"
 "«+» og «-» kan du velge å installere eller fjerne pakker eller grupper av \n"
-"pakker. I utgangspunkter er linja «Alle pakker» valgt, slik at de handlingene \n"
+"pakker. I utgangspunkter er linja «Alle pakker» valgt, slik at de "
+"handlingene \n"
 "du gjør påvirker alle pakkene som hører til denne kategorien.\n"
 "\n"
-"Noe av det du velger kan føre til konflikter eller problemer med pakkekrav. I så \n"
-"fall vil du få en egen liste med de pakkene dette gjelder, slik at du kan løse \n"
+"Noe av det du velger kan føre til konflikter eller problemer med pakkekrav. "
+"I så \n"
+"fall vil du få en egen liste med de pakkene dette gjelder, slik at du kan "
+"løse \n"
 "problemene.\n"
 "\n"
 "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 å velge pakker, trykker du <enter> dersom du vil bekrefte \n"
-"endringene eller «X» om du vil avslutte uten endringer. En siste kontroll av \n"
-"konflikter og pakkekrav blir utført. Her vil du også få opp en egen liste ved \n"
+"Når du er ferdig med å velge pakker, trykker du <enter> dersom du vil "
+"bekrefte \n"
+"endringene eller «X» om du vil avslutte uten endringer. En siste kontroll "
+"av \n"
+"konflikter og pakkekrav blir utført. Her vil du også få opp en egen liste "
+"ved \n"
 "problemer.\n"
 "\n"
 "Trykk <mellomrom> for å avslutte hjelp og gå til lista nå.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introduksjon til skrivebeskyttet pakkeliste"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -430,47 +461,59 @@ 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"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduksjon til egen liste for løsning av konflikt eller pakkekrav"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 "Løsning av pakkekrav og konflikter - introduksjon.\n"
 "\n"
-"Ett eller flere av de valgene du har gjort fører til problemer med konflikter \n"
+"Ett eller flere av de valgene du har gjort fører til problemer med "
+"konflikter \n"
 "eller pakkekrav. Noen av pakkene må installeres sammen med visse andre, og \n"
 "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"
@@ -478,26 +521,34 @@ msgstr ""
 "godta forslaget. Du kan avbryte endringene som forårsaket problemet og gå \n"
 "tilbake til hovedlista ved å trykke stor «X».\n"
 "\n"
-"Du kan også bla gjennom lista og endre på markeringene slik du vil ha dem, og \n"
+"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å hjelp \n"
+"Trykk <mellomrom> for å avslutte hjelp og gå til lista. Husk at du kan få "
+"hjelp \n"
 "med «?».\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Skjermbilde, del 1: Pakkeliste og statustegn"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
-"\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:   Space - not installed;\n"
 "                     `*'  - installed;\n"
 "                     `-'  - not installed but config files remain;\n"
@@ -513,17 +564,23 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 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"
+"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"
 "bytte til detaljmodus) er kolonnene enkelttegn fra venstre til høyre:\n"
 "\n"
-" Feilmerke: Mellomrom - ingen feil (men pakken kan være ødelagt, se nedenfor)\n"
-"              «R»     - alvorlig feil ved installasjon, må installeres om igjen\n"
+" Feilmerke: Mellomrom - ingen feil (men pakken kan være ødelagt, se "
+"nedenfor)\n"
+"              «R»     - alvorlig feil ved installasjon, må installeres om "
+"igjen\n"
 " Installert status: Mellomrom - ikke installert\n"
 "                      «*»     - installert\n"
-"                      «-»     - ikke installert, men oppsettsfilene ligger igjen\n"
+"                      «-»     - ikke installert, men oppsettsfilene ligger "
+"igjen\n"
 "           pakker i { «U»     - utpakket, men ikke satt opp ennå\n"
 "  desse tilstandane { «C»     - halvveis oppsatt (en feil oppsto)\n"
 "       er ødelagte { «I»     - halvvegs installert (en feil oppsto)\n"
@@ -533,23 +590,27 @@ 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"
 "en kort beskrivelse.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Skjermbilde, del 2: Listemarkering, informasjonsvisning"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -570,43 +631,51 @@ msgstr ""
 "  eller pakker som blir påvirket når du trykker på «+», «-» eller «_».\n"
 "\n"
 "* Delelinja midt på skjermen forklarer kort statusen til den markerte \n"
-"  pakken. Dersom en gruppe er valgt, viser linja en beskrivelse av gruppen. \n"
+"  pakken. Dersom en gruppe er valgt, viser linja en beskrivelse av "
+"gruppen. \n"
 "  Dersom du ikke skjønner hva statustegnene betyr, kan du gå til pakken og \n"
 "  se hva som står på denne delelinja. Du kan også trykke «v» for \n"
 "  fyldigere visning. (Trykk «v» igjen for å gå tilbake til kortvisningen.)\n"
 "\n"
-"* Det nederste feltet på skjermen viser mer informasjon om den pakken som er \n"
+"* Det nederste feltet på skjermen viser mer informasjon om den pakken som "
+"er \n"
 "  valgt (om bare én er valgt).\n"
 "\n"
 "  Feltet kan visë en fyldig beskrivelse av pakken, de interne \n"
 "  kontrolldetaljene til pakken (enten for installerte eller tilgjengelige \n"
 "  versjoner av pakken) eller informasjon om konflikter og pakkekrav som \n"
-"  involverer den valgte pakken (i lister for løsning av konflikter/pakkekrav).\n"
+"  involverer den valgte pakken (i lister for løsning av konflikter/"
+"pakkekrav).\n"
 "\n"
-"  Trykk «i» for å bytte mellom visningene, og «I» for å skjule informasjonsfeltet \n"
+"  Trykk «i» for å bytte mellom visningene, og «I» for å skjule "
+"informasjonsfeltet \n"
 "eller utvide det slik at det dekker nesten hele skjermen.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduksjon til metodevalg"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
 "dselect og dpkg kan installere automatisk ved å hente pakkefilene som skal \n"
@@ -614,26 +683,30 @@ msgstr ""
 "\n"
 "I denne lista kan du velge en av disse installasjonsmetodene.\n"
 "\n"
-"Flytt markeringen til metoden du vil bruke og trykk på <enter>. Du blir da spurt \n"
+"Flytt markeringen til metoden du vil bruke og trykk på <enter>. Du blir da "
+"spurt \n"
 "etter informasjonen som trengs for å installere.\n"
 "\n"
-"Når du flyttar markeringen, får du se en beskrivelse av kvar metode nederst på \n"
+"Når du flyttar markeringen, får du se en beskrivelse av kvar metode nederst "
+"på \n"
 "skjermen, dersom det finnes en beskrivelse.\n"
 "\n"
-"Dersom du vil avslutta utan å endra på noko, trykkjer du på «x» medan du er i \n"
+"Dersom du vil avslutta utan å endra på noko, trykkjer du på «x» medan du er "
+"i \n"
 "lista over installasjonsmetodar.\n"
 "\n"
 "Du kan sjå heile lista over tastetrykk ved å trykkja på «k» no eller fra \n"
 "hjelpemenyen som du får når du trykkjer «?».\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tastetrykk for metodevalg"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -645,7 +718,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -657,7 +731,8 @@ msgstr ""
 "  n, Pil ned, j           p, Pil opp, k          flytt markeringen\n"
 "  N, Page Down, Mellomrom P, Pil opp, Rettetast  bla lista 1 side\n"
 "  ^n                      ^p                     bla lista 1 linje\n"
-"  t, Home                 e, End                 hopp øverst/nederst i lista\n"
+"  t, Home                 e, End                 hopp øverst/nederst i "
+"lista\n"
 "  u                       d                      bla info 1 side\n"
 "  ^u                      ^d                     bla info 1 linje\n"
 "  B, Pil venstre          F, Pil høgre           sidelengs 1/3 skjerm\n"
@@ -875,8 +950,7 @@ msgstr "skjermdel"
 msgid "Null colour specification\n"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "farge"
 
@@ -915,7 +989,8 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Flytt rundt med ^P og ^N, piltaster, innledende bokstaver eller nummertastene;\n"
+"Flytt rundt med ^P og ^N, piltaster, innledende bokstaver eller "
+"nummertastene;\n"
 "Trykk <enter> for å bekrefte utvalget.   ^L tegner skjermen på nytt.\n"
 "\n"
 
@@ -951,8 +1026,7 @@ msgstr "Tilgangsmetode `%s'."
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -972,16 +1046,16 @@ msgstr "klarte ikke reblokkere SIGWINCH"
 msgid "getch failed"
 msgstr "«getch» mislyktes"
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ingen]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "forklaring på "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengelig."
 
@@ -1312,251 +1386,242 @@ msgid "pre-depends on"
 msgstr "forkrav"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "gir"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "erstatter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "forbedrer"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Vkt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Tlr"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Bdr"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Oppdaterte"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Foreldet/lokale"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Ferdig oppdaterte"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Tilgjengelige"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Fjernet"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Ødelagte installerte pakker"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nye tilgjengelige pakker"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Oppdaterte pakker (nyere versjon tilgjengelig)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Foreldete og lokale pakker på systemet"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pakker som er installerte i nyeste versjon"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Tilgjengelige pakker (ikke installerte)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Fjernede pakker som ikke lenger er tilgjengelige"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Installerte pakker"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Fjernede pakker (tatt vare på oppsettet)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pakker som er renset bort eller aldri installerte"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installerte"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Renset"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkeliste"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeksjon av pakkestatus"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hovedpakkeliste"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (etter del)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (tilgj., del)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, del)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (etter prioritet)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (tilgj., prioritet)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (etter tilgjengelighet)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (etter status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marker:+/=/- kort:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marker:+/=/- fyldig:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " kort:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " fyldig:v hjelp:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""
-"The line you have highlighted represents many packages; if you ask to install, remove, hold, etc. it you will affect all the packages which match the criterion shown.\n"
-"\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"The line you have highlighted represents many packages; if you ask to "
+"install, remove, hold, etc. it you will affect all the packages which match "
+"the criterion shown.\n"
+"\n"
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
-"Du har valgt en linje med mange pakker. Dersom du velger å installere, fjerne, holde tilbake eller liknende, vil handlingen påvirke alle pakkene som passer til kriteriet.\n"
-"\n"
-"Dersom du flytter markeringen til en linje med bare én pakke, kan du se informasjon om den pakken i dette feltet.\n"
-"Du kan endre sorteringsrekkefølge med «o» og «O» for selv å kunne markere pakker i andre grupper."
-
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "sammenhenger som påvirker "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+"Du har valgt en linje med mange pakker. Dersom du velger å installere, "
+"fjerne, holde tilbake eller liknende, vil handlingen påvirke alle pakkene "
+"som passer til kriteriet.\n"
+"\n"
+"Dersom du flytter markeringen til en linje med bare én pakke, kan du se "
+"informasjon om den pakken i dette feltet.\n"
+"Du kan endre sorteringsrekkefølge med «o» og «O» for selv å kunne markere "
+"pakker i andre grupper."
+
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "sammenhenger"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "beskrivelse av "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "ingen beskrivelse tilgjengelig."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "beskrivelse"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "installert kontrollinformasjon"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "installert kontrollinformasjon for "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "tilgjengelig versjon av kontrollfilinformasjon"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "tilgjengelig versjon av kontrollinformasjon for "
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<tom>"
 
@@ -1654,3 +1719,17 @@ msgstr "Inst.ver"
 msgid "Avail.ver"
 msgstr "Tilgj.ver"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "sammenhenger som påvirker "
+
+#~ msgid "description of "
+#~ msgstr "beskrivelse av "
+
+#~ msgid "description"
+#~ msgstr "beskrivelse"
+
+#~ msgid "currently installed control info"
+#~ msgstr "installert kontrollinformasjon"
+
+#~ msgid "available version of control info for "
+#~ msgstr "tilgjengelig versjon av kontrollinformasjon for "
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 84366d3a..85b22c91 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-04 10:35+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -24,7 +24,9 @@ msgstr "Hulp: "
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "'?' drukken geeft het helpmenu, '.' geeft het volgend onderwerp, 'spatie' verlaat het helpmenu."
+msgstr ""
+"'?' drukken geeft het helpmenu, '.' geeft het volgend onderwerp, 'spatie' "
+"verlaat het helpmenu."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -35,7 +37,8 @@ msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"Druk op een van de toetsen hierboven, 'Spatie' of 'q' om de help af te sluiten,\n"
+"Druk op een van de toetsen hierboven, 'Spatie' of 'q' om de help af te "
+"sluiten,\n"
 "  of `.' (punt) om alle pagina's een voor een te lezen. "
 
 #: dselect/basecmds.cc:198
@@ -132,7 +135,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "toetsbindingen"
 
 #: dselect/baselist.cc:307
@@ -287,14 +291,15 @@ msgstr "Selecteer huidige toegangsmethode"
 msgid "Quit without changing selected access method"
 msgstr "Beëindigen zonder de toegangsmethode te veranderen"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Toetsen"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -305,18 +310,25 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
-"Bewegingstoetsen: Volgende/Vorige, Begin/Einde, Omlaag/Omhoog, Achter-/Vooruit:\n"
+"Bewegingstoetsen: Volgende/Vorige, Begin/Einde, Omlaag/Omhoog, Achter-/"
+"Vooruit:\n"
 " Omlaag, j            Omhoog, k             beweeg selectie\n"
 " N,Page-down,Spatie   P,Page-up,Backspace   verschuif lijst met 1 pagina\n"
 " ^n                   ^p                    verschuif lijst met 1 regel\n"
@@ -328,40 +340,51 @@ msgstr ""
 "\n"
 "Markeer pakketten voor latere behandeling:\n"
 " +, Insert  installeer/werk bij     =, H  bevries huidige staat\n"
-" -, Delete  verwijder               :, G  ont-vast: bijwerken/niet installeren\n"
+" -, Delete  verwijder               :, G  ont-vast: bijwerken/niet "
+"installeren\n"
 "                                    _     verwijder & wissen configuratie\n"
 "                                                     Diversen:\n"
 "End, stoppen, overschrijven (let op hoofdletters)   ?, F1 hulp (ook Help)\n"
-" Enter  Bevestig, einde (controle afhankelijkheid)  i, I  wissel info schermen\n"
-" Q    Bevestig, einde (forceer afhankelijkheid)     o, O  wissel sorteeropties\n"
-" X, Esc Einde, veranderingen gaan verloren          v, V  wissel status opties\n"
+" Enter  Bevestig, einde (controle afhankelijkheid)  i, I  wissel info "
+"schermen\n"
+" Q    Bevestig, einde (forceer afhankelijkheid)     o, O  wissel "
+"sorteeropties\n"
+" X, Esc Einde, veranderingen gaan verloren          v, V  wissel status "
+"opties\n"
 " R    Terug naar beginsituatie                      ^l   opnieuw tekenen\n"
-" U    Zet alles op voorgestelde status              /    zoeken (Enter=einde)\n"
+" U    Zet alles op voorgestelde status              /    zoeken "
+"(Enter=einde)\n"
 " D    Zet alles op direct gevraagde status          \\    herhaal zoeken\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Inleiding in pakkettenlijst"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -369,38 +392,49 @@ msgid ""
 msgstr ""
 "Welkom bij de hoofdpakketlijst.\n"
 "\n"
-"U krijgt zometeen een lijst te zien van pakketten die geïnstalleerd of beschik-\n"
-"baar zijn voor installatie.  U kunt door de lijst heen lopen met de cursortoetsen,\n"
+"U krijgt zometeen een lijst te zien van pakketten die geïnstalleerd of "
+"beschik-\n"
+"baar zijn voor installatie.  U kunt door de lijst heen lopen met de "
+"cursortoetsen,\n"
 "pakketten markeren om te installeren (met `+') of deinstalleren (met `-').\n"
-"Pakketten kunnen alleen of in groepen gemarkeerd worden; aanvankelijk zult u\n"
+"Pakketten kunnen alleen of in groepen gemarkeerd worden; aanvankelijk zult "
+"u\n"
 "zien dat de regel met `Alle pakketten' geselecteerd is.\n"
-"`+', `-', en dergelijke werken op alle pakketten omschreven door de opgelichte\n"
+"`+', `-', en dergelijke werken op alle pakketten omschreven door de "
+"opgelichte\n"
 "regel. \n"
 "Sommige keuzes zullen conflicten of vereistenproblemen veroorzaken; u\n"
-"ziet dan een lijst van relevante pakketten, zodat u het probleem kunt oplossen.\n"
+"ziet dan een lijst van relevante pakketten, zodat u het probleem kunt "
+"oplossen.\n"
 "\n"
 "U kunt best de lijst met sneltoetsen en de uitleg over de weergave goed \n"
-"doorlezen. Er is een grote hoeveelheid on-line help beschikbaar, maak hier dus\n"
+"doorlezen. Er is een grote hoeveelheid on-line help beschikbaar, maak hier "
+"dus\n"
 "gebruik van! U komt op elk moment bij de help door '?' te drukken.\n"
-"Als u tevreden bent met de lijst moet u op Enter drukken om de veranderingen\n"
-"te bevestigen, of 'X' om de lijst te verlaten zonder aanpassingen uit te voeren.\n"
-"Een laatste controle op conflicten en vereisten wordt uitgevoerd - ook hier kunt\n"
+"Als u tevreden bent met de lijst moet u op Enter drukken om de "
+"veranderingen\n"
+"te bevestigen, of 'X' om de lijst te verlaten zonder aanpassingen uit te "
+"voeren.\n"
+"Een laatste controle op conflicten en vereisten wordt uitgevoerd - ook hier "
+"kunt\n"
 " u nog een lijst krijgen.\n"
 "\n"
 "Druk op Spatie om hulp te verlaten en de binnen te gaan.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Inleiding tot de pakkettenlijst selectie (alleen-lezen)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -413,85 +447,114 @@ msgid ""
 msgstr ""
 "Welkom bij de hoofdpakketlijst.\n"
 "\n"
-"U krijgt zometeen een lijst te zien van pakketten die geïnstalleerd of beschik-\n"
+"U krijgt zometeen een lijst te zien van pakketten die geïnstalleerd of "
+"beschik-\n"
 "baar zijn voor installatie. Omdat u niet de benodigde rechten heeft om de \n"
-"pakketstatus te veranderen, bevindt u zich in de alleen-lezen modus. U kunt \n"
-"de lijst bekijken m.b.v. de cursortoetsen(zie het 'toetsaanslagen' helpscherm)\n"
+"pakketstatus te veranderen, bevindt u zich in de alleen-lezen modus. U "
+"kunt \n"
+"de lijst bekijken m.b.v. de cursortoetsen(zie het 'toetsaanslagen' "
+"helpscherm)\n"
 "de status van pakketten nagaan, en informatie over deze pakketten nalezen.\n"
 "\n"
-"U kunt best de lijst met toetsaanslagen en de uitleg over de weergave door- \n"
-"lezen. Er is veel on-line hulp beschikbaar, gelieve daar dus gebruik van te \n"
-"maken!  Druk op om het even welk moment op '?'  om het helpscherm te bekomen\n"
+"U kunt best de lijst met toetsaanslagen en de uitleg over de weergave "
+"door- \n"
+"lezen. Er is veel on-line hulp beschikbaar, gelieve daar dus gebruik van "
+"te \n"
+"maken!  Druk op om het even welk moment op '?'  om het helpscherm te "
+"bekomen\n"
 "\n"
 "Als u klaar bent met kijken, druk op 'Q' of 'enter' om af te sluiten.\n"
 "\n"
 "Druk op 'spatie' om de help te verlaten en de lijst te bekijken.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Inleiding in sublijst voor oplossen conflict/afhankelijkheid"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 "Afhankelijkheids-/conflictoplosser - inleiding.\n"
 "\n"
 "Een of meer van uw keuzes hebben een vereisten of conflictprobleem\n"
-"opgeroepen - sommige pakketten mogen alleen geïnstalleerd worden in combinatie\n"
+"opgeroepen - sommige pakketten mogen alleen geïnstalleerd worden in "
+"combinatie\n"
 "met andere, en sommige combinaties mogen niet samen geïnstalleerd zijn.\n"
 "\n"
-"U krijgt een sublijst met alle betrokken pakketten te zien.  De onderste helft van het\n"
+"U krijgt een sublijst met alle betrokken pakketten te zien.  De onderste "
+"helft van het\n"
 "scherm bevat de relevante conflicten en vereisten; gebruik `i' om te\n"
 "wisselen daartussen, de pakketomschrijvingen en de interne besturingsinfo.\n"
 "\n"
-"Een paar `voorgestelde' pakketten kunnen berekend zijn, en de beginmarkeringen\n"
-"zijn overeenkomstig ingesteld, zodat u gewoon op Return kunt drukken als u het\n"
-"er mee eens bent.  U kunt de verandering(en) afbreken die de problemen veroor-\n"
-"zaakten, en teruggaan naar de hoofdlijst door op de hoofdletter `X' te drukken.\n"
+"Een paar `voorgestelde' pakketten kunnen berekend zijn, en de "
+"beginmarkeringen\n"
+"zijn overeenkomstig ingesteld, zodat u gewoon op Return kunt drukken als u "
+"het\n"
+"er mee eens bent.  U kunt de verandering(en) afbreken die de problemen "
+"veroor-\n"
+"zaakten, en teruggaan naar de hoofdlijst door op de hoofdletter `X' te "
+"drukken.\n"
 "\n"
 "U kunt ook door de lijst bewegen en de markeringen veranderen zodat ze meer\n"
-"overeenkomen met wat u wilt, en u kunt mijn suggesties verwerpen met de hoofd-\n"
-"letters `D' of `R' (zie hulpscherm over toetsen).  U kunt de hoofdletter `Q'\n"
+"overeenkomen met wat u wilt, en u kunt mijn suggesties verwerpen met de "
+"hoofd-\n"
+"letters `D' of `R' (zie hulpscherm over toetsen).  U kunt de hoofdletter "
+"`Q'\n"
 "gebruiken om de getoonde lijst geforceerd te accepteren, in het geval dat u\n"
 "denkt dat het programma het mis heeft.\n"
 "\n"
-"Druk op Spatie om hulp te verlaten en de sublijst binnen te gaan; Vergeet ook niet\n"
+"Druk op Spatie om hulp te verlaten en de sublijst binnen te gaan; Vergeet "
+"ook niet\n"
 "dat '?' drukken je naar de help brengt.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Scherm, deel 1: pakketlijst en statustekens"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
-"\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:   Space - not installed;\n"
 "                     `*'  - installed;\n"
 "                     `-'  - not installed but config files remain;\n"
@@ -507,11 +570,15 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 msgstr ""
-"De bovenkant van het scherm geeft een lijst van pakketten.  Voor ieder pakket\n"
-"vier kolommen met de huidige status op het systeem en markering.  In de korte\n"
-"modus (gebruik `v' om te wisselen) zijn dit enkele tekens, links naar rechts:\n"
+"De bovenkant van het scherm geeft een lijst van pakketten.  Voor ieder "
+"pakket\n"
+"vier kolommen met de huidige status op het systeem en markering.  In de "
+"korte\n"
+"modus (gebruik `v' om te wisselen) zijn dit enkele tekens, links naar "
+"rechts:\n"
 "\n"
 "Foutvlag: Spatie - geen fout (maar pakket kan kapot zijn - zie hieronder)\n"
 "               `R'  - ernstige fout bij installatie, herinstallatie nodig\n"
@@ -532,17 +599,20 @@ msgstr ""
 "Ook te zijn zijn de Prioriteit, Sectie, naam, geïnstalleerde en beschikbare\n"
 "versienummers (shift-V om te tonen/verbergen) en een korte omschrijving.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Scherm, deel 2: lijstselectie; informatiescherm"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -581,27 +651,31 @@ msgstr ""
 "  Gebruik de `i'-toets om de wisselen tussen weergaven, en `I' om het\n"
 "  informatiescherm te vergroten of verbergen.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Inleiding in scherm voor methodeselectie"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
 "dselect en dpkg kunnen automatische installatie aan, door de te\n"
@@ -623,14 +697,15 @@ msgstr ""
 "Een volledige lijst met toetsen is beschikbaar door nu op `k' te\n"
 "drukken, of vanuit het hulpmenu dat u kunt bereiken met `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Toetsaanslagen voor methodeselectie"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -642,7 +717,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -652,7 +728,8 @@ msgid ""
 msgstr ""
 "Bewegingstoetsen: Volgende/Vorige, Begin/Eind, Op/Neer, Vooruit/Achteruit:\n"
 "  n, Pijltje-beneden    p, Pijltje-boven        verplaats markering\n"
-"  N, Page-down, Spatie  P, Page-up, Backspace   verschuif lijst met 1 pagina\n"
+"  N, Page-down, Spatie  P, Page-up, Backspace   verschuif lijst met 1 "
+"pagina\n"
 "  ^n                    ^p                      verschuif lijst met 1 regel\n"
 "  t, Home               e, End                  naar begin/einde lijst\n"
 "  u                     d                       verschuif info met 1 pagina\n"
@@ -662,8 +739,10 @@ msgstr ""
 "(Deze zijn de zelfde toetsen als in het scherm met pakketlijst.)\n"
 "\n"
 "Einde:\n"
-" Return, Enter    selecteer deze methode en ga naar zijn configuratiedialoog\n"
-" x, X             beëindig zonder veranderingen of instellen van installatiemethode\n"
+" Return, Enter    selecteer deze methode en ga naar zijn "
+"configuratiedialoog\n"
+" x, X             beëindig zonder veranderingen of instellen van "
+"installatiemethode\n"
 "\n"
 "Divers:\n"
 "  ?, Help, F1      vraag hulp\n"
@@ -810,7 +889,8 @@ msgstr ""
 "Opties:\n"
 "  --admindir <map>     Gebruik <map> i.p.v. %s.\n"
 "  --expert                      Zet expert-modus aan.\n"
-"  --debug <bestand> | -D<file>  Zet debuggen aan, stuur uitvoer naar <bestand>.\n"
+"  --debug <bestand> | -D<file>  Zet debuggen aan, stuur uitvoer naar "
+"<bestand>.\n"
 "  --colour | --color schermdeel:[voorgrond],[achtergrond][:attr[+attr+..]]\n"
 "                                     Stel schermkleuren in.\n"
 "\n"
@@ -872,8 +952,7 @@ msgstr "schermdeel"
 msgid "Null colour specification\n"
 msgstr "Blanco-kleur specificatie\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "kleur"
 
@@ -948,8 +1027,7 @@ msgstr "Toegangsmethode `%s'."
 msgid "Abbrev."
 msgstr "Afkorting"
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -969,16 +1047,16 @@ msgstr "kon SIGWINCH niet opnieuw blokkeren"
 msgid "getch failed"
 msgstr "getch is mislukt"
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[geen]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "uitleg voor "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Geen uitleg beschikbaar."
 
@@ -1309,251 +1387,243 @@ msgid "pre-depends on"
 msgstr "heeft als voor-vereiste"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "is in strijd met"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "voorziet"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "vervangt"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "verbetert"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Niet-werkend"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nieuw"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Verouderd/lokaal"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Up-to-date"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Verwijderd"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Niet-werkende geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nieuw beschikbare pakketten"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Bijgewerkte pakketten (nieuwe versie is beschikbaar)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Verouderde en lokale pakketten op systeem"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Up-to-date geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Beschikbare pakketten (niet geïnstalleerd)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Verwijderde en intussen verouderde pakketten"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Verwijderde pakketten (maar configuratie staat er nog)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Gewiste of nooit geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Geïnstalleerde"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Gewist"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - recursieve pakkettenlijst"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - bekijken pakketstatus"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hoofdpakkettenlijst"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (op sectie)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (besch., sectie)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, sectie)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (op prioriteit)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (besch., prioriteit)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioriteit)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetisch)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (op beschikbaarheid)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (op status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markeer:+/=/- kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markeer:+/=/- lang:v hulp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " lang:v hulp:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""
-"The line you have highlighted represents many packages; if you ask to install, remove, hold, etc. it you will affect all the packages which match the criterion shown.\n"
-"\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"The line you have highlighted represents many packages; if you ask to "
+"install, remove, hold, etc. it you will affect all the packages which match "
+"the criterion shown.\n"
+"\n"
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
-"De regel die u heeft geselecteerd representeert meerdere pakketten; als u vraagt om te installeren, verwijderen, vasthouden, enz., is dit van toepassing op alle pakketten waar dit criteria op van toepassing is.\n"
-"\n"
-"Wanneer u de selectie verplaatst naar de regel voor een bepaald pakket, krijgt u de informatie over dat pakket te zien.\n"
-"U kunt `o' en `O' gebruiken om de sorteervolgorde te veranderen waardoor u de mogelijkheid krijgt om pakketten de markeren in verschillende groeperingen."
-
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "onderlinge relaties betreffende "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+"De regel die u heeft geselecteerd representeert meerdere pakketten; als u "
+"vraagt om te installeren, verwijderen, vasthouden, enz., is dit van "
+"toepassing op alle pakketten waar dit criteria op van toepassing is.\n"
+"\n"
+"Wanneer u de selectie verplaatst naar de regel voor een bepaald pakket, "
+"krijgt u de informatie over dat pakket te zien.\n"
+"U kunt `o' en `O' gebruiken om de sorteervolgorde te veranderen waardoor u "
+"de mogelijkheid krijgt om pakketten de markeren in verschillende "
+"groeperingen."
+
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "onderlinge relaties"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "omschrijving van "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "geen omschrijving beschikbaar."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "omschrijving"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "nu geïnstalleerde besturingsinfo"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "geïnstalleerde besturingsinfo voor "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "beschikbare versie van besturingsbestand-info"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "beschikbare versie van besturingsinfo voor "
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<null>"
 
@@ -1651,3 +1721,17 @@ msgstr "Ge
 msgid "Avail.ver"
 msgstr "Besch.ver"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "onderlinge relaties betreffende "
+
+#~ msgid "description of "
+#~ msgstr "omschrijving van "
+
+#~ msgid "description"
+#~ msgstr "omschrijving"
+
+#~ msgid "currently installed control info"
+#~ msgstr "nu geïnstalleerde besturingsinfo"
+
+#~ msgid "available version of control info for "
+#~ msgstr "beschikbare versie van besturingsinfo voor "
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 3e7661a7..b04cff1e 100644
--- a/dselect/po/nn.po
+++ b/dselect/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:57+0200\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -144,7 +144,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "snøggtastar"
 
 #: dselect/baselist.cc:307
@@ -299,14 +300,15 @@ msgstr "Vel den utheva tilgangsmetoden"
 msgid "Quit without changing selected access method"
 msgstr "Avslutt utan å endra den valde tilgangsmetoden"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tastar"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -361,11 +363,11 @@ msgstr ""
 "avbryt)\n"
 "   D     set alle til direkte førespurd status     n, \\ siste søk om att\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduksjon til pakkeval"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -424,11 +426,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista no.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introduksjon til skriveverna pakkeliste"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -463,11 +465,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista no.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduksjon til eiga liste for løysing av konflikt eller pakkekrav"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -528,11 +530,11 @@ msgstr ""
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista. \n"
 "Hugs at du kan få hjelp med «?».\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Skjermbilete, del 1: Pakkeliste og statusteikn"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -593,11 +595,11 @@ msgstr ""
 "installerte og tilgjengelege versjonar (vis/gøym med Shift + V) og \n"
 "ei kort skildring.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Skjermbilete, del 2: Listemarkering, informasjonsvising"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -645,11 +647,11 @@ msgstr ""
 "informasjonsfeltet \n"
 "eller utvida det slik at det dekkjer nesten heile skjermen.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduksjon til metodeval"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -691,14 +693,15 @@ msgstr ""
 "Du kan sjå heile lista over tastetrykk ved å trykkja på «k» no eller frå \n"
 "hjelpemenyen som du får når du trykkjer «?».\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tastetrykk for metodeval"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -999,7 +1002,7 @@ msgstr "Tilgangsmetode `%s'."
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Skildring"
 
@@ -1019,15 +1022,16 @@ msgstr "klarte ikkje reblokkera SIGWINCH"
 msgid "getch failed"
 msgstr "«getch» feila"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ingen]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "forklaring på "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengeleg."
 
@@ -1358,194 +1362,198 @@ msgid "pre-depends on"
 msgstr "forkrav"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "gjev"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "erstattar"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "forbetrar"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Vkt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Tlr"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Bdr"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Øydelagde"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Oppdaterte"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Forelda/lokale"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Ferdig oppdaterte"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Tilgjengelege"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Fjerna"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Øydelagde installerte pakkar"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nye tilgjengelege pakkar"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Oppdaterte pakkar (nyare versjon tilgjengeleg)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Forelda og lokale pakkar på systemet"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pakkar som er installerte i nyaste versjon"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Tilgjengelege pakkar (ikkje installerte)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Fjerna pakkar som ikkje lenger er tilgjengelege"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Installerte pakkar"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Fjerna pakkar (teke vare på oppsettet)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pakkar som er utreinska eller aldri installerte"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installerte"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Reinska"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkeliste"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeksjon av pakkestatus"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hovudpakkeliste"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (etter del)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (tilgj., del)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, del)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (etter prioritet)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (tilgj., prioritet)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (etter tilgjenge)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (etter status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marker:+/=/- stutt:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marker:+/=/- fyldig:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " stutt:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " fyldig:v hjelp:?"
 
@@ -1569,42 +1577,26 @@ msgstr ""
 "Du kan endra sorteringsrekkjefølgja med «o» og «O» for sjølv å kunna markera "
 "pakkar i andre grupper."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "samanhengar som påverkar "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "samanhengar"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "skildring av "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "inga skildring tilgjengeleg."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "skildring"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "installert kontrollinformasjon"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "installert kontrollinformasjon for "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "tilgjengeleg versjon av kontrollfilinformasjon"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "tilgjengeleg versjon av kontrollinformasjon for "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<tom>"
@@ -1702,3 +1694,18 @@ msgstr "Inst.ver"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Tilgj.ver"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "samanhengar som påverkar "
+
+#~ msgid "description of "
+#~ msgstr "skildring av "
+
+#~ msgid "description"
+#~ msgstr "skildring"
+
+#~ msgid "currently installed control info"
+#~ msgstr "installert kontrollinformasjon"
+
+#~ msgid "available version of control info for "
+#~ msgstr "tilgjengeleg versjon av kontrollinformasjon for "
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index a48ba621..0099b62b 100644
--- a/dselect/po/pl.po
+++ b/dselect/po/pl.po
@@ -3,17 +3,18 @@
 # Piotr Roszatycki <dexter@debian.org>, 1999.
 # Bartosz Feñski <fenio@debian.org>, 2004-2005
 msgid ""
-msgstr "Project-Id-Version: dpkg 1.13.19\n"
+msgstr ""
+"Project-Id-Version: dpkg 1.13.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-04 22:15+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 ||"
-" n%100>=20) ? 1 : 2;\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
 
 #: dselect/basecmds.cc:121
 msgid "Search for ? "
@@ -139,7 +140,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "skojarzenia klawiszy"
 
 #: dselect/baselist.cc:307
@@ -294,14 +296,15 @@ msgstr "Wyb
 msgid "Quit without changing selected access method"
 msgstr "Wyj¶cie bez zmiany metody dostêpu"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Spis klawiszy"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -361,11 +364,11 @@ msgstr ""
 "   D     Wybierz niezbêdne pakiety              \\   powtórz ostatnie "
 "szukanie\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Wprowadzenie do wyboru pakietów"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -421,11 +424,11 @@ msgstr ""
 "\n"
 "Wci¶nij <spacjê>, aby opu¶ciæ ekran pomocy i przej¶æ do listy pakietów.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Wprowadzenie do przegl±darki listy pakietów (tylko do odczytu)"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -461,11 +464,11 @@ msgstr ""
 "\n"
 "Wci¶nij <spacjê>, aby opu¶ciæ ekran pomocy i przej¶æ do listy pakietów.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Wprowadzenie do listy konfliktów/zale¿no¶ci"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -528,11 +531,11 @@ msgstr ""
 "Wci¶nij <spacjê>, aby opu¶ciæ ekran pomocy i przej¶æ do listy pakietów; "
 "pamiêtaj - wci¶nij `?', aby przywo³aæ ten ekran.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Wybór pakietów, czê¶æ 1: lista pakietów i oznaczenie stanu"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -595,11 +598,11 @@ msgstr ""
 "wersji zainstalowanej i dostêpnej (shift-V ukrywa/pokazuje) oraz krótki "
 "opis.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Wybór pakietów, czê¶æ 2: kursor; wy¶wietlane informacje"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -649,11 +652,11 @@ msgstr ""
 "`I'\n"
 "  mo¿na ukryæ to okno lub je rozszerzyæ na wiêksz± czê¶æ ekranu.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Wprowadzenie do wyboru metody instalacji"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -694,14 +697,15 @@ msgstr ""
 "menu\n"
 "pomocy dostêpnego pó¼niej pod klawiszem `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Spis klawiszy dla wyboru metody instalacji"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -871,7 +875,8 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "U¿ycie: %s [<opcja> ...] [<akcja> ...]\n"
+msgstr ""
+"U¿ycie: %s [<opcja> ...] [<akcja> ...]\n"
 "\n"
 
 #: dselect/main.cc:175
@@ -900,7 +905,8 @@ msgid ""
 "  --version                  Show the version.\n"
 "  --license | --licence      Show the license.\n"
 "\n"
-msgstr "  --help                     Wy¶wietla ten komunikat pomocy.\n"
+msgstr ""
+"  --help                     Wy¶wietla ten komunikat pomocy.\n"
 "  --version                  Wy¶wietla informacje o wersji.\n"
 "  --license                  Wy¶wietla informacje o licencji.\n"
 "\n"
@@ -911,7 +917,8 @@ msgid ""
 "Actions:\n"
 "  access update select install config remove quit\n"
 "\n"
-msgstr "Akcje:\n"
+msgstr ""
+"Akcje:\n"
 "  access update select install config remove quit\n"
 "\n"
 
@@ -1023,7 +1030,7 @@ msgstr "Metoda dost
 msgid "Abbrev."
 msgstr "Oznaczenie"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Opis"
 
@@ -1043,15 +1050,16 @@ msgstr "nie mo
 msgid "getch failed"
 msgstr "nie mo¿na wykonaæ funkcji `getch'"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[brak]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "wyja¶nienie dla "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Brak dostêpnego wyja¶nienia."
 
@@ -1383,194 +1391,198 @@ msgid "pre-depends on"
 msgstr "zale¿y-przed od"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "w konflikcie z"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "dostarcza"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "wymienia"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "rozszerza"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Kon"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Wa¿"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Zwy"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Pol"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Dod"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ser"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "B³±"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Uszkodzone"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nowe"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Do zaktualizowania"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Wycofane/lokalne"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Aktualne"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Dostêpne"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Usuniête"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Pakiety uszkodzone podczas instalacji"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Pakiety nowo dostêpne"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Pakiety o dostêpnej aktualnej wersji"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Pakiety wycofane lub dostêpne tylko lokalnie"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pakiety aktualne"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pakiety dostêpne i jeszcze nie zainstalowane"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Pakiety usuniête i ju¿ niedostêpne"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Pakiety zainstalowane"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Pakiety usuniête (konfiguracja pozosta³a)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pakiety wyczyszczone i nie zainstalowane"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Zainstalowane"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Wyczyszczone"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista konfliktów"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - stan pakietów"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista pakietów"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (wg sekcji)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dostêpn., sekcja)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (stan, sekcja)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (wg priorytetu)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dostêpn., priorytet)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (stan, priorytet)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetycznie)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (wg dostêpno¶ci)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (wg stanu)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " wybór:+/=/- ogólnie:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " wybór:+/=/- szczegó³y:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " ogólnie:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " szczegó³y:v pomoc:?"
 
@@ -1594,42 +1606,26 @@ msgstr ""
 "Mo¿na u¿yæ `o' lub `O', aby zmieniæ kolejno¶æ uporz±dkowania pakietów lub "
 "zaznaczyæ pakiety z innych grup."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "relacje dotycz±ce pakietu "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "relacje"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "opis pakietu "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "brak dostêpnego opisu."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "opis"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "plik kontrolny zainstalowanego pakietu"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "plik kontrolny zainstalowanego pakietu "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "plik kontrolny dostêpnej wersji pakietu"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "plik kontrolny dostêpnej wersji pakietu "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<puste>"
@@ -1728,3 +1724,17 @@ msgstr "Zainst."
 msgid "Avail.ver"
 msgstr "Dostêpne"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "relacje dotycz±ce pakietu "
+
+#~ msgid "description of "
+#~ msgstr "opis pakietu "
+
+#~ msgid "description"
+#~ msgstr "opis"
+
+#~ msgid "currently installed control info"
+#~ msgstr "plik kontrolny zainstalowanego pakietu"
+
+#~ msgid "available version of control info for "
+#~ msgstr "plik kontrolny dostêpnej wersji pakietu "
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index d62f25ef..b0362aac 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-07 15:30+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -28,7 +28,8 @@ msgstr "Ajuda: "
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "Tecla ? para menu ajuda, . para próximo tópico, <espaço> sair da ajuda."
+msgstr ""
+"Tecla ? para menu ajuda, . para próximo tópico, <espaço> sair da ajuda."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -136,7 +137,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "keybindings"
 
 #: dselect/baselist.cc:307
@@ -291,14 +293,15 @@ msgstr "Seleccionar o método de acesso actualmente destacado"
 msgid "Quit without changing selected access method"
 msgstr "Sair sem alterar o método de acesso seleccionado"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -355,11 +358,11 @@ msgstr ""
 "   D     colocar tudo em est. Directamente req. n, \\ repetir última "
 "procura\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introdução à selecção de pacotes"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -391,7 +394,8 @@ msgid ""
 msgstr ""
 "Bem-vindo à listagem principal de pacotes do dselect.\n"
 "\n"
-"Ser-lhe-á apresentada uma lista de pacotes que estão instalados ou disponíveis\n"
+"Ser-lhe-á apresentada uma lista de pacotes que estão instalados ou "
+"disponíveis\n"
 "para instalação.  Você pode navegar pela lista usando as teclas de cursor,\n"
 "marcar pacotes para instalação (usando `+') ou desinstalação (usando `-').\n"
 "\n"
@@ -413,11 +417,11 @@ msgstr ""
 "\n"
 "Carregue em <espaço> para sair da ajuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introdução ao navegador de lista de pacotes só de leitura"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -454,11 +458,11 @@ msgstr ""
 "\n"
 "Carregue em <enter> para deixar a ajuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdução à sub-lista de resolução de conflitos/dependências"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -501,7 +505,8 @@ msgstr ""
 "\n"
 "Você irá ver uma sub-lista com os pacotes envolvidos.  A metade inferior do\n"
 "ecrã mostra os conflitos e dependências relevantes; use `i' para alternar\n"
-"entre estes, as descrições dos pacotes e as informações de controle internas.\n"
+"entre estes, as descrições dos pacotes e as informações de controle "
+"internas.\n"
 "\n"
 "Um conjunto de pacotes `sugeridos' foi calculado, e as marcações iniciais\n"
 "nessa sub-lista foram estabelecidas para coincidir com essas, por isso, se\n"
@@ -519,11 +524,11 @@ msgstr ""
 "Carregue em <espaço> para sair da ajuda e entrar na sub-lista; lembre-se: "
 "para ajuda carregue em `?'.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visualização, parte 1: lista de pacotes e caracteres de status"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -585,11 +590,11 @@ msgstr ""
 "Também são exibidas cada Prioridade, Secção, nome, núm. de versão inst. e\n"
 "disponíveis de cada pacote (shift-V para mostrar/esc.) e desc. resumida.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visualização, parte 3: Destacar na lista; mostra de informação"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -638,11 +643,11 @@ msgstr ""
 "  Use a tecla `i' para circular pelas telas, e `I' para esconder essa\n"
 "  tela de informação ou expandí-la por quase toda a tela.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introdução ao acrã de métodos de selecção"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -687,14 +692,15 @@ msgstr ""
 "menu\n"
 "de ajuda acessível pressionando `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Teclas para selecção de método"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -876,8 +882,8 @@ msgstr ""
 "Opções:\n"
 "  --admindir <directório>    Usar <directório> em vez de %s.\n"
 "  --expert                   Ligar o modo de especialista.\n"
-"  --debug <ficheiro> | -D<ficheiro> Ligar o debugging, enviar a saída para "
-"                             <ficheiro>.\n"
+"  --debug <ficheiro> | -D<ficheiro> Ligar o debugging, enviar a saída "
+"para                              <ficheiro>.\n"
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
 "                             Configurar as cores do ecrã.\n"
 "\n"
@@ -890,7 +896,7 @@ msgid ""
 "  --license | --licence      Show the license.\n"
 "\n"
 msgstr ""
-"  --help		      Mostrar esta mensagem de ajuda.\n"
+"  --help\t\t      Mostrar esta mensagem de ajuda.\n"
 "  --version                  Mostrar a versão.\n"
 "  --license | --licence      Mostrar a licença.\n"
 "\n"
@@ -1013,7 +1019,7 @@ msgstr "Método de acesso `%s'."
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descrição"
 
@@ -1033,15 +1039,16 @@ msgstr "falhou re-bloquear SIGWINCH"
 msgid "getch failed"
 msgstr "falhou getch"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[nenhum]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicação de "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Sem explicação disponível."
 
@@ -1374,194 +1381,198 @@ msgid "pre-depends on"
 msgstr "pre-depende de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "em conflito com"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "disponibiliza"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "substitui"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "melhora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Nec"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Danificado"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Novo"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Actualizado"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Obsoleto/local"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Actualizados"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Disponíveis"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Removidos"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Pacotes instalados danificados"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Pacotes actualizados (está disponível versão mais recente)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Pacotes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pacotes instalados actualizados"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pacotes disponíveis (não instalados actualmente)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Pacotes removidos e que já não estão disponíveis"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Pacotes instalados"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Pacotes removidos (configuração ainda presente)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pacotes purgados e os que nunca foram instalados"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalado"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgado"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - listagem recursiva de pacotes"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecção de estado dos pacotes"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de pacotes"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (por secção)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (disp., secção)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, secção)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr "(por prioridade)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (disp., proioridade)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioridade)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (por disponibilidade)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (por status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " detalhe:v ajuda:?"
 
@@ -1585,42 +1596,26 @@ msgstr ""
 "Pode utilizar 'o' e 'O' para modificar a ordenação e dar a você prório a "
 "oportunidade de marcar pacotes em diferentes tipos de grupos."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelacionamentos afectando"
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelacionamentos"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descrição de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "sem descrição disponível"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descrição"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "informação de controle actualmente instalada"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "informação de controle instalada para "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "informação disponível da versão do ficheiro de controle"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "versão disponível de informação de controle para "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nulo>"
@@ -1718,3 +1713,18 @@ msgstr "Vers.Inst"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.Dispon."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelacionamentos afectando"
+
+#~ msgid "description of "
+#~ msgstr "descrição de "
+
+#~ msgid "description"
+#~ msgstr "descrição"
+
+#~ msgid "currently installed control info"
+#~ msgstr "informação de controle actualmente instalada"
+
+#~ msgid "available version of control info for "
+#~ msgstr "versão disponível de informação de controle para "
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index bedf0d82..105cafb4 100644
--- a/dselect/po/pt_BR.po
+++ b/dselect/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-05 21:17-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -142,7 +142,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "keybindings"
 
 #: dselect/baselist.cc:307
@@ -297,14 +298,15 @@ msgstr "Selecionar método de acesso destacado"
 msgid "Quit without changing selected access method"
 msgstr "Sair sem mudar método de acesso selecionado"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -362,11 +364,11 @@ msgstr ""
 "cancelar)\n"
 "   D     colocar tudo em est. Diretamente req. \\    repetir últ. busca\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introdução a seleção de pacotes"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -427,11 +429,11 @@ msgstr ""
 "\n"
 "Pressione <espaço> para sair da ajuda e entrar na lista agora.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introdução ao navegador da lista de pacotes somente-leitura"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -470,11 +472,11 @@ msgstr ""
 "\n"
 "Pressione <espaço> para deixar a ajuda e entrar na lista agora.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdução à sub-lista de resolução de conflitos/dependências"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -545,11 +547,11 @@ msgstr ""
 "Pressione <espaço> para sair da ajuda e entrar na sub-lista; lembre-se: "
 "pressione `?' para ajuda.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Tela, parte 1: lista de pacotes e caracteres de estado"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -611,11 +613,11 @@ msgstr ""
 "Também são exibidas cada Prioridade, Seção, nome, núm. de versão inst. e\n"
 "disponíveis de cada pacote (shift-V para mostrar/esc.) e desc. resumida.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Tela, parte 2: destaques na lista; tela de informação"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -664,11 +666,11 @@ msgstr ""
 "  Use a tecla `i' para circular pelas telas, e `I' para esconder essa\n"
 "  tela de informação ou expandí-la por quase toda a tela.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introdução à tela de seleção de métodos"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -712,14 +714,15 @@ msgstr ""
 "menu\n"
 "de ajuda acessível pressionando-se `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Teclas para seleção de método"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -883,8 +886,7 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr ""
-"Uso: %s [<opções> ...] [<ação> ...]\n"
+msgstr "Uso: %s [<opções> ...] [<ação> ...]\n"
 
 #: dselect/main.cc:175
 #, c-format
@@ -913,7 +915,6 @@ msgid ""
 "  --version                  Show the version.\n"
 "  --license | --licence      Show the license.\n"
 "\n"
-
 msgstr ""
 "  --help                     Exibe esta mensagem de ajuda.\n"
 "  --version                  Exibe a versão.\n"
@@ -1038,7 +1039,7 @@ msgstr "Método de acesso `%s'."
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descrição"
 
@@ -1058,15 +1059,16 @@ msgstr "falha ao re-bloquear SIGWINCH"
 msgid "getch failed"
 msgstr "getch falhou"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[nenhum]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicação de "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Sem explicação disponível"
 
@@ -1399,194 +1401,198 @@ msgid "pre-depends on"
 msgstr "pré-depende de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "conflita com"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "inclui"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "substitui"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "aprimora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Nec"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Pdr"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Quebrado"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Novos"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Atualizados"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Obsoletos/locais"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "atualizados"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "disponíveis"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "removidos"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Pacotes instalados quebrados"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Pacotes atualizados (nova versão está disponível)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Pacotes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pacotes instalados atualizados"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pacotes disponíveis (não instalados no momento)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Pacotes removidos e não mais disponíveis"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Pacotes instalados"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Pacotes removidos (configuração ainda presente)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pacotes purgados e os nunca instalados"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalado"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Purgado"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de pacotes"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeção de estado de pacotes"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de pacotes"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (por seção)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (disp., seção)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, seção)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (por prioridade)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (disp., prioridade)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioridade)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (ordem alfabética)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (por disponibilidade)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (por status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- detalhado:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " detalhado:v ajuda:?"
 
@@ -1610,42 +1616,26 @@ msgstr ""
 "Você pode usar `o' e `O' para mudar a ordem de classificação e ter a "
 "oportunidade de marcar pacotes em diferentes tipos de grupos."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "interrelações afetando "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "interrelações"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descrição de "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "nenhuma descrição disponível."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descrição"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "informação de controle atualmente instalada"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "informação de controle instalada para "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versão disponível da informação do arquivo de controle"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "versão disponível da informação de controle para "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nulo>"
@@ -1743,3 +1733,18 @@ msgstr "Ver.inst."
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Ver.disp."
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "interrelações afetando "
+
+#~ msgid "description of "
+#~ msgstr "descrição de "
+
+#~ msgid "description"
+#~ msgstr "descrição"
+
+#~ msgid "currently installed control info"
+#~ msgstr "informação de controle atualmente instalada"
+
+#~ msgid "available version of control info for "
+#~ msgstr "versão disponível da informação de controle para "
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 5e6368a8..a11fe3ab 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -17,14 +17,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-16 00:34+0300\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #  spaţiile sunt necesare!!
@@ -153,7 +154,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "asignari taste"
 
 #: dselect/baselist.cc:307
@@ -308,14 +310,15 @@ msgstr "Selctează metoda care este evidenţiată acum"
 msgid "Quit without changing selected access method"
 msgstr "Abandonează fără schimbarea metodei de acces selectate"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Combinaţii taste"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -374,11 +377,11 @@ msgstr ""
 "   D     plasează tot, Direct în starea cerută      n, \\  repetă ultima "
 "căutare\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introducere în selecţia pachetelor"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -437,11 +440,11 @@ msgstr ""
 "\n"
 "Apăsaţi <spaţiu> pentru a părăsi ajutorul şi a intra în listă.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introducere a navigatorului listei de pachete, în mod strict citire"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -480,11 +483,11 @@ msgstr ""
 "\n"
 "Apăsaţi <spaţiu> pentru a părăsi ajutorul şi a intra în listă.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducere a sublistei de rezolvare a conflictelor/dependenţelor"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -549,11 +552,11 @@ msgstr ""
 "Apasaţi <spaţiu> pentru a părăsi ajutorul şi a intra în sub-listă; nu "
 "uitaţi: apăsaţi „?” pentru ajutor.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Afişare, partea 1: lista de pachete şi caracterele de stare"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -617,11 +620,11 @@ msgstr ""
 "instalată şi cea disponibilă (shift-V pentru a afişa/ascunde) şi descrierea "
 "pe scurt.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Afişare, partea a 2-a: evidenţierea în listă; afişarea informaţiei"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -676,11 +679,11 @@ msgstr ""
 "  afişajul de informaţii sau a-l mări până la a utiliza aproape tot "
 "ecranul.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introducere a afişării selecţiei metodei"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -724,14 +727,15 @@ msgstr ""
 "de\n"
 "ajutor, accesibilă apăsând „?”.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Combinaţii de taste pentru selectarea metodei"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1055,7 +1059,7 @@ msgstr "Metoda de acces „%s”."
 msgid "Abbrev."
 msgstr "Presc."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Descriere"
 
@@ -1075,15 +1079,16 @@ msgstr "eşec la reblocarea lui SIGWINCH"
 msgid "getch failed"
 msgstr "eşec getch"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[niciuna]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "explicaţie la "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Nici o explicaţie disponibilă."
 
@@ -1130,7 +1135,8 @@ msgstr "nu pot aştepta după %.250s"
 #: dselect/method.cc:175
 #, c-format
 msgid "got wrong child's status - asked for %ld, got %ld"
-msgstr "am recepţionat o stare greşită a procesului-fiu - cerut %ld, recepţionat %ld"
+msgstr ""
+"am recepţionat o stare greşită a procesului-fiu - cerut %ld, recepţionat %ld"
 
 #: dselect/method.cc:186
 #, c-format
@@ -1415,194 +1421,198 @@ msgid "pre-depends on"
 msgstr "ante-dependenţă de"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "în conflict cu"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "furnizează"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "înlocuieşte"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "îmbunătăţeşte"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Ncs"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Nec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opţ"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Sup"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "dFT"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Deteriorat"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nou"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Actualizat"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Învechit/local"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "La-zi"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Disponibil"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Îndepărtat"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Pachete instalate defectuos"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Pachete noi disponibile"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Pachete actualizate (este disponibilă o versiune mai nouă)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Pachete învechite şi locale existente pe sistem"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Pachete instalate aduse la zi"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Pachete disponibile (neinstalate încă)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Pachete îndepărtate sau indisponibile"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Pachete instalate"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Pachete îndepărtate (configurarea încă prezentă)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pachete curăţate şi cele care nu au fost niciodată instalate"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Instalate"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Curăţate"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - afişare recursivă a pachetelor"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecţia stării pachetelor"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - lista principală a pachetelor"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (după secţiune)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (disponibil, secţiune)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (stare, secţiune)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (după prioritate)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (disponibil, prioritate)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (stare, prioritate)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetic)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (după disponibilitate)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (după stare)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marchează:+/=/- concis:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marchează:+/=/- detaliat:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " concis:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " detaliat:v ajutor:?"
 
@@ -1626,42 +1636,26 @@ msgstr ""
 "Puteţi folosi „o” şi „O” pentru schimbarea ordinii de sortare dându-vă "
 "posibilitatea să marcaţi pachetele în diferite moduri de grupare."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "relaţii interne care afectează "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "relaţii interne"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "descriere a "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "nici o descriere disponibilă."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "descriere"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "informaţia de control instalată în prezent"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "informaţia de control instalată pentru "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "versiune disponibilă a informaţiei de control a fişierelor"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "versiune disponibilă a informaţiei de control pentru"
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<null>"
@@ -1760,3 +1754,17 @@ msgstr "Ver. Inst"
 msgid "Avail.ver"
 msgstr "Ver.disp"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "relaţii interne care afectează "
+
+#~ msgid "description of "
+#~ msgstr "descriere a "
+
+#~ msgid "description"
+#~ msgstr "descriere"
+
+#~ msgid "currently installed control info"
+#~ msgstr "informaţia de control instalată în prezent"
+
+#~ msgid "available version of control info for "
+#~ msgstr "versiune disponibilă a informaţiei de control pentru"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 65247de7..4df8dfb9 100644
--- a/dselect/po/ru.po
+++ b/dselect/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ru\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-07 18:03+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: dselect/basecmds.cc:121
 msgid "Search for ? "
@@ -58,7 +59,8 @@ msgstr "работа функции ioctl(TIOCGWINSZ) завершилась н
 
 #: dselect/baselist.cc:60
 msgid "doupdate in SIGWINCH handler failed"
-msgstr "работа функции doupdate в обработчике сигнала SIGWINCH завершилась неудачно"
+msgstr ""
+"работа функции doupdate в обработчике сигнала SIGWINCH завершилась неудачно"
 
 #: dselect/baselist.cc:67
 msgid "failed to restore old SIGWINCH sigact"
@@ -142,7 +144,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "горячие клавиши"
 
 #: dselect/baselist.cc:307
@@ -297,14 +300,15 @@ msgstr "Выбрать выделенный метод доступа"
 msgid "Quit without changing selected access method"
 msgstr "Выход без изменения выбранного метода доступа"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Горячие клавиши"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -370,11 +374,11 @@ msgstr ""
 "поиск\n"
 "        затребованное состояние для всех пакетов\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Вводная информация о списке пакетов"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -430,11 +434,11 @@ msgstr ""
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Вводная информация о просмотре списке пакетов в режиме чтения"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -470,13 +474,13 @@ msgstr ""
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Вводная информация о вложенном списке пакетов для разрешения конфликтов/"
 "зависимостей"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -542,11 +546,11 @@ msgstr ""
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>. Помните, "
 "что для вызова справки достаточно нажать клавишу `?'.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Просмотр, часть 1: список пакетов и символы состояния"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -605,11 +609,11 @@ msgstr ""
 "и доступной версий (shift-V переключает режим отображения) и краткое\n"
 "описание.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Просмотр, часть 2: выделение, отображение информации"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -656,11 +660,11 @@ msgstr ""
 "  Клавиша i циклически переключает режимы отображения в этой части экрана,\n"
 "  а клавиша I скрывает её или расширяет почти до размеров экрана.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Вводная информация об экране выбора метода доступа"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -701,14 +705,15 @@ msgstr ""
 "Полный список горячих клавиш можно получить, нажав клавишу k или войдя\n"
 "в общую справку, нажав клавишу ?.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Горячие клавиши при выборе метода доступа"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1037,7 +1042,7 @@ msgstr "Метод доступа `%s'."
 msgid "Abbrev."
 msgstr "Сокр."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Описание"
 
@@ -1057,15 +1062,16 @@ msgstr "не удалось заново блокировать сигнал SIG
 msgid "getch failed"
 msgstr "ожидание нажатия клавиши завершилось неудачно"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[нет]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "описание метода "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Нет описания."
 
@@ -1136,7 +1142,8 @@ msgstr "(Сохранился снимок памяти)\n"
 #: dselect/method.cc:197
 #, c-format
 msgid "failed with an unknown wait return code %d.\n"
-msgstr "работа процесса завершилась неудачно с неизвестным кодом возврата %d.\n"
+msgstr ""
+"работа процесса завершилась неудачно с неизвестным кодом возврата %d.\n"
 
 #: dselect/method.cc:199
 #, c-format
@@ -1181,7 +1188,8 @@ msgstr "не удалось прочитать список методов до
 #: dselect/methparse.cc:100
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
-msgstr "название метода (начинается с %.250s) слишком длинное (%d > %d символов)"
+msgstr ""
+"название метода (начинается с %.250s) слишком длинное (%d > %d символов)"
 
 #: dselect/methparse.cc:111
 #, c-format
@@ -1239,7 +1247,8 @@ msgstr "перед описанием метода обнаружен симво
 
 #: dselect/methparse.cc:173
 msgid "EOF in summary - missing newline"
-msgstr "в описании обнаружен символ конца файла -- отсутствует символ конца строки"
+msgstr ""
+"в описании обнаружен символ конца файла -- отсутствует символ конца строки"
 
 #: dselect/methparse.cc:183
 #, c-format
@@ -1400,194 +1409,198 @@ msgid "pre-depends on"
 msgstr "требует предварительной установки"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "конфликтует с"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "предоставляет"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "заменяет"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "расширяет"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Обз"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Вжн"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Стд"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Рек"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Доп"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Экс"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Доб"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "оШБ"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Неработоспособные"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Новые"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Обновлённые"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Устаревшие/локальные"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Актуальные"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Доступные"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Удалённые"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Пакеты, установка которых завершилась неудачно"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Новые доступные пакеты"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Обновлённые пакеты (доступна новая версия)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Установленные устаревшие или локальные пакеты"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Установленные актуальные пакеты"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Доступные не установленные пакеты"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Удалённые или более недоступные пакеты"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Установленные пакеты"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Удалённые пакеты (файлы конфигурации сохранены)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Вычищенные и никогда не устанавливавшиеся пакеты"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Установлен"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Вычищен"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect -- вложенный список пакетов"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect -- просмотр состояний пакетов"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect -- основной список пакетов"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (по разделу)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (доступность, раздел)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (состояние, раздел)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (по приоритету)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (доступность, приоритет)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (состояние, приоритет)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (по алфавиту)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (по доступности)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (по состоянию)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " отметить:+/=/- кратко:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " отметить:+/=/- подробно:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " кратко:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " подробно:v подсказка:?"
 
@@ -1611,42 +1624,26 @@ msgstr ""
 "Используйте клавиши `o' и `O' для изменения порядка сортировки пакетов. Это "
 "позволит отмечать пакеты, пользуясь широким набором критериев."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "зависимости с участием "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "зависимости "
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "описание пакета "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "описание отсутствует."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "описание"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "информация об установленной версии"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "информация об установленной версии пакета "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "информация о доступной версии"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "информация о доступной версии пакета "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<пусто>"
@@ -1745,3 +1742,17 @@ msgstr "Уст.верс."
 msgid "Avail.ver"
 msgstr "Дост.верс."
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "зависимости с участием "
+
+#~ msgid "description of "
+#~ msgstr "описание пакета "
+
+#~ msgid "description"
+#~ msgstr "описание"
+
+#~ msgid "currently installed control info"
+#~ msgstr "информация об установленной версии"
+
+#~ msgid "available version of control info for "
+#~ msgstr "информация о доступной версии пакета "
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index a150115b..a6f568b8 100644
--- a/dselect/po/sk.po
+++ b/dselect/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-05 20:44+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -141,7 +141,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "funkcie klávesov"
 
 #: dselect/baselist.cc:307
@@ -296,14 +297,15 @@ msgstr "Výber aktuálne označenej prístupovej metódy"
 msgid "Quit without changing selected access method"
 msgstr "Ukončenie bez zmeny zvolenej výberovej metódy"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Funkcie klávesov"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -367,11 +369,11 @@ msgstr ""
 "   D     nastav všetko na priamo požadovaný stav        n, \\ opakuj "
 "posledné vyhľadávanie\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Úvod do výberov balíkov"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -431,11 +433,11 @@ msgstr ""
 "\n"
 "Stlačte <medzerník> pre ukončenie nápovedy a vstúpte do zoznamu.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Úvod k prehliadaču zoznamu balíkov len pre čítanie"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -474,11 +476,11 @@ msgstr ""
 "\n"
 "Stlačte <medzerník> pre ukončenie nápovedy a vstúpte do zoznamu.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Úvod k podzoznamu riešení konfliktov/závislostí"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -544,11 +546,11 @@ msgstr ""
 "Stlačte <medzerník> pre odchod z nápovedy a vstup do sub-zoznamu; pamätajte "
 "si: stlačte `?' pre nápovedu.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Zobrazenie, čast 1: zoznam balíkov a znaky stavov"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -609,11 +611,11 @@ msgstr ""
 "dostupné čísla verzií pre každý balík (shift-V pre zobrazenie/skrytie) a "
 "sumárny popis.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Zobrazenie, časť 2: zoznam zvýraznení; informačný displej"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -663,11 +665,11 @@ msgstr ""
 "  informačného displeja alebo na jeho zväčšenie na takmer celú veľkosť "
 "obrazovky.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Úvod do zobrazenia výberu metódy"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -711,14 +713,15 @@ msgstr ""
 "alebo z menu\n"
 "nápovedy, ktorú je možné získať stlačením klávesy `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Keystrokes for method selection"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1041,7 +1044,7 @@ msgstr "Prístupová metóda `%s'."
 msgid "Abbrev."
 msgstr "Skrát."
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Popis"
 
@@ -1061,15 +1064,16 @@ msgstr "zlyhalo opätovné zablokovanie premennej SIGWINCH"
 msgid "getch failed"
 msgstr "funkcia getch zlyhala"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[žiadny]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "vysvetlenie"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Nie je dostupné žiadne vysvetlenie."
 
@@ -1400,194 +1404,198 @@ msgid "pre-depends on"
 msgstr "pred-závisí na"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "conflicts with"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "poskytuje"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "nahrádza"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "vylepšuje"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Vyž"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Dôl"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Å ta"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Dop"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Vol"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "Chy"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Poškodený"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nový"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Aktualizovaný"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Zastaralý/lokálny"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Aktuálny"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Dostupný"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Odstránený"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Chybne nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Novo dostupné balíky"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Aktualizované balíky (k dispozícii je novšia verzia)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Zastaralé a lokálne balíky v systéme"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Aktuálne nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Dostupné balíky (momentálne nenainštalované)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Odstránené a viac nedostupné balíky"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Odstránené balíky (konfigurácia stále zachovaná)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Vyčistené a nikdy nenainštalované balíky"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Nainštalované"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Vyčistené"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzívny výpis balíkov"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inšpekcia stavov balíkov"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - hlavný zoznam balíkov"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (podľa sekcie)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (dostup., sekcia)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (stav, sekcia)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (podľa priority)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (dostup., priorita)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (stav, priorita)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (abecedne)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (podľa dostupnosti)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (podľa stavu)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " znač.:+/=/- struč:v nápoveda:? "
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " znač.:+/=/- podrob:v nápoveda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " stručne:v nápoveda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " podrobne:v nápoveda:?"
 
@@ -1611,42 +1619,26 @@ msgstr ""
 "Môžete použiť `o' a `O' na zmenu zotriedenia a umožniť tak označenie balíkov "
 "z iných skupín."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "závislosti ovplyvňujúce "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "závislosti"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "popis"
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "popis nie je dostupný"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "popis"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "momentálne nainštalované riadiace informácie"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "nainštalované riadiace informácie pre "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "dostupná verzia informácií o riadiacom súbore"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "dostupná verzia informácií o riadení pre"
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<nula>"
@@ -1744,3 +1736,18 @@ msgstr "Inšt.ver"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Dostup.ver"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "závislosti ovplyvňujúce "
+
+#~ msgid "description of "
+#~ msgstr "popis"
+
+#~ msgid "description"
+#~ msgstr "popis"
+
+#~ msgid "currently installed control info"
+#~ msgstr "momentálne nainštalované riadiace informácie"
+
+#~ msgid "available version of control info for "
+#~ msgstr "dostupná verzia informácií o riadení pre"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 48cd5673..b04dba31 100644
--- a/dselect/po/sv.po
+++ b/dselect/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-05 13:22-0700\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -41,7 +41,8 @@ msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
 msgstr ""
-"Tryck en tangent från listan ovan, <blanksteg>, \"q\" eller \"Q\" avslutar hjälpen,\n"
+"Tryck en tangent från listan ovan, <blanksteg>, \"q\" eller \"Q\" avslutar "
+"hjälpen,\n"
 "  eller \".\" (punkt) för att läsa hjälpsidorna i sekvens. "
 
 #: dselect/basecmds.cc:198
@@ -139,7 +140,8 @@ msgstr ""
 
 # ??
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "tangentbordsbindningar"
 
 #: dselect/baselist.cc:307
@@ -294,14 +296,15 @@ msgstr "V
 msgid "Quit without changing selected access method"
 msgstr "Avsluta utan att ändra vald åtkomstmetod"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tangenter"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -312,15 +315,21 @@ msgid ""
 "\n"
 "Mark packages for later processing:\n"
 " +, Insert  install or upgrade      =, H  hold in present state\n"
-" -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
 " _          remove & purge config\n"
 "                                             Miscellaneous:\n"
-"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n"
-" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info displays\n"
-"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display opts\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
-"   U     set all to sUggested state             /   search (Return to cancel)\n"
+"   U     set all to sUggested state             /   search (Return to "
+"cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Rörelsetangenter: Nästa/Föregående, Början/Slut, Upp/Ner, Framåt/Bakåt:\n"
@@ -336,39 +345,48 @@ msgstr ""
 "Markera paket för senare hantering:\n"
 " +, Insert  installera/uppgradera   =, H  håll i nuvarande tillstånd\n"
 " -, Delete  ta bort                 :, G  stäng av \"håll\":\n"
-" _          ta bort & radera konfig.            uppgradera/lämna oinstallerat\n"
+" _          ta bort & radera konfig.            uppgradera/lämna "
+"oinstallerat\n"
 "                                             Diverse:\n"
 "Avsluta, lämna, skriv över (versaler!):       ?, F1 begär hjälp (även Help)\n"
-" Enter   Bekräfta, lämna (undersök beroenden) i, I  växla/cykla infovisningar\n"
+" Enter   Bekräfta, lämna (undersök beroenden) i, I  växla/cykla "
+"infovisningar\n"
 "   Q     Bekräfta, lämna (ignorera beroenden) o, O  cykla sorteringsval\n"
 " X, Esc  Avsluta utan att genomföra ändringar v, V  ändra statusvisningsval\n"
 "   R     Återgå till föregående tillstånd      ^l   rita om skärmen\n"
 "   U     Ställ till föreslaget tillstånd        /   sök (Enter avbryter)\n"
-"   D     Sätt alla till önskat tillstånd      n, \\  repetera senaste sökningen\n"
+"   D     Sätt alla till önskat tillstånd      n, \\  repetera senaste "
+"sökningen\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Introduktion till paketvalen"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  You can navigate around the list using the cursor keys,\n"
 "mark packages for installation (using `+') or deinstallation (using `-').\n"
-"Packages can be marked either singly or in groups; initially you will see that\n"
-"the line `All packages' is selected.  `+', `-' and so on will affect all the\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
 "packages described by the highlighted line.\n"
 "\n"
-"Some of your choices will cause conflicts or dependency problems; you will be\n"
-"given a sub-list of the relevant packages, so that you can solve the problems.\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
 "Much on-line help is available, please make use of it - press `?' at\n"
 "any time for help.\n"
 "\n"
-"When you have finished selecting packages, press <enter> to confirm changes,\n"
+"When you have finished selecting packages, press <enter> to confirm "
+"changes,\n"
 "or `X' to quit without saving changes. A final check on conflicts and\n"
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
@@ -376,13 +394,19 @@ msgid ""
 msgstr ""
 "Välkomen till dselects huvudpaketlista.\n"
 "\n"
-"Du kommer att visas en lista över paket som är installerade eller tillgängliga\n"
-"för installation. Du kan navigera i listan genom att använda piltangenterna,\n"
-"markera paket för installation (med \"+\") eller avinstallation (med \"-\").\n"
-"Paket kan markeras antingen själva eller i grupper. Till att börja med kommer\n"
-"du att se att raden \"Alla paket\" är vald. \"+\", \"-\" osv. kommer att påverka\n"
+"Du kommer att visas en lista över paket som är installerade eller "
+"tillgängliga\n"
+"för installation. Du kan navigera i listan genom att använda "
+"piltangenterna,\n"
+"markera paket för installation (med \"+\") eller avinstallation (med \"-"
+"\").\n"
+"Paket kan markeras antingen själva eller i grupper. Till att börja med "
+"kommer\n"
+"du att se att raden \"Alla paket\" är vald. \"+\", \"-\" osv. kommer att "
+"påverka\n"
 "alla paket som beskrivs av den markerade raden.\n"
-"Vissa av dina val kommer att orsaka konflikter eller beroendeproblem. Du kommer\n"
+"Vissa av dina val kommer att orsaka konflikter eller beroendeproblem. Du "
+"kommer\n"
 "då att ges en dellista med relevanta paket, så att du kan lösa problemen.\n"
 "\n"
 "Du bör läsa listan över tangenter och förklaringen av visningen.\n"
@@ -391,22 +415,25 @@ msgstr ""
 "\n"
 "När du är färdig med dina val trycker du <Enter> för att bekräfta dina val,\n"
 "eller \"X\" för att avsluta utan att spara. En sista kontroll av konflikter\n"
-"och beroenden kommer att göras, och även här kan du komma att se en dellista.\n"
+"och beroenden kommer att göras, och även här kan du komma att se en "
+"dellista.\n"
 "\n"
 "Tryck <Blanksteg> för att lämna hjälpen och gå till listan nu.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Introduktion till den skrivskyddade paketlistebläddraren"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
-"You will be presented with a list of packages which are installed or available\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
 "for installation.  Since you do not have the privilege necessary to update\n"
 "package states, you are in a read-only mode.  You can navigate around the\n"
-"list using the cursor keys (please see the `Keystrokes' help screen), observe\n"
+"list using the cursor keys (please see the `Keystrokes' help screen), "
+"observe\n"
 "the status of the packages and read information about them.\n"
 "\n"
 "You should read the list of keys and the explanations of the display.\n"
@@ -419,10 +446,12 @@ msgid ""
 msgstr ""
 "Välkomen till dselects huvudpaketlista.\n"
 "\n"
-"Du kommer att få se en lista över paket som är installerade eller tillgängliga\n"
+"Du kommer att få se en lista över paket som är installerade eller "
+"tillgängliga\n"
 "för installation. Eftersom du inte har tillräcklig behörighet för att\n"
 "uppdatera informationen är du i skrivskyddat läge. Du kan navigera i listan\n"
-"med piltangenterna (se hjälpskärmen \"Tangenter\") och se på paketens status\n"
+"med piltangenterna (se hjälpskärmen \"Tangenter\") och se på paketens "
+"status\n"
 "samt läsa information om dem.\n"
 "\n"
 "Du bör läsa listan över tangenter och förklaringen av visningen.\n"
@@ -433,72 +462,93 @@ msgstr ""
 "\n"
 "Tryck <Blanksteg> för att lämna hjälpen och gå till listan nu.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduktion till konflikt-/beroendehanteringsunderlistan"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
 "One or more of your choices have raised a conflict or dependency problem -\n"
-"some packages should only be installed in conjunction with certain others, and\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
 "some combinations of packages may not be installed together.\n"
 "\n"
-"You will see a sub-list containing the packages involved.  The bottom half of\n"
-"the display shows relevant conflicts and dependencies; use `i' to cycle between\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
 "that, the package descriptions and the internal control information.\n"
 "\n"
-"A set of `suggested' packages has been calculated, and the initial markings in\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
 "this sub-list have been set to match those, so you can just hit Return to\n"
-"accept the suggestions if you wish.  You may abort the change(s) which caused\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
 "the problem(s), and go back to the main list, by pressing capital `X'.\n"
 "\n"
-"You can also move around the list and change the markings so that they are more\n"
-"like what you want, and you can `reject' my suggestions by using the capital\n"
-"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' to\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
 "force me to accept the situation currently displayed, in case you want to\n"
 "override a recommendation or think that the program is mistaken.\n"
 "\n"
-"Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n"
+"Press <space> to leave help and enter the sub-list; remember: press `?' for "
+"help.\n"
 msgstr ""
 "Hantering av beroenden/konflikter - introduktion.\n"
 "\n"
-"Ett eller flera av dina val har orsakat en konflikt eller ett beroendeproblem -\n"
+"Ett eller flera av dina val har orsakat en konflikt eller ett "
+"beroendeproblem -\n"
 "vissa paket bör endast installeras i samband med vissa andra, och vissa\n"
 "kombinationer av paket kan inte installeras samtidigt.\n"
 "\n"
 "Du kommer att se en underlista med de involverande paketen. Nedre halvan av\n"
-"skärmen visar relevanta konflikter och beroenden. Använd \"i\" för att cykla\n"
+"skärmen visar relevanta konflikter och beroenden. Använd \"i\" för att "
+"cykla\n"
 "mellan dem, paketbeskrivningarna och den interna kontrollinformationen.\n"
 "\n"
 "En samling \"föreslagna\" paket har beräknats, och de ursprungliga\n"
-"inställningarna i denna underlista har satts till att matcha dessa, så att du\n"
+"inställningarna i denna underlista har satts till att matcha dessa, så att "
+"du\n"
 "helt enkelt kan trycka Enter för att acceptera valen om du vill. Du kan\n"
 "avbryta ändringarna som orsakade problemen och gå tillbaka till huvudlistan\n"
 "genom att trycka ett versalt \"X\".\n"
 "\n"
-"Du kan också stega genom listan och ändra inställningarna så att de blir mer\n"
-"vad du önskar, och du kan \"förkasta\" mitt förslag genom att använda versalt\n"
-"\"D\" eller \"R\" (se tangentbordshjälpen). Du kan använda versalt \"Q\" för\n"
+"Du kan också stega genom listan och ändra inställningarna så att de blir "
+"mer\n"
+"vad du önskar, och du kan \"förkasta\" mitt förslag genom att använda "
+"versalt\n"
+"\"D\" eller \"R\" (se tangentbordshjälpen). Du kan använda versalt \"Q\" "
+"för\n"
 "att tvinga mig att acceptera nuvarande inställningar, om du önskar gå förbi\n"
 "rekommendationen, eller tycker att programmet misstagit sig.\n"
 "\n"
-"Tryck <Blanksteg> för att lämna hjälpen och komma till underlistan. Kom ihåg:\n"
+"Tryck <Blanksteg> för att lämna hjälpen och komma till underlistan. Kom "
+"ihåg:\n"
 "tryck \"?\" för hjälp.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visning, del 1: paketlistning och statussymboler"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
-"The top half of the screen shows a list of packages.  For each package you see\n"
-"four columns for its current status on the system and mark.  In terse mode (use\n"
-"`v' to toggle verbose display) these are single characters, from left to right:\n"
-"\n"
-" Error flag: Space - no error (but package may be in broken state - see below)\n"
-"              `R'  - serious error during installation, needs reinstallation;\n"
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
 " Installed state:   Space - not installed;\n"
 "                     `*'  - installed;\n"
 "                     `-'  - not installed but config files remain;\n"
@@ -514,15 +564,20 @@ msgid ""
 "  `n': package is new and has yet to be marked for install/remove/&c.\n"
 "\n"
 "Also displayed are each package's Priority, Section, name, installed and\n"
-"available version numbers (shift-V to display/hide) and summary description.\n"
+"available version numbers (shift-V to display/hide) and summary "
+"description.\n"
 msgstr ""
-"Övre halvan av skärmen visar en lista över paket. För varje paket ser du fyra\n"
-"kolumner för deras nuvarande status och markering. I det koncisa läget (tryck\n"
+"Övre halvan av skärmen visar en lista över paket. För varje paket ser du "
+"fyra\n"
+"kolumner för deras nuvarande status och markering. I det koncisa läget "
+"(tryck\n"
 "\"v\" för att få pratsamt läge) är dessa enkla bokstäver, från vänster till\n"
 "höger:\n"
 "\n"
-" Felflagga: blanksteg  - inget fel (men paketet kan vara trasigt - se nedan)\n"
-"             \"R\"       - allvarligt fel vid installation, måste ominstalleras\n"
+" Felflagga: blanksteg  - inget fel (men paketet kan vara trasigt - se "
+"nedan)\n"
+"             \"R\"       - allvarligt fel vid installation, måste "
+"ominstalleras\n"
 " Tillstånd: blanksteg  - ej installerat\n"
 "                \"*\"    - installerat\n"
 "                \"-\"    - ej installerat, men konfigurationsfiler kvarstår\n"
@@ -534,23 +589,27 @@ msgstr ""
 "  \"*\": markerat för att installeras eller uppgraderas\n"
 "  \"-\": markerat för att tas bort, men att behålla konfigurationsfilerna\n"
 "  \"=\": håll: paketet kommer över huvud taget inte att hanteras\n"
-"  \"_\": markerat för radering, även konfigurationsfiler kommer att tas bort\n"
+"  \"_\": markerat för radering, även konfigurationsfiler kommer att tas "
+"bort\n"
 "  \"n\": paketet är nytt har ännu inte markerats för någonting\n"
 "\n"
 "Varje pakets prioritet, sektion, namn, installerad och tillgänglig version\n"
 "(skift-V för att visa/dölja) och sammanfattad beskrivning visas också.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visning, del 2: listmarkering, informationsvisning"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
-"* Highlight: One line in the package list will be highlighted.  It indicates\n"
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
 "  which package(s) will be affected by presses of `+', `-' and `_'.\n"
 "\n"
-"* The dividing line in the middle of the screen shows a brief explanation of\n"
-"  the status of the currently-highlighted package, or a description of which\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
 "  group is highlighted if a group line is.  If you don't understand the\n"
 "  meaning of some of the status characters displayed, go to the relevant\n"
 "  package and look at this divider line, or use the `v' key for a verbose\n"
@@ -571,45 +630,55 @@ msgstr ""
 "  paket som kommer att påverkas om \"+\", \"-\" och \"_\" trycks.\n"
 "\n"
 "* Avdelningslinjen i mitten av skärmen visar en kort förklaring av det nu\n"
-"  markerade paketets status, eller en beskrivning av vilken grupp som markeras\n"
+"  markerade paketets status, eller en beskrivning av vilken grupp som "
+"markeras\n"
 "  om markeringsraden står på en sådan rad. Om du inte förstår betydelsen av\n"
 "  någon av statussymbolerna som visas kan du gå till paketet och titta på\n"
 "  avdelningslinjen, eller använda \"v\" för att slå på det pratsamma läget\n"
 "  (tryck \"v\" igen för att återgå till den koncisa visningen).\n"
 "\n"
-"* Den nedre delen av skärmen visar ytterligare information om det nu markerade\n"
+"* Den nedre delen av skärmen visar ytterligare information om det nu "
+"markerade\n"
 "  paketet (om endast ett paket markerats).\n"
 "\n"
-"  Den kan visa den utökade beskrivningen av paketet, detaljer om intern paket-\n"
-"  information (antingen för den installerade eller den tillgängliga versionen\n"
+"  Den kan visa den utökade beskrivningen av paketet, detaljer om intern "
+"paket-\n"
+"  information (antingen för den installerade eller den tillgängliga "
+"versionen\n"
 "  av paketet), eller information om konflikter och beroenden som gäller det\n"
 "  aktuella pektet (i underlistor där konflikter/beroenden hanteras).\n"
 "\n"
-"  Använd \"i\"-tangenten för att cykla genom de olika visningslägena, och \"I\"\n"
-"  för att gömma informationsvisningen, eller utöka den till att använda nästan\n"
+"  Använd \"i\"-tangenten för att cykla genom de olika visningslägena, och \"I"
+"\"\n"
+"  för att gömma informationsvisningen, eller utöka den till att använda "
+"nästan\n"
 "  hela skärmen.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Introduktion till metodvalsskärmen"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
-"dselect and dpkg can do automatic installation, loading the package files to be\n"
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
 "installed from one of a number of different possible places.\n"
 "\n"
 "This list allows you to select one of these installation methods.\n"
 "\n"
-"Move the highlight to the method you wish to use, and hit Enter.  You will then\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
 "be prompted for the information required to do the installation.\n"
 "\n"
 "As you move the highlight a description of each method, where available, is\n"
 "displayed in the bottom half of the screen.\n"
 "\n"
-"If you wish to quit without changing anything use the `x' key while in the list\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
 "of installation methods.\n"
 "\n"
-"A full list of keystrokes is available by pressing `k' now, or from the help\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
 "menu reachable by pressing `?'.\n"
 msgstr ""
 "dselect och dpkg kan göra automatiska installationer genom att ladda paket-\n"
@@ -623,20 +692,23 @@ msgstr ""
 "När du flyttar markeringsraden visas en beskrivning av varje metod, om en\n"
 "sådan finns, på skärmens nedre halva.\n"
 "\n"
-"Om du önskar avsluta utan att ändra någonting kan du använda \"x\"-tangenten\n"
+"Om du önskar avsluta utan att ändra någonting kan du använda \"x\"-"
+"tangenten\n"
 "medan listan över installationsmetoder visas.\n"
 "\n"
-"En komplett lista av tangentbordsfunktioner får du om du trycker \"k\" nu eller\n"
+"En komplett lista av tangentbordsfunktioner får du om du trycker \"k\" nu "
+"eller\n"
 "från hjälpmenyn du når genom att trycka \"?\".\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tangenter för metodval"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -648,7 +720,8 @@ msgid ""
 "\n"
 "Quit:\n"
 " Return, Enter    select this method and go to its configuration dialogue\n"
-" x, X             exit without changing or setting up the installation method\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
 "\n"
 "Miscellaneous:\n"
 "  ?, Help, F1      request help\n"
@@ -878,8 +951,7 @@ msgstr "sk
 msgid "Null colour specification\n"
 msgstr "Tom färgangivelse\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "färg"
 
@@ -953,8 +1025,7 @@ msgstr "
 msgid "Abbrev."
 msgstr "Förk."
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -974,16 +1045,16 @@ msgstr "kunde inte 
 msgid "getch failed"
 msgstr "getch misslyckades"
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[ingen]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "förklaring av "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Ingen förklaring finns."
 
@@ -1314,251 +1385,242 @@ msgid "pre-depends on"
 msgstr "beror i förväg på"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "krockar med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "tillhandahåller"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "ersätter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "utökar"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Vik"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rek"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "FEL"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Trasiga"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Nya"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Uppdaterade"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Gamla/lokala"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Aktuella"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Tillgängliga"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Borttagna"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Trasiga installerade paket"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Nya tillgängliga paket"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Uppdaterade paket (nyare version finns)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Gamla och lokala paket som finns på systemet"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Paket som är à jour"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Tillgängliga paket (ej installerade just nu)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Borttagna och ej längre tillgängliga paket"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Installerade paket"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Borttagna paket (konfiguration kvar)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Raderade paket och de som aldrig installerats"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Installerade"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Raderade"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv paketlistning"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspektion av paketstatus"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - huvudpaketlista"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (per avdelning)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (tillg., avdelning)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (status, avdelning)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (efter prioritet)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (tillg., prioritet)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (alfabetiskt)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (efter tillgänglighet)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (efter status)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markera:+/=/- koncis:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markera:+/=/- pratsam:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " koncis:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " pratsam:v hjälp:?"
 
 #: dselect/pkginfo.cc:82
 msgid ""
-"The line you have highlighted represents many packages; if you ask to install, remove, hold, etc. it you will affect all the packages which match the criterion shown.\n"
-"\n"
-"If you move the highlight to a line for a particular package you will see information about that package displayed here.\n"
-"You can use `o' and `O' to change the sort order and give yourself the opportunity to mark packages in different kinds of groups."
+"The line you have highlighted represents many packages; if you ask to "
+"install, remove, hold, etc. it you will affect all the packages which match "
+"the criterion shown.\n"
+"\n"
+"If you move the highlight to a line for a particular package you will see "
+"information about that package displayed here.\n"
+"You can use `o' and `O' to change the sort order and give yourself the "
+"opportunity to mark packages in different kinds of groups."
 msgstr ""
-"Raden du har markerat representerar flera paket, om du ber om installation, borttagning, kvarhållning, etc. kommer det att påverka alla paket som matchar det visade kriteriet.\n"
-"\n"
-"Om du flyttar markeringen till en rad för ett specifikt paket kommer du att se information om det paketet här.\n"
-"Du kan använda \"o\" och \"O\" för att välja sorteringsordningen och ge dig själv möjligheten att markera paket i olika sorters grupper."
-
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "beroenden som påverkar "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+"Raden du har markerat representerar flera paket, om du ber om installation, "
+"borttagning, kvarhållning, etc. kommer det att påverka alla paket som "
+"matchar det visade kriteriet.\n"
+"\n"
+"Om du flyttar markeringen till en rad för ett specifikt paket kommer du att "
+"se information om det paketet här.\n"
+"Du kan använda \"o\" och \"O\" för att välja sorteringsordningen och ge dig "
+"själv möjligheten att markera paket i olika sorters grupper."
+
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "beroenden"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "beskrivning av "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "ingen beskrivning finns."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "beskrivning"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "nu installerad kontrollinfo"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "installerad kontrollinfo för "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "tillgänglig version av kontrollinfo för"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "tillgänglig version av kontrollinfo för "
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<tom>"
 
@@ -1656,3 +1718,17 @@ msgstr "Inst.ver"
 msgid "Avail.ver"
 msgstr "Tillg.ver"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "beroenden som påverkar "
+
+#~ msgid "description of "
+#~ msgstr "beskrivning av "
+
+#~ msgid "description"
+#~ msgstr "beskrivning"
+
+#~ msgid "currently installed control info"
+#~ msgstr "nu installerad kontrollinfo"
+
+#~ msgid "available version of control info for "
+#~ msgstr "tillgänglig version av kontrollinfo för "
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index f8a97855..ad760f7e 100644
--- a/dselect/po/tl.po
+++ b/dselect/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -142,7 +142,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "mga keybinding"
 
 #: dselect/baselist.cc:307
@@ -298,14 +299,15 @@ msgstr "Piliin ang naka-highlight na paraan ng pag-akses"
 msgid "Quit without changing selected access method"
 msgstr "Lumabas na hindi binabago ang piniling paraan ng pag-akses"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Tiklado"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -363,11 +365,11 @@ msgstr ""
 "   D     set all to Directly requested state  n, \\  ulitin ang huling "
 "paghanap\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Pagpapakilala sa pagpili ng mga pakete"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -433,11 +435,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at bumalik sa listahan "
 "ngayon.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Pagpapakilala sa browser ng listahan ng mga pakete na pagbasa-lamang"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -480,11 +482,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at bumalik sa listahan "
 "ngayon.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Pagpapakilala sa sub-list ng pag-ayos ng conflict/dependensiya"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -554,11 +556,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at pumasok sa sub-list;\n"
 "alalahanin: pindutin ang `?' para sa tulong.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Display, ika-1 bahagi: listahan ng mga pakete at kalagayang titik"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -629,11 +631,11 @@ msgstr ""
 "paglalarawang\n"
 "maikli ng bawat pakete.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Display, ika-2 bahagi: listahang highlight; pagpakita ng impormasyon"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -690,11 +692,11 @@ msgstr ""
 "  ang display ng impormasyon o lakihan ito na gamitin ang halos buong "
 "tabing.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Pagpapakilala sa pagpili ng paraan"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -732,14 +734,15 @@ msgstr ""
 "Maaaring makita ang buong listahan ng magagamit na tiklado sa pagpindot ng\n"
 "`k'ilalanin, o mula sa menu ng tulong na makikita sa pagpindot ng `?'.\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Tikladong gamit sa pagpili ng paraan"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1048,7 +1051,7 @@ msgstr "Paraan ng akses `%s'."
 msgid "Abbrev."
 msgstr "Daglat"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Paglalarawan"
 
@@ -1068,15 +1071,16 @@ msgstr "bigo sa pag-re-block ng SIGWINCH"
 msgid "getch failed"
 msgstr "bigo ang getch"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[wala]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "paliwanag ng "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Walang paliwanag na maibigay."
 
@@ -1409,194 +1413,198 @@ msgid "pre-depends on"
 msgstr "umaasa ng lubos sa"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "katunggali ang"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "nagbibigay ng"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "kapalit ng"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "nagpapahusay sa"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Rec"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Ctb"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "bUg"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Sira"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Bago"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "May Mas Bago"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Laos/lokal"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Kasalukuyan"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Magagamit"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Tinanggal"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Sira ang pagkaluklok na mga pakete"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Bagong magagamit na mga pakete"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Makabagong mga pakete (may bagong bersyong magagamit)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Laos na at mga lokal na pakete na narito sa sistema"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Nakaluklok na mga pakete na hindi laos"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Magagamit na mga pakete (hindi nakaluklok sa kasalukuyan)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Tinanggal at hindi na magagamit na mga pakete"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Nakaluklok na mga pakete"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Tinanggal na mga pakete (pagkaayos ay narito pa)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Pinurgang mga pakete at mga hindi kailanman naluklok"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Linuklok"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Pinurga"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - listahan ng mga pakete na recursive"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - pagsuri ng kalagayan ng mga pakete"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - pangunahing listahan ng mga pakete"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (ayon sa seksyon)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (magagamit, seksyon)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (kalagayan, seksyon)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (ayon sa prioridad)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (magagamit, prioridad)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (kalagayan, prioridad)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (ayon sa abakada)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (ayon sa magagamit)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (ayon sa kalagayan)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markahan:+/=/- maikli:v tulong:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markahan:+/=/- maligoy:v tulong:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " maikli:v tulong:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " maligoy:v tulong:?"
 
@@ -1623,42 +1631,26 @@ msgstr ""
 "pakete\n"
 "sa iba't ibang uri ng pag-grupo."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "mga kaugnayang nakakaapekto sa "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "mga kaugnayan"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "paglalarawan ng "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "walang paglalarawan na magagamit."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "paglalarawan"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "kasalukuyang nakaluklok na impormasyong control"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "naka-luklok na impormasyong control para sa "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "magagamit na bersyon ng impormasyon ng talaksang control"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "magagamit na bersyon ng impormasyong control para sa "
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<wala>"
@@ -1756,3 +1748,18 @@ msgstr "Inst.ber"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Avail.ber"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "mga kaugnayang nakakaapekto sa "
+
+#~ msgid "description of "
+#~ msgstr "paglalarawan ng "
+
+#~ msgid "description"
+#~ msgstr "paglalarawan"
+
+#~ msgid "currently installed control info"
+#~ msgstr "kasalukuyang nakaluklok na impormasyong control"
+
+#~ msgid "available version of control info for "
+#~ msgstr "magagamit na bersyon ng impormasyong control para sa "
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index ba8bd2d2..8a7dad5e 100644
--- a/dselect/po/vi.po
+++ b/dselect/po/vi.po
@@ -4,10 +4,10 @@
 # Phan Vinh Thinh <teppi@vnoss.org>, 2005.
 # Clytie Siddall <clytie@riverland.net.au>, 2006.
 msgid ""
-""
-msgstr "Project-Id-Version: dselect\n"
+msgstr ""
+"Project-Id-Version: dselect\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-10-09 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -31,7 +31,8 @@ msgstr "Trợ giúp: "
 
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
-msgstr "Nhấn:\n"
+msgstr ""
+"Nhấn:\n"
 "\t? \t\t\t\tđể hiện trình đơn trợ giúp\n"
 "\t.\t\t\t\t(dấu chấm) để xem chủ đề tiếp theo\n"
 "\tphím dài \tđể thoát khỏi trợ giúp."
@@ -44,7 +45,8 @@ msgstr "Có sẵn thông tin trợ giúp dưới những chủ đề sau :"
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
-msgstr "Nhấn:\n"
+msgstr ""
+"Nhấn:\n"
 "\tmột phím từ danh sách ở trên,\n"
 "\tphím dài hoặc phím Q để thoát, hoặc\n"
 "\t.\t(dấu chấm) để đọc mỗi trang trợ giúp lần lượt. "
@@ -130,7 +132,8 @@ msgid ""
 " colheads_row=%d, thisstate_row=%d, info_row=%d;\n"
 " whatinfo_row=%d, list_row=%d;\n"
 "\n"
-msgstr "danh sách cơ bản::startdisplay() (sở khởi bộ trình bày) đã xong ...\n"
+msgstr ""
+"danh sách cơ bản::startdisplay() (sở khởi bộ trình bày) đã xong ...\n"
 "\n"
 " x_tối_đa=%d, y_đối_đa=%d;\n"
 "\n"
@@ -142,7 +145,8 @@ msgstr "danh sách cơ bản::startdisplay() (sở khởi bộ trình bày) đã
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "tổ hợp phím"
 
 #: dselect/baselist.cc:307
@@ -297,14 +301,15 @@ msgstr "Chọn phương pháp truy cập đang được chiếu sáng"
 msgid "Quit without changing selected access method"
 msgstr "Thoát mà không thay đổi phương pháp truy cập đã chọn"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "Phím tắt"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -331,7 +336,8 @@ msgid ""
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
-msgstr "Phím di chuyển:\n"
+msgstr ""
+"Phím di chuyển:\n"
 "\tKế/Trước, Đầu/Cuối, Lên/Xuống, Lùi/Tiếp:\n"
 "  Mũi tên xuống, J         Mũi tên lên, K             di chuyển chiếu sáng\n"
 "  N, Page-down, Phím dài   \t\t\tP, Page-up, Backspace (Xóa lùi)\n"
@@ -369,11 +375,11 @@ msgstr "Phím di chuyển:\n"
 "   D     \t\t\t\t\tđặt tất cả thành trạng thái Yêu cầu thẳng\n"
 "\tn, \\  \t\t\t\tlặp lại tìm kiếm cuối\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "Giới thiệu sự lựa chọn gói"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -402,7 +408,8 @@ msgid ""
 "dependencies will be done - here too you may see a sublist.\n"
 "\n"
 "Press <space> to leave help and enter the list now.\n"
-msgstr "Xin chào mừng tới danh sách quản lý gói chính của dselect.\n"
+msgstr ""
+"Xin chào mừng tới danh sách quản lý gói chính của dselect.\n"
 "\n"
 "Đây là danh sách những gói đã cài đặt hoặc sẵn sàng để cài đặt.\n"
 "Có thể di chuyển quanh danh sách bằng các phím mũi tên,\n"
@@ -426,11 +433,11 @@ msgstr "Xin chào mừng tới danh sách quản lý gói chính của dselect.\
 "\n"
 "Lúc này, bạn nhấn phím dài để dời khỏi trợ giúp và đi vào danh sách.\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "Giới thiệu bộ duyệt danh sách gói chỉ đọc"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -449,7 +456,8 @@ msgid ""
 "When you have finished browsing, press `Q' or <enter> to quit.\n"
 "\n"
 "Press <space> to leave help and enter the list now.\n"
-msgstr "Xin chào mừng tới danh sách quản lý gói chính của dselect.\n"
+msgstr ""
+"Xin chào mừng tới danh sách quản lý gói chính của dselect.\n"
 "\n"
 "Đây là danh sách những gói đã cài đặt hoặc sẵn sàng để cài đặt.\n"
 "Vì bạn không có đủ quyền cần thiết để cập nhật tính trạng các gói,\n"
@@ -465,11 +473,11 @@ msgstr "Xin chào mừng tới danh sách quản lý gói chính của dselect.\
 "\n"
 "Lúc này, bạn nhấn phím dài để dời khỏi trợ giúp và đi vào danh sách.\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Giới thiệu danh sách con các giải pháp cho xung đột/phụ thuộc"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -502,7 +510,8 @@ msgid ""
 "\n"
 "Press <space> to leave help and enter the sub-list; remember: press `?' for "
 "help.\n"
-msgstr "Giải quyết phụ thuộc/xung đột — giới thiệu.\n"
+msgstr ""
+"Giải quyết phụ thuộc/xung đột — giới thiệu.\n"
 "\n"
 "Một hoặc vài lựa chọn đã gây ra vấn đề xung đột hay phụ thuộc —\n"
 "một số gói nào đó chỉ cài đặt được cùng với một số gói khác, còn một số tổ "
@@ -529,11 +538,11 @@ msgstr "Giải quyết phụ thuộc/xung đột — giới thiệu.\n"
 "Lúc này có thể nhấn phím dài để thoát khỏi trợ giúp và xem danh sách con;\n"
 "hãy nhớ : nhấn « ? » để xem trợ giúp.\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "Màn hình, phần 1: danh sách gói và ký tự trạng thái"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -563,7 +572,8 @@ msgid ""
 "Also displayed are each package's Priority, Section, name, installed and\n"
 "available version numbers (shift-V to display/hide) and summary "
 "description.\n"
-msgstr "Nửa trên của màn hình hiển thị danh sách các gói.\n"
+msgstr ""
+"Nửa trên của màn hình hiển thị danh sách các gói.\n"
 "Mỗi gói có bốn cột hiển thị trạng thái hiện thời trên hệ thống và đánh dấu.\n"
 "Trong chế độ ngắn gọn (dùng « v » để chuyển sang chế độ chi tiết)\n"
 "chúng là những ký tự đơn, từ trái sang phải:\n"
@@ -589,11 +599,11 @@ msgstr "Nửa trên của màn hình hiển thị danh sách các gói.\n"
 "Đồng thời còn hiển thị Ưu tiên, Phần, Tên, phiên bản Đã cài và Có thể cài\n"
 "(phím tắt Shift-V để hiện/ẩn) mỗi gói và mô tả tóm tắt chung.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "Màn hình, phần 2: chiếu sáng danh sách; màn hình thông tin"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -618,7 +628,8 @@ msgid ""
 "\n"
 "  Use the `i' key to cycle through the displays, and `I' to hide the\n"
 "  information display or expand it to use almost all of the screen.\n"
-msgstr "* Chiếu sáng: Sẽ chiếu sáng một dòng trong danh sách gói.  Chiếu sáng\n"
+msgstr ""
+"* Chiếu sáng: Sẽ chiếu sáng một dòng trong danh sách gói.  Chiếu sáng\n"
 "  chỉ ra gói nào sẽ bị ảnh hưởng khi nhấn phím « + », « - » và « _ ».\n"
 "\n"
 "• Dòng chia ở giữa màn hình cho biết giải thích ngắn gọn về trạng thái của\n"
@@ -637,11 +648,11 @@ msgstr "* Chiếu sáng: Sẽ chiếu sáng một dòng trong danh sách gói.
 "  Dùng phím « i » để chuyển quanh các màn hình, và « I » để ẩn màn hình\n"
 "  thông tin hay mở rộng để nó chiếu gần hết màn hình.\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "Giới thiệu màn hình chọn phương pháp"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -663,7 +674,8 @@ msgid ""
 "A full list of keystrokes is available by pressing `k' now, or from the "
 "help\n"
 "menu reachable by pressing `?'.\n"
-msgstr "dselect và dpkg có thể cài đặt tự động, tải tập tin của gói cần cài đặt\n"
+msgstr ""
+"dselect và dpkg có thể cài đặt tự động, tải tập tin của gói cần cài đặt\n"
 "từ một trong số những nơi có thể dùng.\n"
 "\n"
 "Danh sách này cho phép chọn một trong số những phương pháp cài đặt này.\n"
@@ -680,14 +692,15 @@ msgstr "dselect và dpkg có thể cài đặt tự động, tải tập tin c
 "Nhấn phím « k » để xem danh sách đầy đủ các phím tắt,\n"
 "hoặc từ trình đơn trợ giúp bằng cách nhấn phím « ? ».\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "Phím tắt để chọn phương pháp"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -707,7 +720,8 @@ msgid ""
 " ^l                redraw display\n"
 "  /                search (just return to cancel)\n"
 "  \\                repeat last search\n"
-msgstr "Phím di chuyển: Kế/Trước, Đầu/Cuối, Lên/Xuống, Lùi/Tiếp:\n"
+msgstr ""
+"Phím di chuyển: Kế/Trước, Đầu/Cuối, Lên/Xuống, Lùi/Tiếp:\n"
 "  n, Mũi tên xuống         p, Mũi tên lên             di chuyển chiếu sáng\n"
 "  N, Page-down, Phím dài   P, Page-up, Xóa lùi   cuộn 1 trang danh sách\n"
 "  ^n                    ^p                      cuộn 1 dòng danh sách\n"
@@ -831,7 +845,8 @@ msgstr "Tiền tiêu quản lý gói Debian « %s » phiên bản %s.\n"
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
-msgstr "Bản quyền © nam 1994-1996 Ian Jackson.\n"
+msgstr ""
+"Bản quyền © nam 1994-1996 Ian Jackson.\n"
 "Bản quyền © năm 2000,2001 Wichert Akkerman.\n"
 
 #: dselect/main.cc:157
@@ -840,7 +855,8 @@ msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 "See %s --license for copyright and license details.\n"
-msgstr "Đây là phần mềm tự do, hãy xem Quyền Công Chung GNU (GPL)\n"
+msgstr ""
+"Đây là phần mềm tự do, hãy xem Quyền Công Chung GNU (GPL)\n"
 "phiên bản 2 hoặc mới hơn để biết điều kiện sao chép.\n"
 "KHÔNG có bản đảm gì cả.\n"
 "Hãy xem « %s --licence » để biết điều kiện _quyền phép_.\n"
@@ -850,7 +866,8 @@ msgstr "Đây là phần mềm tự do, hãy xem Quyền Công Chung GNU (GPL)\n
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] [<hành_động> ...]\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] [<hành_động> ...]\n"
 "\n"
 
 #: dselect/main.cc:175
@@ -863,14 +880,15 @@ msgid ""
 "  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
 "                             Configure screen colours.\n"
 "\n"
-msgstr "Tùy chọn:\n"
-"  --admindir <thư_mục>	dùng thư mục này thay cho %s.\n"
-"	[_thư mục quản trị_]\n"
+msgstr ""
+"Tùy chọn:\n"
+"  --admindir <thư_mục>\tdùng thư mục này thay cho %s.\n"
+"\t[_thư mục quản trị_]\n"
 "  --expert                   \tBật chế độ _cấp cao_.\n"
 "  --debug <tập_tin> | -D<tập_tin>\n"
 "\t\t\t\t\tBật khả năng _gỡ lỗi_, xuất vào tập tin này.\n"
 "  --colour | --color screenpart:[cảnh_gần],[nền][:TT[+TT+..]]\n"
-"	[TT là thuộc tính]	cấu hình màu sắc màn hình\n"
+"\t[TT là thuộc tính]\tcấu hình màu sắc màn hình\n"
 "\n"
 
 #: dselect/main.cc:184
@@ -880,7 +898,8 @@ msgid ""
 "  --version                  Show the version.\n"
 "  --license | --licence      Show the license.\n"
 "\n"
-msgstr "  --help                     Hiện _trợ giúp_ này.\n"
+msgstr ""
+"  --help                     Hiện _trợ giúp_ này.\n"
 "  --version                  Hiện _phiên bản_.\n"
 "  --license | --licence      Hiện _giấy phép_.\n"
 "\n"
@@ -891,14 +910,15 @@ msgid ""
 "Actions:\n"
 "  access update select install config remove quit\n"
 "\n"
-msgstr "Hành động:\n"
-" • access		truy cập\n"
-" • update		cập nhật\n"
-" • select		lựa chọn\n"
-" • install		cài đặt\n"
-" • config		cấu hình (viết tắt)\n"
-" • remove	gỡ bỏ\n"
-" • quit		thoát\n"
+msgstr ""
+"Hành động:\n"
+" • access\t\ttruy cập\n"
+" • update\t\tcập nhật\n"
+" • select\t\tlựa chọn\n"
+" • install\t\tcài đặt\n"
+" • config\t\tcấu hình (viết tắt)\n"
+" • remove\tgỡ bỏ\n"
+" • quit\t\tthoát\n"
 
 #: dselect/main.cc:194
 #, c-format
@@ -933,8 +953,7 @@ msgstr "phần màn hình"
 msgid "Null colour specification\n"
 msgstr "Đặc tả màu rỗng\n"
 
-#: dselect/main.cc:270
-#: dselect/main.cc:275
+#: dselect/main.cc:270 dselect/main.cc:275
 msgid "colour"
 msgstr "màu"
 
@@ -955,7 +974,8 @@ msgstr "Thiết bị cuỗi có vẻ không hỗ trợ chiếu sáng.\n"
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
-msgstr "Hãy đặt đúng giá trị biến TERM, dùng một thiết bị cuối tốt hơn,\n"
+msgstr ""
+"Hãy đặt đúng giá trị biến TERM, dùng một thiết bị cuối tốt hơn,\n"
 "hoặc làm việc với công cụ quản lý theo từng gói %s.\n"
 
 #: dselect/main.cc:324
@@ -969,7 +989,8 @@ msgid ""
 "Move around with ^P and ^N, cursor keys, initial letters, or digits;\n"
 "Press <enter> to confirm selection.   ^L redraws screen.\n"
 "\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Di chuyển bằng ^P và ^N, phím mũi tên, chữ cái đầu, hoặc chữ số;\n"
 "Nhấn phím Enter để chọn.   ^L vẽ lại màn hình.\n"
@@ -980,7 +1001,8 @@ msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "Truy cập chỉ đọc: chỉ có sẵn xem trước các lựa chọn."
 
@@ -1006,8 +1028,7 @@ msgstr "Phương pháp truy cập « %s »"
 msgid "Abbrev."
 msgstr "Viết tắt"
 
-#: dselect/methlist.cc:122
-#: dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "Mô tả"
 
@@ -1027,16 +1048,16 @@ msgstr "việc ngăn chặn lại SIGWINCH bị lỗi"
 msgid "getch failed"
 msgstr "việc getch (đọc từng ký tự khi gõ) bị lỗi"
 
-#: dselect/methlist.cc:177
-#: dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[không có]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "giải thích về "
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "Không có giải thích sẵn sàng."
 
@@ -1046,7 +1067,8 @@ msgid ""
 "\n"
 "\n"
 "%s: %s\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "%s: %s\n"
 
@@ -1054,7 +1076,8 @@ msgstr "\n"
 msgid ""
 "\n"
 "Press <enter> to continue."
-msgstr "\n"
+msgstr ""
+"\n"
 "Nhấn phím Enter để tiếp tục lại."
 
 #: dselect/method.cc:144
@@ -1365,198 +1388,198 @@ msgid "pre-depends on"
 msgstr "phụ thuộc trước vào"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "xung đột với"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "cung cấp"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "thay thế"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "tăng cường"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "Cần"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "Qtg"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "Chn"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "Nên"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "TCh"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "Nữa"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "Góp"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "lỗi"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "Bị vỡ"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "Mới"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "Đã cũ/nội bộ"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "Hiện thời"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "Có sẵn"
 
-#: dselect/pkgdisplay.cc:103
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "Đã gỡ bỏ"
 
-#: dselect/pkgdisplay.cc:104
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "Gói đã cài nhưng bị vỡ"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "Những gói mới sẵn sàng"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "Những gói cập nhật (có sẵn phiên bản mới hơn)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "Có những gói đã cũ và gói nội bộ trong hệ thống"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "Những gói đã cài đặt phiên bản mới nhất"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "Những gói có sẵn (nhưng chưa cài đặt)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "Những gói đã gỡ bỏ và không còn nữa"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "Những gói đã cài đặt"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "Những gói đã gỡ bỏ (nhưng vẫn còn cấu hình)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "Những gói đã tẩy và gói chưa bao giờ được cài đặt"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "Đã cài đặt"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "Đã tẩy"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect — danh sách gói đệ quy"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect — sự kiểm tra trạng thái các gói"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect — danh sách gói chính"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (theo phần)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (sẵn, phần)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (trạng thái, phần)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (theo ưu tiên)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (sẵn, ưu tiên)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (trạng thái, ưu tiên)"
 
-#: dselect/pkgdisplay.cc:240
-#: dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (theo bảng chữ cái)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (theo khả năng sẵn)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (theo trạng thái)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " dấu:+/=/- ngắn gọn:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " dấu:+/=/- chi tiết:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " ngắn gọn:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " chi tiết:v trợ giúp:?"
 
@@ -1570,7 +1593,8 @@ msgid ""
 "information about that package displayed here.\n"
 "You can use `o' and `O' to change the sort order and give yourself the "
 "opportunity to mark packages in different kinds of groups."
-msgstr "Dòng vừa chiếu sáng có nhiều gói; hành động cài đặt, gỡ bỏ, giữ lại, v.v... "
+msgstr ""
+"Dòng vừa chiếu sáng có nhiều gói; hành động cài đặt, gỡ bỏ, giữ lại, v.v... "
 "sẽ ảnh hưởng đến mọi gói tương ứng với tiêu chuẩn chỉ ra.\n"
 "\n"
 "Nếu di chuyển chiếu sáng tới một dòng của một gói nào đó, thì sẽ thấy thông "
@@ -1578,44 +1602,27 @@ msgstr "Dòng vừa chiếu sáng có nhiều gói; hành động cài đặt, g
 "Có thể dùng « o » và « O » để thay đổi thứ tự sắp xếp và tạo điều kiện cho "
 "việc đánh dấu các gói trong các dạng nhóm khác nhau."
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "ảnh hưởng quan hệ qua lại "
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "quan hệ qua lại"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "mô tả về "
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "không có mô tả."
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "mô tả"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "thông tin điều khiển hiện thời đã cài đặt"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "thông tin điều khiển đã cài đặt cho "
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "phiên bản có sẵn của thông tin tập tin điều khiển"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "phiên bản có sẵn của thông tin điều khiển cho "
-
-#: dselect/pkglist.cc:123
-#: dselect/pkglist.cc:124
+#: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<rỗng>"
 
@@ -1712,3 +1719,18 @@ msgstr "Bản_cài"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "Bản_có"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "ảnh hưởng quan hệ qua lại "
+
+#~ msgid "description of "
+#~ msgstr "mô tả về "
+
+#~ msgid "description"
+#~ msgstr "mô tả"
+
+#~ msgid "currently installed control info"
+#~ msgstr "thông tin điều khiển hiện thời đã cài đặt"
+
+#~ msgid "available version of control info for "
+#~ msgstr "phiên bản có sẵn của thông tin điều khiển cho "
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index ff1c4db7..782ddf58 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: dselect/basecmds.cc:121
 msgid "Search for ? "
@@ -142,7 +142,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "键位绑定"
 
 #: dselect/baselist.cc:307
@@ -297,14 +298,15 @@ msgstr "选中当前高亮显示的安装手段"
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所选的安装手段"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "按键操作"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -359,11 +361,11 @@ msgstr ""
 "ç´¢)\n"
 "   D     把所有软件包的状态改成到所要求的值   \\        重复上次的搜索\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "软件包自选界面简介"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -419,11 +421,11 @@ msgstr ""
 "\n"
 "现在您可以通过摁 <空格> 键离开本帮助，进入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "只读软件包列表浏览界面简介"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -459,11 +461,11 @@ msgstr ""
 "\n"
 "现在您可以通过摁 <空格> 键离开帮助系统并进入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用于解决冲突/依赖问题的子列表的简介"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -525,11 +527,11 @@ msgstr ""
 "请摁 <空格> 离开帮助系统并进入子列表。\n"
 "请记住：需要帮助时，摁“?”键。\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "显示部位 1：软件包列表及状态简写"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -585,11 +587,11 @@ msgstr ""
 "的版本号和当前可用的版本号（使用 shift-v 可以开启或关闭其\n"
 "显示)，以及简要的介绍。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "显示部位 2：列表高亮部分；相关信息的显示"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -633,11 +635,11 @@ msgstr ""
 "  您可以用“i”键在这些显示内容中来回切换，用“I”来关闭相关信息\n"
 "  的显示，或者扩大它在屏幕中所占的幅面直到几乎完全占据屏幕。\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "安装手段选择界面的简介"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -674,14 +676,15 @@ msgstr ""
 "现在摁“k”键就能见到按键操作的完整列表，也可以在帮助菜单中摁“k”键。\n"
 "摁“?”就能呼出帮助菜单。\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "选择安装手段的按键操作"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -1001,7 +1004,7 @@ msgstr "安装手段“%s”。"
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "简介"
 
@@ -1021,15 +1024,16 @@ msgstr "重新阻塞 SIGWINCH 信号失败"
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[无]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
@@ -1360,194 +1364,198 @@ msgid "pre-depends on"
 msgstr "预依赖于"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "与之冲突"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "替换"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "有助于"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "标"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "荐"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "选"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "余"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "献"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "有更新"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "已更新"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "已删除"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "有故障的已安装软件包"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "新的可用软件包"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "软件包有更新版本(有更高的版本可用了)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "系统中安装这些的软件包是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "安装了的软件包版本是最新的"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "可用的软件包(目前没有被安装)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "被删除而且不再可用的软件包"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "被删除的软件包 (其配置文件仍然存在于系统中)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的软件包以及那些从未被安装过的软件包"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "已安装"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "已清除"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - 递归地列出软件包"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - 检视软件包的状态"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - 软件包主列表"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (按所属大类)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (按是否可用和所属大类)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (按状态和所属大类)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (按优先级)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (按是否可用和优先级)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (按状态和优先级)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (按字母表顺序)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (按是否可用)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (按状态)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 标记:+/=/- 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 标记:+/=/- 详尽:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
@@ -1570,42 +1578,26 @@ msgstr ""
 "您可以摁“o”或者“O”来以不同的规则排序，这样您就能给不同类型的软件包作上\n"
 "标记了。"
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "软件包的相互关系问题牵连到了"
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "软件包的相互关系"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "下面软件包的介绍"
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "无相关介绍。"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "介绍"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "当前安装的控制信息"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "为下面软件包安装的控制信息"
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "下面软件包的可用控制信息的版本"
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<无>"
@@ -1704,3 +1696,17 @@ msgstr "安装版本"
 msgid "Avail.ver"
 msgstr "可用版本"
 
+#~ msgid "interrelationships affecting "
+#~ msgstr "软件包的相互关系问题牵连到了"
+
+#~ msgid "description of "
+#~ msgstr "下面软件包的介绍"
+
+#~ msgid "description"
+#~ msgstr "介绍"
+
+#~ msgid "currently installed control info"
+#~ msgstr "当前安装的控制信息"
+
+#~ msgid "available version of control info for "
+#~ msgstr "下面软件包的可用控制信息的版本"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 41728708..fa6dfb9c 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-03 11:56+0300\n"
+"POT-Creation-Date: 2007-03-20 23:56+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -139,7 +139,8 @@ msgstr ""
 "\n"
 
 #: dselect/baselist.cc:259
-msgid "keybindings"
+#, fuzzy
+msgid "Keybindings"
 msgstr "按鍵關聯設定"
 
 #: dselect/baselist.cc:307
@@ -294,14 +295,15 @@ msgstr "選擇目前高亮顯示的存取方式"
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所選的存取方式"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
 msgid "Keystrokes"
 msgstr "按鍵操作"
 
-#: dselect/helpmsgs.cc:8
+#: dselect/helpmsgs.cc:25
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  Down-arrow, j         Up-arrow, k             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -356,11 +358,11 @@ msgstr ""
 "ç´¢)\n"
 "   D     把所有套件的狀態改成到所要求的值   \\        重復上次的搜尋\n"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid "Introduction to package selections"
 msgstr "套件選擇界面簡介"
 
-#: dselect/helpmsgs.cc:33
+#: dselect/helpmsgs.cc:51
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -414,11 +416,11 @@ msgstr ""
 "\n"
 "現在您可以按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid "Introduction to read-only package list browser"
 msgstr "唯讀的套件列表瀏覽界面簡介"
 
-#: dselect/helpmsgs.cc:57
+#: dselect/helpmsgs.cc:76
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -453,11 +455,11 @@ msgstr ""
 "\n"
 "現在您可以通過按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用於解決衝突/相依問題的子列表的簡介"
 
-#: dselect/helpmsgs.cc:75
+#: dselect/helpmsgs.cc:95
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -517,11 +519,11 @@ msgstr ""
 "請按<enter>離開幫助界面，進入子列表。\n"
 "需要幫助時，按“?”鍵。\n"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid "Display, part 1: package listing and status chars"
 msgstr "顯示部位 1：套件列表及狀態簡寫"
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:121
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -577,11 +579,11 @@ msgstr ""
 "的版本號和當前可用的版本號（使用 shift-v 可以開啟或關閉其\n"
 "顯示)，以及簡要的介紹。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid "Display, part 2: list highlight; information display"
 msgstr "顯示部位 2：列表高亮顯示部分﹔相關訊息的顯示"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc:147
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -625,11 +627,11 @@ msgstr ""
 "  您可以用“i”鍵在這些顯示內容中來回切換，用“I”來關閉相關訊息\n"
 "  的顯示，或者擴大它在螢幕中所占的篇幅直到幾乎完全佔據螢幕。\n"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid "Introduction to method selection display"
 msgstr "安裝方式選擇界面的簡介"
 
-#: dselect/helpmsgs.cc:148
+#: dselect/helpmsgs.cc:171
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -666,14 +668,15 @@ msgstr ""
 "現在按“k”鍵就能見到按鍵操作的完整列表，也可以在幫助選單中按“k”鍵。\n"
 "按“?”就能呼出幫助選單。\n"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
 msgid "Keystrokes for method selection"
 msgstr "選擇安裝方式的按鍵操作"
 
-#: dselect/helpmsgs.cc:167
+#: dselect/helpmsgs.cc:191
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  j, Down-arrow         k, Up-arrow             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -975,7 +978,7 @@ msgstr "存取方式“%s”。"
 msgid "Abbrev."
 msgstr "縮寫"
 
-#: dselect/methlist.cc:122 dselect/pkgtop.cc:297
+#: dselect/methlist.cc:122 dselect/pkginfo.cc:107 dselect/pkgtop.cc:297
 msgid "Description"
 msgstr "簡介"
 
@@ -995,15 +998,16 @@ msgstr "重新阻塞 SIGWINCH 信號失敗"
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:242
+#: dselect/methlist.cc:177 dselect/pkgdepcon.cc:243
 msgid "[none]"
 msgstr "[無]"
 
 #: dselect/methlist.cc:191
-msgid "explanation of "
+#, fuzzy
+msgid "Explanation"
 msgstr "後面安裝方式的說明"
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:200
 msgid "No explanation available."
 msgstr "沒有發現相關說明。"
 
@@ -1334,194 +1338,198 @@ msgid "pre-depends on"
 msgstr "預相依於"
 
 #: dselect/pkgdisplay.cc:75
+msgid "breaks with"
+msgstr ""
+
+#: dselect/pkgdisplay.cc:76
 msgid "conflicts with"
 msgstr "與之衝突"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "replaces"
 msgstr "替換"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:79
 msgid "enhances"
 msgstr "有助於"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Rec"
 msgstr "薦"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "Opt"
 msgstr "選"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "Xtr"
 msgstr "餘"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:88
 msgid "Ctb"
 msgstr "獻"
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:89
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:89
+#: dselect/pkgdisplay.cc:90
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:97 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:98 dselect/pkgdisplay.cc:118
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Updated"
 msgstr "有更新"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:101
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:102
 msgid "Up-to-date"
 msgstr "已更新"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:120
 msgid "Removed"
 msgstr "已刪除"
 
-#: dselect/pkgdisplay.cc:104 dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:105 dselect/pkgdisplay.cc:114
 msgid "Brokenly installed packages"
 msgstr "有問題的已安裝套件"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Newly available packages"
 msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Updated packages (newer version is available)"
 msgstr "套件有更新版本(有更新的版本可用了)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Obsolete and local packages present on system"
 msgstr "系統中安裝這些的套件是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:109
 msgid "Up to date installed packages"
 msgstr "安裝了的套件版本是最新的"
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:110
 msgid "Available packages (not currently installed)"
 msgstr "可用的套件(目前沒有被安裝)"
 
-#: dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:111
 msgid "Removed and no longer available packages"
 msgstr "被刪除而且不再可用的套件"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:115
 msgid "Installed packages"
 msgstr "已經安裝的套件"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Removed packages (configuration still present)"
 msgstr "被刪除的套件 (其設定檔案仍然存在於系統中)"
 
-#: dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:117
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的套件以及那些從未被安裝過的套件"
 
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:119
 msgid "Installed"
 msgstr "已安裝"
 
-#: dselect/pkgdisplay.cc:120
+#: dselect/pkgdisplay.cc:121
 msgid "Purged"
 msgstr "已徹底移除"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - recursive package listing"
 msgstr "dselect - 遞迴地列出套件"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:202
 msgid "dselect - inspection of package states"
 msgstr "dselect - 檢視套件的狀態"
 
-#: dselect/pkgdisplay.cc:202
+#: dselect/pkgdisplay.cc:203
 msgid "dselect - main package listing"
 msgstr "dselect - 套件主列表"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (by section)"
 msgstr " (依類別區分)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (avail., section)"
 msgstr " (依是否可用和所屬類別)"
 
-#: dselect/pkgdisplay.cc:216
+#: dselect/pkgdisplay.cc:217
 msgid " (status, section)"
 msgstr " (依狀態和所屬類別)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (by priority)"
 msgstr " (依優先級)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (avail., priority)"
 msgstr " (依是否可用和優先級)"
 
-#: dselect/pkgdisplay.cc:231
+#: dselect/pkgdisplay.cc:232
 msgid " (status, priority)"
 msgstr " (依狀態和優先級)"
 
-#: dselect/pkgdisplay.cc:240 dselect/pkgdisplay.cc:252
+#: dselect/pkgdisplay.cc:241 dselect/pkgdisplay.cc:253
 msgid " (alphabetically)"
 msgstr " (依字母表順序)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by availability)"
 msgstr " (依是否可用)"
 
-#: dselect/pkgdisplay.cc:246
+#: dselect/pkgdisplay.cc:247
 msgid " (by status)"
 msgstr " (依狀態區分)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 標記:+/=/- 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:262
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 標記:+/=/- 詳盡:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " 詳盡:v 幫助:?"
 
@@ -1544,42 +1552,26 @@ msgstr ""
 "您可以按 `o' 或者 `O' 來以不同的規則排序，這樣您就能在不同類型的套件作\n"
 "標記了。"
 
-#: dselect/pkginfo.cc:96
-msgid "interrelationships affecting "
-msgstr "套件的相互關系問題牽連到了"
-
-#: dselect/pkginfo.cc:102
-msgid "interrelationships"
+#: dselect/pkginfo.cc:95
+#, fuzzy
+msgid "Interrelationships"
 msgstr "套件的相互關系"
 
-#: dselect/pkginfo.cc:108
-msgid "description of "
-msgstr "下面套件的介紹"
-
 #: dselect/pkginfo.cc:112
-msgid "no description available."
+#, fuzzy
+msgid "No description available."
 msgstr "無相關介紹。"
 
-#: dselect/pkginfo.cc:125
-msgid "description"
-msgstr "介紹"
-
-#: dselect/pkginfo.cc:132
-msgid "currently installed control info"
-msgstr "當前安裝的控制訊息"
-
-#: dselect/pkginfo.cc:134
-msgid "installed control info for "
+#: dselect/pkginfo.cc:130
+#, fuzzy
+msgid "Installed control file information"
 msgstr "為下面套件安裝的控制訊息"
 
-#: dselect/pkginfo.cc:148
-msgid "available version of control file info"
+#: dselect/pkginfo.cc:146
+#, fuzzy
+msgid "Available control file information"
 msgstr "可用的控制訊息的版本"
 
-#: dselect/pkginfo.cc:150
-msgid "available version of control info for "
-msgstr "下面套件的可用控制訊息的版本"
-
 #: dselect/pkglist.cc:123 dselect/pkglist.cc:124
 msgid "<null>"
 msgstr "<無>"
@@ -1677,3 +1669,18 @@ msgstr "安裝版本"
 #: dselect/pkgtop.cc:295
 msgid "Avail.ver"
 msgstr "可用版本"
+
+#~ msgid "interrelationships affecting "
+#~ msgstr "套件的相互關系問題牽連到了"
+
+#~ msgid "description of "
+#~ msgstr "下面套件的介紹"
+
+#~ msgid "description"
+#~ msgstr "介紹"
+
+#~ msgid "currently installed control info"
+#~ msgstr "當前安裝的控制訊息"
+
+#~ msgid "available version of control info for "
+#~ msgstr "下面套件的可用控制訊息的版本"
diff --git a/man/ChangeLog b/man/ChangeLog
index daa2a975..2b5d77a0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-21  Guillem Jover  <guillem@debian.org>
+
+	* po/dpkg-man.pot: Regenerated.
+	* po/*.po: Merged with dpkg-man.pot.
+
 2007-03-20  Robert Luberda <robert@debian.org>
 
 	* po/pl.po: Update to 974t18f286u
diff --git a/man/po/de.po b/man/po/de.po
index c2f1516f..9a8d6836 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-07-23 14:35+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -14,164 +14,178 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: TH
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "822-date"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
 msgstr "2006-02-28"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Debian-Projekt"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "dpkg-Hilfsprogramme"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+#, fuzzy
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - Datum und Uhrzeit im RFC822-Format ausgeben"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
+#, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> zeigt aktuelles Datum und Uhrzeit im in RFC822 beschriebenen "
 "Format, unter Verwendung eines numerischen Zeitzonen-Versatzes wie in "
 "RFC1123 empfohlen, an."
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> nimmt keine Argumente oder Optionen an."
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "Diese Anlage sollte wirklich ein Teil von B<date>(1) sein."
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"Abschnitt 5.2.14,"
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
-msgstr "B<date>(1)."
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> und diese Handbuchseite wurden von Ian Jackson geschrieben. Sie "
-"werden hiermit von ihm lizenzfrei zur Verfügung gestellt."
 
 # type: TH
 #: cleanup-info.8:1
@@ -179,22 +193,28 @@ msgstr ""
 msgid "cleanup-info"
 msgstr "cleanup-info"
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr "cleanup-info - räumt den Müll von schwindelhaften install-info auf"
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>Verzeichnisname<gt>>]"
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<update-alternatives> [I<Optionen>] B<--auto> I<Name>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -208,7 +228,7 @@ msgstr ""
 "Leerzeichen zu sein."
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
@@ -217,7 +237,7 @@ msgstr ""
 "Zusammenquetschen leerer Zeilen (nur im Bereich der Einträge)."
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
@@ -226,7 +246,7 @@ msgstr ""
 "zählt). Die Reihenfolge der Einträge innerhalb eines Bereichs wird erhalten."
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -239,66 +259,82 @@ msgstr ""
 "Sie sollten eine Sicherheitskopie anlegen, bevor sie dies Skript verwenden."
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr "Gebe den Hilfebildschirm aus und beende sich erfolgreich."
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--unsafe>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr "Stelle einige zusätzliche möglicherweise nützliche Optionen ein."
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 "B<Warnung: die »--unsafe«-Option kann eine ansonsten korrekte Datei "
 "verstümmeln!>"
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+#, fuzzy
+msgid "Show the usage message and exit."
+msgstr "Zeige den Bedienungshinweis und sterbe."
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
-msgstr "Gebe die Version aus und beende sich erfolgreich"
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+#, fuzzy
+msgid "Show the version and exit."
+msgstr "Gebe die Versionsnummer aus und beende sich."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "I</usr/info/dir> oder I<E<lt>Verzeichnisname<gt>/dir>"
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
@@ -307,23 +343,23 @@ msgstr ""
 "Suffix."
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr "Wahrscheinlich viele."
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -337,6 +373,13 @@ msgstr ""
 msgid "deb"
 msgstr "deb"
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "2006-02-28"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -1060,4658 +1103,4329 @@ msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 # type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "dpkg-statoverride"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "2007-03-07"
 msgstr "2006-04-09"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "dpkg-Programmsammlung"
-
-# type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - Paketverwalter für Debian"
-
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
 
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "WARNUNG"
+# type: TH
+#: deb-override.5:22
+#, fuzzy
+msgid "override"
+msgstr "dpkg-statoverride"
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
-"Dieses Handbuch ist für Benutzer gedacht, die die Kommandozeilenoptionen und "
-"Paketzustände von B<dpkg> detaillierter verstehen wollen, als durch B<dpkg --"
-"help> beschrieben ist."
+"Während der Großteil der Informationen über ein Paket in der Kontrolldatei "
+"gefunden werden kann, muss ein Teil von den Distributionszaren eingetragen "
+"werden, da sie sich nicht auf tatsächliche Abhängigkeiten und Beschreibungen "
+"des Pakets, sonder auf die Anordnung von Dateien für eine Veröffentlichung "
+"beziehen. Diese Informationen finden sich in der Override-Datei."
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
-"Es sollte I<nicht> von Paketbetreuern verwendet werden, die verstehen "
-"wollen, wie B<dpkg> ihr Paket installieren wird. Die Beschreibung von den "
-"Tätigkeiten von B<dpkg> beim Installieren und Entfernen von Paketen sind "
-"besonders in unzulänglich."
+"Die Override-Datei hat ein einfaches, durch Leerzeichen getrenntes Format. "
+"Kommentare sind erlaubt (angezeigt durch ein B<#>)."
 
 # type: Plain text
-#: dpkg.1:26
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
-msgstr ""
-"B<dpkg> ist ein Werkzeug, um Debian-Pakete zu installieren, zu bauen und zu "
-"verwalten. Die primäre und benutzerfreundlichere Oberfläche für B<dpkg> ist "
-"B<dselect>(1). B<dpkg> selbst wird komplett über Kommandozeilenoptionen "
-"kontrolliert, die aus genau einer Aktion und Null oder mehreren Optionen "
-"bestehen. Der Aktionsparameter teilt B<dpkg> mit, was zu tun ist, und die "
-"Optionen kontrollieren die Aktionen in irgendeiner Weise."
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgstr "I<Paket> I<Priorität> I<Bereich> [I<Betreuerinformation>]"
 
 # type: Plain text
-#: dpkg.1:31
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"B<dpkg> kann auch als Oberfläche für B<dpkg-deb>(1) verwendet werden. Die "
-"folgenden Aktionen gehören zu B<dpkg-deb>, und wenn sie angetroffen werden, "
-"startet B<dpkg> einfach B<dpkg-deb> mit den übergebenen Parametern:"
+"I<Paket> ist der Name des Pakets. Einträge in der Override-Datei für Pakete "
+"die nicht im Baum von Binärpaketen gefunden werden können, werden ignoriert."
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract> und\n"
-"    B<--fsys-tarfile>.\n"
+"I<Priorität> und I<Bereich> platzieren das Paket innerhalb des "
+"Veröffentlichungs-Baums; diese sollten nicht in der Kontrolldatei gefunden "
+"werden. Falls das Paket in einem Unterverzeichnis des I<Binärverz> gefunden "
+"wird, dann wird dies mit I<Bereich> überprüft."
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
-"Bitte lesen Sie B<dpkg-deb>(1) für weitere Informationen über diese Aktionen."
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "INFORMATIONEN ÜBER PAKETE"
+"I<Betreuerinformation> kann, falls vorhanden, entweder der Name des "
+"Betreuers für ein bedingungsloses Überschreiben, oder ansonsten "
+"I<AlterBetreuer> B<=E<gt>> I<NeuerBetreuer> um eine Ersetzung durchzuführen, "
+"sein."
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"B<dpkg> verwaltet einige nützliche Informationen über verfügbare Pakete. Die "
-"Informationen sind in drei Klassen unterteilt: B<Status>, <Auswahlstatus> "
-"und B<Schalter>. Diese Werte sind Hauptsächlich zur Änderung durch "
-"B<dselect> gedacht."
+"Die Override-Datei, die für die Erstellung der offiziellen Paketliste "
+"verwendet wird, kann im I<indices>-Verzeichnis auf jedem Debian-Spiegel "
+"gefunden werden."
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "PAKETZUSTÄNDE"
+# type: Plain text
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
-msgstr "B<installiert>"
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-02-28"
 
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
-msgstr "Das Paket ist entpackt und konfigurierte korrekt."
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<halb-installiert>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"Die Installation des Paketes wurde begonnen, aber aus irgendeinem Grund "
-"nicht abgeschlossen."
 
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<nicht-installiert>"
+# type: Plain text
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
+"E<lt>BibliotheksnameE<gt> E<lt>Version/SONameE<gt> E<lt>AbhängigkeitenE<gt>"
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "Das Paket ist nicht auf Ihrem System installiert."
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-shlibdeps> I<Optionen>"
 
 # type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<entpackt>"
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "Das Paket ist entpackt, aber nicht konfiguriert."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
+msgstr ""
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<halb-konfiguriert>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:66
+#: deb-substvars.5:20
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
 msgstr ""
-"Das Paket ist entpackt und die Konfiguration wurde begonnen, aber aus "
-"irgendeinem Grund nicht abgeschlossen."
 
-# type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
-msgstr "B<Config-Dateien>"
+# type: Plain text
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "Nur die Konfigurationsdateien des Pakets existieren auf dem System."
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
 
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "PAKETAUSWAHL-STATUS"
+# type: Plain text
+#: deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
 
 # type: TP
-#: dpkg.1:70
+#: deb-substvars.5:49
 #, no-wrap
-msgid "B<install>"
-msgstr "B<installiere>"
+msgid "B<Arch>"
+msgstr "B<Arch>"
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "Das Paket ist zur Installation ausgewählt."
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
+msgstr ""
 
 # type: TP
-#: dpkg.1:73
+#: deb-substvars.5:53
 #, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstalliere>"
+msgid "B<source:Version>"
+msgstr "B<source:Version>"
 
 # type: Plain text
-#: dpkg.1:77
-msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+#: deb-substvars.5:56
+msgid "The source package version."
 msgstr ""
-"Das Paket ist zur Deinstallation ausgewählt (d.h. wir wollen alle Dateien "
-"außer den Konfigurationsdateien entfernen)."
 
 # type: TP
-#: dpkg.1:77
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<purge>"
-msgstr "B<säubern>"
+msgid "B<source:Upstream-Version>"
+msgstr "B<source:Upstream-Version>"
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:60
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"Das Paket ist zum Säubern ausgewählt (d.h. wir wollen alle Dateien inklusive "
-"der Konfigurationsdateien entfernen)."
-
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "PAKET-SCHALTER"
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:60
 #, no-wrap
-msgid "B<hold>"
-msgstr "B<halten>"
+msgid "B<binary:Version>"
+msgstr "B<binary:Version>"
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:64
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"Ein Paket das mit B<halten> markiert ist, wird von B<dpkg> nicht behandelt, "
-"es sei denn Sie erzwingen dies mit der Option B<--force-hold>."
 
 # type: TP
-#: dpkg.1:86
+#: deb-substvars.5:64
 #, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<Neuinst. notw>"
+msgid "B<Source-Version>"
+msgstr "B<Source-Version>"
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:69
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"Ein mit B<Neuinst. notw> markiertes Paket ist defekt und muss erneut "
-"installiert werden. Diese Pakete können nicht entfernt werden, es sei denn, "
-"Sie erzwingen dies mit der Option B<--force-remove-reinstreq>."
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, no-wrap
-msgid "ACTIONS"
-msgstr "AKTIONEN"
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:69
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<Paketdatei>..."
+msgid "B<Installed-Size>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:78
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"Installiere das Paket. Falls die B<--recursive> oder B<-R>-Option angegeben "
-"ist, muss sich I<Paketdatei> stattdessen auf ein Verzeichnis beziehen."
-
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "Die Installation besteht aus folgenden Schritten:"
 
-# type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Extrahiere die Kontrolldateien aus dem neuen Paket."
+# type: TP
+#: deb-substvars.5:78
+#, no-wrap
+msgid "B<Extra-Size>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:87
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"B<2.> Falls eine andere Version des gleichen Pakets vor der der neuen "
-"Installation installiert war, dann führe das I<prerm>-Skript des alten "
-"Paketes aus."
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
+# type: TP
+#: deb-substvars.5:87
+#, no-wrap
+msgid "B<F:>I<fieldname>"
 msgstr ""
-"B<3.> Führe das I<preinst>-Skript aus, falls dies vom Paket bereitgestellt "
-"wird."
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:94
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
-"B<4.> Entpacke die neuen Dateien und sichere gleichzeitig die alten Dateien, "
-"so dass diese, falls etwas schief geht, wiederhergestellt werden können."
+
+# type: TP
+#: deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
+msgstr "B<Format>"
 
 # type: Plain text
-#: dpkg.1:120
+#: deb-substvars.5:104
 msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:104
+#, no-wrap
+msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr ""
-"B<5.> Falls eine andere Version des gleichen Pakets vor der der neuen "
-"Installation installiert war, dann führe das I<postrm>-Skript des alten "
-"Paketes aus. Beachten Sie, dass dieses Skript nach dem I<preinst>-Skript des "
-"neuen Pakets ausgeführt wird, da neue Dateien zeitgleich zu der Entfernung "
-"alter Dateien geschrieben werden."
 
 # type: Plain text
-#: dpkg.1:124
-msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"B<6.> Konfiguriere das Paket. Lesen Sie B<--configure> für detaillierte "
-"Informationen wie dies geschieht."
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:107
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<Paketdatei> ..."
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
+#: deb-substvars.5:111
 msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"Entpacke das Paket, aber konfiguriere es nicht. Falls die B<--recursive> "
-"oder B<-R>-Option angegeben ist, muss sich I<Paketdatei> stattdessen auf ein "
-"Verzeichnis beziehen."
 
 # type: TP
-#: dpkg.1:129
+#: deb-substvars.5:111
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<Paket> ... | B<-a> | B<--pending>"
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg:Upstream-Version>"
 
 # type: Plain text
-#: dpkg.1:134
-msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
 msgstr ""
-"Rekonfiguriere ein entpacktes Paket. Falls B<-a> oder B<--pending> anstelle "
-"von I<Paket> angegeben ist, werden alle entpackten aber nicht konfigurierten "
-"Pakete konfiguriert."
 
-# type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
-msgstr "Die Konfiguration besteht aus folgenden Schritten:"
+# type: TP
+#: deb-substvars.5:114
+#, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg:Version>"
 
 # type: Plain text
-#: dpkg.1:141
-msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
 msgstr ""
-"B<1.> entpacke die Konfigurationsdateien und sichere gleichzeitig die alten "
-"Konfigurationsdateien, so dass diese, falls etwas schief geht, "
-"wiederhergestellt werden können."
 
 # type: Plain text
-#: dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
+#: deb-substvars.5:120
+msgid ""
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
-"B<2.> Führe das I<postinst>-Skript aus, falls dies vom Paket bereitgestellt "
-"wird."
 
 # type: TP
-#: dpkg.1:144
+#: deb-substvars.5:122
 #, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<Paket> ... | B<-a> | B<--pending>"
+msgid "B<debian/substvars>"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:155
-msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+#: deb-substvars.5:125
+msgid "List of substitution variables and values."
 msgstr ""
-"Entferne ein installiertes Paket. B<-r> oder B<--remove> entfernen alles "
-"außer Konfigurationsdateien. Dies könnte die Rekonfiguration vermeiden, "
-"falls das Paket später wieder reinstalliert wird. (Konfigurationsdateien "
-"sind die Dateien, die in der I<debian/conffiles>-Kontrolldatei aufgeführt "
-"sind). B<-P> oder B<--purge> entfernt alles, auch Konfigurationsdateien. "
-"Falls B<-a> oder B<--pending> anstatt eines Paketnamens angegeben werden, "
-"dann werden alle Pakete, die entpackt aber zur Entfernung oder Säuberung in "
-"der Datei I</var/lib/dpkg/status> markiert sind, entfernt oder respektive "
-"gesäubert."
 
 # type: Plain text
-#: dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
-msgstr "Entfernung eines Paketes besteht aus den folgenden Schritte:"
-
-# type: Plain text
-#: dpkg.1:160
-msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> Führe das I<prerm>-Skript aus"
+#: deb-substvars.5:129 dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:163
-msgid "B<2.> Remove the installed files"
-msgstr "B<2.> Entferne die installierten Dateien"
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
 
 # type: Plain text
-#: dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> Führe das I<postrm>-Skript aus"
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr ""
+"Diese Hilfsprogramme und diese Handbuchseite wurden von Ian Jackson "
+"geschrieben."
 
-# type: TP
-#: dpkg.1:167
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
 #, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-Datei>"
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
 
 # type: Plain text
-#: dpkg.1:176
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
-msgstr ""
-"Aktualisiere B<dpkg>s und B<dselect>s Verständnis darüber, welche Pakete "
-"verfügbar sind. Mit der Aktion B<--merge-avail> wird alte Information mit "
-"der Information aus der I<Packages-Datei> zusammengeführt. Mit der Aktion "
-"B<--update-avail> wird die alte Information durch die Information aus der "
-"I<Packages-Datei> ersetzt. Die mit Debian vertriebene I<Packages-Datei> "
-"heißt einfach I<Packages>. B<dpkg> hält seine Aufzeichnungen über die "
-"verfügbaren Pakete in I</var/lib/dpkg/available>."
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: dpkg.1:179
-msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
-msgstr ""
-"Ein einfacheres Kommando um die I<available>-Datei in einem Aufruf abzurufen "
-"und zu aktualisieren ist B<dselect update>."
-
-# type: TP
-#: dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<Paketdatei> ..."
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: Plain text
-#: dpkg.1:185
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
 msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Aktualisiere mit den Informationen aus dem Paket I<Paketdatei> B<dpkg>s und "
-"B<dselect>s Verständnis darüber, welche Pakete verfügbar sind. Falls die B<--"
-"recursive> oder B<-R>-Option angegeben ist, muss sich I<Paketdatei> "
-"stattdessen auf ein Verzeichnis beziehen."
+"Dies ist Freie Software; lesen Sie die GNU General Public License Version 2 "
+"oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung."
 
-# type: TP
-#: dpkg.1:185
+# type: TH
+#: dpkg.1:1
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
-msgstr "B<dpkg --forget-old-unavail>"
+msgid "dpkg"
+msgstr "dpkg"
 
-# type: Plain text
-#: dpkg.1:188
-msgid "Forget about uninstalled unavailable packages."
-msgstr ""
-"Vergiss Informationen über nicht-installierte, nicht-verfügbare Pakete."
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
+msgstr "2006-04-09"
 
-# type: TP
-#: dpkg.1:188
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr "B<dpkg --clear-avail>"
+msgid "dpkg suite"
+msgstr "dpkg-Programmsammlung"
 
 # type: Plain text
-#: dpkg.1:191
-msgid "Erase the existing information about what packages are available."
-msgstr ""
-"Lösche die existierenden Informationen darüber, welche Pakete verfügbar sind."
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - Paketverwalter für Debian"
 
-# type: TP
-#: dpkg.1:191
+# type: Plain text
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
+
+# type: SH
+#: dpkg.1:9
 #, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+msgid "WARNING"
+msgstr "WARNUNG"
 
 # type: Plain text
-#: dpkg.1:196
+#: dpkg.1:13
 msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
-"Suche nach Pakete, die in Ihrem System nur teilweise installiert wurden. "
-"B<dpkg> wird Vorschläge machen, was mit ihnen geschehen soll, um sie in "
-"Funktion zu bringen."
-
-# type: TP
-#: dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<Paket-Name-Muster>...]"
+"Dieses Handbuch ist für Benutzer gedacht, die die Kommandozeilenoptionen und "
+"Paketzustände von B<dpkg> detaillierter verstehen wollen, als durch B<dpkg --"
+"help> beschrieben ist."
 
 # type: Plain text
-#: dpkg.1:200
+#: dpkg.1:18
 msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
-"Hole eine Liste von Paketauswahlen und schreibe sie auf die Standardausgabe. "
-"Ohne Muster werden Pakete im Zustand »Säubern« nicht angezeigt."
+"Es sollte I<nicht> von Paketbetreuern verwendet werden, die verstehen "
+"wollen, wie B<dpkg> ihr Paket installieren wird. Die Beschreibung von den "
+"Tätigkeiten von B<dpkg> beim Installieren und Entfernen von Paketen sind "
+"besonders in unzulänglich."
 
-# type: TP
-#: dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr "B<dpkg --set-selections>"
+# type: Plain text
+#: dpkg.1:26
+msgid ""
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
+msgstr ""
+"B<dpkg> ist ein Werkzeug, um Debian-Pakete zu installieren, zu bauen und zu "
+"verwalten. Die primäre und benutzerfreundlichere Oberfläche für B<dpkg> ist "
+"B<dselect>(1). B<dpkg> selbst wird komplett über Kommandozeilenoptionen "
+"kontrolliert, die aus genau einer Aktion und Null oder mehreren Optionen "
+"bestehen. Der Aktionsparameter teilt B<dpkg> mit, was zu tun ist, und die "
+"Optionen kontrollieren die Aktionen in irgendeiner Weise."
 
 # type: Plain text
-#: dpkg.1:206
+#: dpkg.1:31
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
-"Setze die Paketauswahl durch Einlesen einer Datei von der Standardeingabe. "
-"Diese Datei sollte im Format »E<lt>PaketE<gt> E<lt>ZustandE<gt>« sein, wobei "
-"Zustand einer aus »install«, »hold«, »deinstall« oder »purge« ist. "
-"Leerzeilen und Kommentarzeilen (beginnend mit »#«) sind auch erlaubt."
+"B<dpkg> kann auch als Oberfläche für B<dpkg-deb>(1) verwendet werden. Die "
+"folgenden Aktionen gehören zu B<dpkg-deb>, und wenn sie angetroffen werden, "
+"startet B<dpkg> einfach B<dpkg-deb> mit den übergebenen Parametern:"
 
-# type: TP
-#: dpkg.1:206
+# type: Plain text
+#: dpkg.1:40
 #, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr "B<dpkg --clear-selections>"
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
+msgstr ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract> und\n"
+"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:211
-msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
 msgstr ""
-"Setze den erbetenen Zustand von jedem nicht-essenziellen Paket auf "
-"»Deinstallation«. Dies ist dazu gedacht, direkt vor --set-selections "
-"verwendet zu werden, um jedes Paket, dass nicht in der Liste von --set-"
-"selections vorkommt, zu deinstallieren."
+"Bitte lesen Sie B<dpkg-deb>(1) für weitere Informationen über diese Aktionen."
 
-# type: TP
-#: dpkg.1:211
+# type: SH
+#: dpkg.1:43
 #, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr "B<dpkg --yet-to-unpack>"
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "INFORMATIONEN ÜBER PAKETE"
 
 # type: Plain text
-#: dpkg.1:215
+#: dpkg.1:48
 msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"Sucht nach Paketen dir zur Installation ausgewählt wurden, die aber aus "
-"irgendeinem Grund noch nicht installiert wurden."
+"B<dpkg> verwaltet einige nützliche Informationen über verfügbare Pakete. Die "
+"Informationen sind in drei Klassen unterteilt: B<Status>, <Auswahlstatus> "
+"und B<Schalter>. Diese Werte sind Hauptsächlich zur Änderung durch "
+"B<dselect> gedacht."
+
+# type: SS
+#: dpkg.1:48
+#, no-wrap
+msgid "PACKAGE STATES"
+msgstr "PAKETZUSTÄNDE"
 
 # type: TP
-#: dpkg.1:216
+#: dpkg.1:49
 #, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<installed>"
+msgstr "B<installiert>"
 
 # type: Plain text
-#: dpkg.1:219
-msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
-msgstr ""
-"Gebe die Architektur der Pakete aus, die B<dpkg> installiert (beispielsweise "
-"»i386«)."
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
+msgstr "Das Paket ist entpackt und konfigurierte korrekt."
 
 # type: TP
-#: dpkg.1:219
+#: dpkg.1:52
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
-msgstr "B<dpkg --compare-versions >I<Ver1 Op Ver2>"
+msgid "B<half-installed>"
+msgstr "B<halb-installiert>"
 
 # type: Plain text
-#: dpkg.1:230
+#: dpkg.1:56
 msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"The installation of the package has been started, but not completed for some "
+"reason."
 msgstr ""
-"Vergleiche Versionsnummern, wobei I<op> ein binärer Operator ist. B<dpkg> "
-"liefert Erfolg (Nullergebnis) falls die angegebene Bedingung erfüllt ist und "
-"einen Fehler (Nicht-Null-Ergebnis) andernfalls. Es gibt zwei Gruppen von "
-"Operatoren, die sich in der Behandlung von leeren I<ver1> oder I<ver2> "
-"unterscheiden. Die folgenden behandeln leere Versionen als jünger als jede "
-"andere Version: B<lt le eq ne ge gt>. Die folgenden behandeln eine leere "
-"Version als älter als jede Version: B<lt-nl le-nl ge-nl gt-nl>. Die "
-"folgenden sind nur aus Kompatibilität mit der Kontrolldateisyntax "
-"bereitgestellt: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"Die Installation des Paketes wurde begonnen, aber aus irgendeinem Grund "
+"nicht abgeschlossen."
 
 # type: TP
-#: dpkg.1:230
+#: dpkg.1:56
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "B<not-installed>"
+msgstr "B<nicht-installiert>"
 
 # type: Plain text
-#: dpkg.1:235
-msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
-msgstr ""
-"Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptoren "
-"B<E<lt>nE<gt>>. Hinweis: Zusätzliche auf der Kommandozeile und durch diesen "
-"Datei-Deskriptor gesetzte Optionen werden nicht für nachfolgende Befehle, "
-"die im gleichen Lauf ausgeführt werden, zurückgesetzt."
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "Das Paket ist nicht auf Ihrem System installiert."
 
 # type: TP
-#: dpkg.1:235
+#: dpkg.1:59
 #, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
+msgid "B<unpacked>"
+msgstr "B<entpackt>"
 
 # type: Plain text
-#: dpkg.1:238
-msgid "Display a brief help message."
-msgstr "Zeige eine kurze Hilfenachricht an."
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "Das Paket ist entpackt, aber nicht konfiguriert."
 
 # type: TP
-#: dpkg.1:238
+#: dpkg.1:62
 #, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr "B<dpkg --force-help>"
+msgid "B<half-configured>"
+msgstr "B<halb-konfiguriert>"
 
 # type: Plain text
-#: dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
-msgstr "Gebe Hilfe über die B<--force->I<Sache>-Optionen."
+#: dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
+msgstr ""
+"Das Paket ist entpackt und die Konfiguration wurde begonnen, aber aus "
+"irgendeinem Grund nicht abgeschlossen."
 
 # type: TP
-#: dpkg.1:241
+#: dpkg.1:66
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<config-files>"
+msgstr "B<Config-Dateien>"
 
 # type: Plain text
-#: dpkg.1:244
-msgid "Give help about debugging options."
-msgstr "Gib Hilfe über Debugging-Optionen."
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "Nur die Konfigurationsdateien des Pakets existieren auf dem System."
+
+# type: SS
+#: dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "PAKETAUSWAHL-STATUS"
 
 # type: TP
-#: dpkg.1:244
+#: dpkg.1:70
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<install>"
+msgstr "B<installiere>"
 
 # type: Plain text
-#: dpkg.1:247
-msgid "Display B<dpkg> licence."
-msgstr "Zeige die B<dpkg>-Lizenz an."
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "Das Paket ist zur Installation ausgewählt."
 
 # type: TP
-#: dpkg.1:247
+#: dpkg.1:73
 #, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
+msgid "B<deinstall>"
+msgstr "B<deinstalliere>"
 
 # type: Plain text
-#: dpkg.1:250
-msgid "Display B<dpkg> version information."
-msgstr "Zeige B<dpkg> Versionsinformationen an."
+#: dpkg.1:77
+msgid ""
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
+msgstr ""
+"Das Paket ist zur Deinstallation ausgewählt (d.h. wir wollen alle Dateien "
+"außer den Konfigurationsdateien entfernen)."
 
 # type: TP
-#: dpkg.1:250
+#: dpkg.1:77
 #, no-wrap
-msgid "B<dpkg-deb actions>"
-msgstr "B<dpkg-deb-Aktionen>"
+msgid "B<purge>"
+msgstr "B<säubern>"
 
 # type: Plain text
-#: dpkg.1:253
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
+#: dpkg.1:81
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
-"Lesen Sie B<dpkg-deb>(1) für weitere Informationen über die folgenden "
-"Aktionen."
+"Das Paket ist zum Säubern ausgewählt (d.h. wir wollen alle Dateien inklusive "
+"der Konfigurationsdateien entfernen)."
 
-# type: Plain text
-#: dpkg.1:273
+# type: SS
+#: dpkg.1:81
 #, no-wrap
-msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
-msgstr ""
-"B<dpkg -b> | B<--build> I<Verzeichnis> [I<Dateiname>]\n"
-"    Baue ein deb-Paket.\n"
-"B<dpkg -c> | B<--contents> I<Dateiname>\n"
-"    Liste den Inhalt eines deb-Paketes auf.\n"
-"B<dpkg -e> | B<--control> I<Dateiname> [I<Verzeichnis>]\n"
-"    Extrahiere Kontrollinformationen von einem Paket.\n"
-"B<dpkg -x> | B<--extract> I<Dateiname Verzeichnis>\n"
-"    Extrahiere die vom Paket enthaltenen Dateien.\n"
-"B<dpkg -f> | B<--field>  I<Dateiname> [I<Kontrollfeld>] ...\n"
-"    Zeige das/die Kontrollfeld(er) eines Paketes an.\n"
-"B<dpkg --fsys-tarfile> I<Dateiname>\n"
-"    Zeige die von einem Debian-Paket enthaltene Dateisystem-Tardatei an.\n"
-"B<dpkg -I> | B<--info> I<Dateiname> [I<Kontrolldatei>]\n"
-"    Zeige Informationen über ein Paket.\n"
-"B<dpkg -X> | B<--vextract> I<Dateiname> I<Verzeichnis>\n"
-"    Extrahiere und zeige die von einem Paket enthaltenen Dateinamen.\n"
+msgid "PACKAGE FLAGS"
+msgstr "PAKET-SCHALTER"
 
 # type: TP
-#: dpkg.1:275
+#: dpkg.1:82
 #, no-wrap
-msgid "B<dpkg-query actions>"
-msgstr "B<dpkg-query-Aktionen>"
+msgid "B<hold>"
+msgstr "B<halten>"
 
 # type: Plain text
-#: dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
+#: dpkg.1:86
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
-"Lesen Sie B<dpkg-query>(1) für weitere Informationen über die folgenden "
-"Aktionen."
+"Ein Paket das mit B<halten> markiert ist, wird von B<dpkg> nicht behandelt, "
+"es sei denn Sie erzwingen dies mit der Option B<--force-hold>."
 
-# type: Plain text
-#: dpkg.1:291
+# type: TP
+#: dpkg.1:86
 #, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
-msgstr ""
-"B<dpkg -l> | B<--list> I<Paketnamen-Muster> ...\n"
-"    Liste auf das übergebene Suchmuster passende Pakete auf.\n"
-"B<dpkg -s> | B<--status> I<Paketname> ...\n"
-"    Berichte den Status der spezifizierten Pakete.\n"
-"B<dpkg -L> | B<--listfiles> I<Paket> ...\n"
-"    Liste die aus B<Paket> auf Ihrem System installierten Pakete auf.\n"
-"B<dpkg -S> | B<--search> I<Dateinamen-Suchmuster> ...\n"
-"    Suche nach einem Dateinamen in installierten Paketen.\n"
-"B<dpkg -p> | B<--print-avail> I<Paket>\n"
-"    Zeige Details über I<Paket>, wie in I</var/lib/dpkg/available> gefunden.\n"
+msgid "B<reinst-required>"
+msgstr "B<Neuinst. notw>"
 
 # type: Plain text
-#: dpkg.1:298
+#: dpkg.1:91
 msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
-"Alle Optionen können auf der Kommandozeile oder in der B<dpkg>-"
-"Konfigurationsdatei I</etc/dpkg/dpkg.cfg> angegeben werden. Jede Zeile in "
-"der Konfigurationsdatei ist entweder eine Option (exakt die gleiche wie die "
-"Befehlszeilenoption nur ohne führende Gedankenstriche) oder ein Kommentar "
-"(falls es mit B<#> beginnt)."
+"Ein mit B<Neuinst. notw> markiertes Paket ist defekt und muss erneut "
+"installiert werden. Diese Pakete können nicht entfernt werden, es sei denn, "
+"Sie erzwingen dies mit der Option B<--force-remove-reinstreq>."
 
-# type: TP
-#: dpkg.1:299
+# type: SH
+#: dpkg.1:92
 #, no-wrap
-msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<Zahl>"
-
-# type: Plain text
-#: dpkg.1:302
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
-msgstr ""
-"Ändere nach wie vielen Fehlern B<dpkg> abbrechen wird. Der Standardwert ist "
-"50."
+msgid "ACTIONS"
+msgstr "AKTIONEN"
 
 # type: TP
-#: dpkg.1:302
+#: dpkg.1:93
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr "B<-B>|B<--auto-deconfigure>"
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<Paketdatei>..."
 
 # type: Plain text
-#: dpkg.1:308
+#: dpkg.1:97
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
-"Wenn ein Paket entfernt wird besteht die Möglichkeit, dass ein andere "
-"installierte Paket von dem entfernten Paket abhängt. Die Angabe dieser "
-"Option führt zur automatischen Dekonfiguration des Paketes, das von dem "
-"entfernten Paket abhängt."
-
-# type: TP
-#: dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
-msgstr "B<-D>I<Oktal>B< | --debug=>I<Oktal>"
+"Installiere das Paket. Falls die B<--recursive> oder B<-R>-Option angegeben "
+"ist, muss sich I<Paketdatei> stattdessen auf ein Verzeichnis beziehen."
 
 # type: Plain text
-#: dpkg.1:314
-msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
-msgstr ""
-"Schalte Debugging ein. I<Oktal> wird durch bitweise Oder-Verknüpfung der "
-"gewünschten Werte von der nachfolgenden Liste gebildet (beachten Sie, dass "
-"sich diese Werte in zukünftigen Veröffentlichungen verändern können). B<-Dh> "
-"oder B<--debug=help> zeigen diese Debugging-Werte an."
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "Die Installation besteht aus folgenden Schritten:"
 
 # type: Plain text
-#: dpkg.1:326
-#, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
-msgstr ""
-" Nummer  Beschreibung\n"
-"    1   Allgemein-hilfreiche Fortschrittsinformationen\n"
-"    2   Aufruf und Status der Betreuerskripte\n"
-"   10   Ausgabe für jede verarbeitete Datei\n"
-"  100   Umfangreiche Ausgabe für jede verarbeitete Datei\n"
-"   20   Ausgabe für jede Konfigurationsdatei\n"
-"  200   Umfangreiche Ausgabe für jede Konfigurationsdatei\n"
-"   40   Abhängigkeiten und Konflikte\n"
-"  400   Umfangreiche Abhängigkeiten/Konflikte-Ausgabe\n"
-" 1000   Umfangreiches Gelaber beispielsweise über das dpkg/info Verzeichnis\n"
-" 2000   Verrückte Mengen an Gelaber\n"
-
-# type: TP
-#: dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-msgstr "B<--force->I<Sachen> | B<--no-force->I<Sachen> | B<--refuse->I<Sachen>"
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Extrahiere die Kontrolldateien aus dem neuen Paket."
 
 # type: Plain text
-#: dpkg.1:333
+#: dpkg.1:106
 msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
-"Erzwinge oder verweigere (B<no-force> und B<refuse> bedeuten das gleiche) "
-"bestimmte Sachen. I<Sachen> ist eine Komma-separierte Liste von Dingen, die "
-"im folgenden beschrieben sind. B<--force-help> zeigt eine Nachricht an, die "
-"diese beschreibt. Mit (*) markierte Dinge werden standardmäßig erzwungen."
+"B<2.> Falls eine andere Version des gleichen Pakets vor der der neuen "
+"Installation installiert war, dann führe das I<prerm>-Skript des alten "
+"Paketes aus."
 
 # type: Plain text
-#: dpkg.1:337
-msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
-"I<Warnung. Diese Optionen sind hauptsächlich für den Einsatz durch Experten "
-"gedacht. Der Einsatz ohne komplettes Verständnis der Effekte kann Ihr "
-"gesamtes System zerstören.>"
-
-# type: Plain text
-#: dpkg.1:340
-msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: Schaltet alle »force«-Optionen ein (oder aus)."
+"B<3.> Führe das I<preinst>-Skript aus, falls dies vom Paket bereitgestellt "
+"wird."
 
 # type: Plain text
-#: dpkg.1:343
+#: dpkg.1:113
 msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
-"B<downgrade>(*): Installiere ein Paket, selbst wenn eine neuere Version "
-"davon bereits installiert ist."
+"B<4.> Entpacke die neuen Dateien und sichere gleichzeitig die alten Dateien, "
+"so dass diese, falls etwas schief geht, wiederhergestellt werden können."
 
 # type: Plain text
-#: dpkg.1:350
+#: dpkg.1:120
 msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
-"I<Warnung: Derzeit führt Dpkg keine Abhängigkeitsüberprüfung bei der "
-"Installation älterer Versionen (als bereits installiert) durch (sog. "
-"Downgrade) und wird Sie daher nicht warnen, falls dadurch die Abhängigkeit "
-"eines anderen Pakets nicht mehr erfüllt ist. Dies kann ernsthafte "
-"Seiteneffekte haben, ein Downgrade einer essenziellen Systemkomponente kann "
-"ihr gesamtes System unbrauchbar machen. Verwenden Sie diese Option mit "
-"Vorsicht.>"
+"B<5.> Falls eine andere Version des gleichen Pakets vor der der neuen "
+"Installation installiert war, dann führe das I<postrm>-Skript des alten "
+"Paketes aus. Beachten Sie, dass dieses Skript nach dem I<preinst>-Skript des "
+"neuen Pakets ausgeführt wird, da neue Dateien zeitgleich zu der Entfernung "
+"alter Dateien geschrieben werden."
 
 # type: Plain text
-#: dpkg.1:354
+#: dpkg.1:124
 msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
-"B<configure-any>: Konfiguriere auch jedes entpackte, aber unkonfigurierte "
-"Paket von dem das aktuelle Paket abhängt."
+"B<6.> Konfiguriere das Paket. Lesen Sie B<--configure> für detaillierte "
+"Informationen wie dies geschieht."
 
-# type: Plain text
-#: dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
-msgstr "B<hold>: Verarbeite auch Pakete, die mit »halten« markiert sind."
+# type: TP
+#: dpkg.1:124
+#, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<Paketdatei> ..."
 
 # type: Plain text
-#: dpkg.1:362
+#: dpkg.1:129
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<remove-reinstreq>: Entferne ein Paket, selbst falls es defekt ist und zur "
-"Neuinstallation markiert ist. Dies kann beispielsweise dazu führen, dass "
-"Teile des Pakets auf dem System bleiben und von B<dpkg> vergessen werden."
+"Entpacke das Paket, aber konfiguriere es nicht. Falls die B<--recursive> "
+"oder B<-R>-Option angegeben ist, muss sich I<Paketdatei> stattdessen auf ein "
+"Verzeichnis beziehen."
+
+# type: TP
+#: dpkg.1:129
+#, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<Paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:134
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
-"B<remove-essential>: Entferne, selbst falls das Paket als essenziell "
-"betrachtet wird. Essenzielle Pakete enthalten hauptsächlich sehr "
-"grundlegende Unix-Befehle. Diese zu entfernen kann dazu führen, dass das "
-"gesamte System nicht mehr arbeitet - verwenden Sie dies Option daher mit "
-"Vorsicht."
+"Rekonfiguriere ein entpacktes Paket. Falls B<-a> oder B<--pending> anstelle "
+"von I<Paket> angegeben ist, werden alle entpackten aber nicht konfigurierten "
+"Pakete konfiguriert."
 
 # type: Plain text
-#: dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen."
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
+msgstr "Die Konfiguration besteht aus folgenden Schritten:"
 
 # type: Plain text
-#: dpkg.1:373
+#: dpkg.1:141
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
-"B<depends-version>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten."
+"B<1.> entpacke die Konfigurationsdateien und sichere gleichzeitig die alten "
+"Konfigurationsdateien, so dass diese, falls etwas schief geht, "
+"wiederhergestellt werden können."
 
 # type: Plain text
-#: dpkg.1:377
-msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+#: dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
-"B<conflicts>: Installiere, selbst wenn es mit einem anderen Paket in "
-"Konflikt steht. Dies ist gefährlich, da dies gewöhnlich dazu führt, dass "
-"einige Dateien überschrieben werden."
+"B<2.> Führe das I<postinst>-Skript aus, falls dies vom Paket bereitgestellt "
+"wird."
+
+# type: TP
+#: dpkg.1:144
+#, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<Paket> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:382
+#: dpkg.1:155
 msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
-"B<confmiss>: Installiere immer fehlende Konfigurationsdateien. Dies ist "
-"gefährlich, da es bedeutet, dass eine Änderung (die Entfernung) an der Datei "
-"nicht erhalten wird."
+"Entferne ein installiertes Paket. B<-r> oder B<--remove> entfernen alles "
+"außer Konfigurationsdateien. Dies könnte die Rekonfiguration vermeiden, "
+"falls das Paket später wieder reinstalliert wird. (Konfigurationsdateien "
+"sind die Dateien, die in der I<debian/conffiles>-Kontrolldatei aufgeführt "
+"sind). B<-P> oder B<--purge> entfernt alles, auch Konfigurationsdateien. "
+"Falls B<-a> oder B<--pending> anstatt eines Paketnamens angegeben werden, "
+"dann werden alle Pakete, die entpackt aber zur Entfernung oder Säuberung in "
+"der Datei I</var/lib/dpkg/status> markiert sind, entfernt oder respektive "
+"gesäubert."
 
 # type: Plain text
-#: dpkg.1:387
-msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
-msgstr ""
-"B<confnew>: Falls eine Conffile modifiziert wurde, installiere immer die "
-"neue Version ohne Rückfrage, es sei denn, B<--force-confdef> ist ebenfalls "
-"angegeben, in welchem Falle die Standardaktion bevorzugt wird."
+#: dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
+msgstr "Entfernung eines Paketes besteht aus den folgenden Schritte:"
 
 # type: Plain text
-#: dpkg.1:392
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
-msgstr ""
-"B<confold>: Falls eine Conffile modifiziert wurde, behalte immer die alte "
-"Version ohne Rückfrage, es sei denn, B<--force-confdef> ist ebenfalls "
-"angegeben, in welchem Falle die Standardaktion bevorzugt wird."
+#: dpkg.1:160
+msgid "B<1.> Run I<prerm> script"
+msgstr "B<1.> Führe das I<prerm>-Skript aus"
 
 # type: Plain text
-#: dpkg.1:398
-msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
-msgstr ""
-"B<confdef>: Falls eine Conffile verändert wurde, wähle immer die "
-"Standardaktion. Falls es keine Standardaktion gibt, halte an um den Benutzer "
-"zu fragen, es sei denn, B<--force-confnew> oder B<--force-confold> sind "
-"ebenfalls angegeben, in welchem Falle dies verwendet wird, um die endgültige "
-"Aktion zu bestimmen."
+#: dpkg.1:163
+msgid "B<2.> Remove the installed files"
+msgstr "B<2.> Entferne die installierten Dateien"
 
 # type: Plain text
-#: dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr ""
-"B<overwrite>: Überschreibe die Datei aus einem Paket mit einer Datei aus "
-"einem anderen Paket."
+#: dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
+msgstr "B<3.> Führe das I<postrm>-Skript aus"
 
-# type: Plain text
-#: dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
-msgstr ""
-"B<overwrite-dir> Überschreibe das Verzeichnis aus einem Paket mit einer "
-"Datei aus einem anderen Paket."
+# type: TP
+#: dpkg.1:167
+#, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-Datei>"
 
 # type: Plain text
-#: dpkg.1:407
+#: dpkg.1:176
 msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"B<overwrite-diverted>: Überschreibe eine umgelenkte (»diverted«) Datei mit "
-"einer nicht-umgelenkten."
-
-# type: Plain text
-#: dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
-msgstr "B<architecture>: Verarbeite sogar Pakete mit der falschen Architektur."
+"Aktualisiere B<dpkg>s und B<dselect>s Verständnis darüber, welche Pakete "
+"verfügbar sind. Mit der Aktion B<--merge-avail> wird alte Information mit "
+"der Information aus der I<Packages-Datei> zusammengeführt. Mit der Aktion "
+"B<--update-avail> wird die alte Information durch die Information aus der "
+"I<Packages-Datei> ersetzt. Die mit Debian vertriebene I<Packages-Datei> "
+"heißt einfach I<Packages>. B<dpkg> hält seine Aufzeichnungen über die "
+"verfügbaren Pakete in I</var/lib/dpkg/available>."
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:179
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
-"B<bad-path>: Im B<PATH> fehlen wichtige Programme, daher sind Probleme "
-"wahrscheinlich."
+"Ein einfacheres Kommando um die I<available>-Datei in einem Aufruf abzurufen "
+"und zu aktualisieren ist B<dselect update>."
 
-# type: Plain text
-#: dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
-msgstr ""
-"B<not-root>: Versuche Sachen zu (de)installieren, selbst falls nicht root."
+# type: TP
+#: dpkg.1:179
+#, no-wrap
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgstr "B<dpkg -A> | B<--record-avail> I<Paketdatei> ..."
 
 # type: Plain text
-#: dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+#: dpkg.1:185
+msgid ""
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<bad-verify>: Installiere ein Paket selbst wenn die Authentizitätsprüfung "
-"fehlschlägt."
+"Aktualisiere mit den Informationen aus dem Paket I<Paketdatei> B<dpkg>s und "
+"B<dselect>s Verständnis darüber, welche Pakete verfügbar sind. Falls die B<--"
+"recursive> oder B<-R>-Option angegeben ist, muss sich I<Paketdatei> "
+"stattdessen auf ein Verzeichnis beziehen."
 
 # type: TP
-#: dpkg.1:420
+#: dpkg.1:185
 #, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
-msgstr "B<--ignore-depends>=I<Paket>,..."
+msgid "B<dpkg --forget-old-unavail>"
+msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
-#: dpkg.1:424
-msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+#: dpkg.1:188
+msgid "Forget about uninstalled unavailable packages."
 msgstr ""
-"Ignoriere Abhängigkeitsüberprüfungen für ein bestimmtes Paket (tatsächlich "
-"wird die Überprüfung durchgeführt, aber nur Warnungen über Konflikte werden "
-"angezeigt, sonst nichts)."
+"Vergiss Informationen über nicht-installierte, nicht-verfügbare Pakete."
 
 # type: TP
-#: dpkg.1:424
+#: dpkg.1:188
 #, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<dpkg --clear-avail>"
+msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
-#: dpkg.1:428
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#: dpkg.1:191
+msgid "Erase the existing information about what packages are available."
 msgstr ""
-"Wähle das alte oder neue Binärpaketformat. Dies ist eine B<dpkg-deb>(1)-"
-"Option."
+"Lösche die existierenden Informationen darüber, welche Pakete verfügbar sind."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:191
 #, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg -C> | B<--audit>"
+msgstr "B<dpkg -C> | B<--audit>"
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:196
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
-"Lese oder überprüfe den Inhalt der Kontrolldatei beim Paketbau nicht. Dies "
-"ist eine B<dpkg-deb>(1)-Option."
+"Suche nach Pakete, die in Ihrem System nur teilweise installiert wurden. "
+"B<dpkg> wird Vorschläge machen, was mit ihnen geschehen soll, um sie in "
+"Funktion zu bringen."
 
 # type: TP
-#: dpkg.1:432
+#: dpkg.1:196
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg --get-selections> [I<Paket-Name-Muster>...]"
 
 # type: Plain text
-#: dpkg.1:437
+#: dpkg.1:200
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
 msgstr ""
-"Erledige alles, was gemacht werden soll, aber schreibe keine Änderungen. "
-"Dies wird verwendet um zu sehen, was mit der spezifizierten Änderung "
-"passieren würde ohne tatsächlich etwas zu modifizieren."
+"Hole eine Liste von Paketauswahlen und schreibe sie auf die Standardausgabe. "
+"Ohne Muster werden Pakete im Zustand »Säubern« nicht angezeigt."
+
+# type: TP
+#: dpkg.1:200
+#, no-wrap
+msgid "B<dpkg --set-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:442
+#: dpkg.1:206
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
 msgstr ""
-"Stellen Sie sicher, dass B<--no-act> vor dem Aktions-Parameter steht, oder "
-"Sie könnten mit unerwünschten Ergebnissen enden. (Beispielsweise wird B<dpkg "
-"--purge foo --no-act> zuerst das Paket foo bereinigen und dann versuchen, "
-"das Paket --no-act zu bereinigen, obwohl Sie wahrscheinlich davon ausgingen, "
-"dass tatsächlich gar nichts passieren sollte)"
+"Setze die Paketauswahl durch Einlesen einer Datei von der Standardeingabe. "
+"Diese Datei sollte im Format »E<lt>PaketE<gt> E<lt>ZustandE<gt>« sein, wobei "
+"Zustand einer aus »install«, »hold«, »deinstall« oder »purge« ist. "
+"Leerzeilen und Kommentarzeilen (beginnend mit »#«) sind auch erlaubt."
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:206
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr "B<-R> | B<--recursive>"
+msgid "B<dpkg --clear-selections>"
+msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
-#: dpkg.1:448
+#: dpkg.1:211
 msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
-"Behandle rekursiv alle regulären Dateien, die auf das Muster B<*.deb> passen "
-"und im angegeben Verzeichnis sowie allen Unterverzeichnis liegen. Dies kann "
-"mit den Aktionen B<-i>, B<-A>, B<--install>, B<--unpack> und B<--avail> "
-"verwendet werden."
+"Setze den erbetenen Zustand von jedem nicht-essenziellen Paket auf "
+"»Deinstallation«. Dies ist dazu gedacht, direkt vor --set-selections "
+"verwendet zu werden, um jedes Paket, dass nicht in der Liste von --set-"
+"selections vorkommt, zu deinstallieren."
 
 # type: TP
-#: dpkg.1:448
+#: dpkg.1:211
 #, no-wrap
-msgid "B<-G>"
-msgstr "B<-G>"
+msgid "B<dpkg --yet-to-unpack>"
+msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
-#: dpkg.1:452
+#: dpkg.1:215
 msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
-"Installiere ein Paket nicht, falls bereits eine neuere Version des gleichen "
-"Paketes installiert ist. Dies ist ein Alias für B<--refuse-downgrade>."
+"Sucht nach Paketen dir zur Installation ausgewählt wurden, die aber aus "
+"irgendeinem Grund noch nicht installiert wurden."
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:216
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<Verz> | B<--admindir=>I<Verz> | B<--instdir=>I<Verz>"
+msgid "B<dpkg --print-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg.1:463
+#: dpkg.1:219
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
-"Ändere die Standardverzeichnisse. B<admindir> ist standardmäßig I</var/lib/"
-"dpkg> und enthält viele Dateien, die Informationen über den Status von "
-"installierten oder nicht-installierten Paketen enthalten usw. B<instdir> ist "
-"standardmäßig I</> und bezieht sich auf das Verzeichnis, wo Pakete hin "
-"installiert werden. B<instdir> ist auch das Verzeichnis, das an B<chroot>(2) "
-"vor dem Aufruf der Installationsskripte des Paketes übergeben wird, was "
-"bedeutet, dass die Skripte B<instdir> als ein Wurzelverzeichnis sehen. Eine "
-"Änderung von B<root> ändert B<instdir> auf I<Verz> und B<admindir> auf "
-"I<dir>B</var/lib/dpkg>."
+"Gebe die Architektur der Pakete aus, die B<dpkg> installiert (beispielsweise "
+"»i386«)."
 
 # type: TP
-#: dpkg.1:463
+#: dpkg.1:219
 #, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgstr "B<dpkg --compare-versions >I<Ver1 Op Ver2>"
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:230
 msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
-"Bearbeite nur die Pakete, die zur Installation ausgewählt sind. Die "
-"eigentliche Markierung erfolgt mit B<dselect> oder durch B<dpkg>, wenn es "
-"Pakete bearbeitet. Beispielsweise wird ein Paket bei der Entfernung als für "
-"die Deinstallation-ausgewählt markiert."
+"Vergleiche Versionsnummern, wobei I<op> ein binärer Operator ist. B<dpkg> "
+"liefert Erfolg (Nullergebnis) falls die angegebene Bedingung erfüllt ist und "
+"einen Fehler (Nicht-Null-Ergebnis) andernfalls. Es gibt zwei Gruppen von "
+"Operatoren, die sich in der Behandlung von leeren I<ver1> oder I<ver2> "
+"unterscheiden. Die folgenden behandeln leere Versionen als jünger als jede "
+"andere Version: B<lt le eq ne ge gt>. Die folgenden behandeln eine leere "
+"Version als älter als jede Version: B<lt-nl le-nl ge-nl gt-nl>. Die "
+"folgenden sind nur aus Kompatibilität mit der Kontrolldateisyntax "
+"bereitgestellt: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:230
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg.1:473
+#: dpkg.1:235
 msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
-"Installiere das Paket nicht, falls die gleiche Version des Pakets bereits "
-"installiert ist."
+"Akzeptiert eine Reihe von Befehlen an Eingabe-Dateideskriptoren "
+"B<E<lt>nE<gt>>. Hinweis: Zusätzliche auf der Kommandozeile und durch diesen "
+"Datei-Deskriptor gesetzte Optionen werden nicht für nachfolgende Befehle, "
+"die im gleichen Lauf ausgeführt werden, zurückgesetzt."
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:235
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg --help>"
+msgstr "B<dpkg --help>"
 
 # type: Plain text
-#: dpkg.1:480
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-"Sende Paketstatusinformationen an den Dateideskriptor I<E<lt>nE<gt>>. Diese "
-"Option kann mehrfach angegeben werden. Statusaktualisierungen sind von der "
-"Form: »status: E<lt>PktE<gt>: E<lt>Pkt StatusE<gt>«. Fehler werden als "
-"»status: E<lt>PktE<gt>: error: Ausführliche-Fehlermeldung« berichtet. "
-"Konfigurationsdateikonflikte werden als »status: Conffile-"
-"Eingabeaufforderung: conffile : »aktuelle-conffile« »neue-conffile« "
-"useredited distedited« berichtet."
+#: dpkg.1:238
+msgid "Display a brief help message."
+msgstr "Zeige eine kurze Hilfenachricht an."
 
 # type: TP
-#: dpkg.1:480
+#: dpkg.1:238
 #, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--log=>I<Dateiname>"
+msgid "B<dpkg --force-help>"
+msgstr "B<dpkg --force-help>"
 
 # type: Plain text
-#: dpkg.1:492
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
-msgstr ""
-"Protokollierstatus-Änderungsaktualisierungen und -Aktionen in I<Dateiname> "
-"anstatt in die Standard-Datei I</var/log/dpkg.log>. Falls diese Option "
-"mehrfach übergeben wird, wird der letzte Dateiname verwendet. "
-"Protokollnachrichten sind von der Form »YYYY-MM-DD HH:MM:SS status "
-"E<lt>ZustandE<gt> E<lt>PktE<gt> E<lt>installierte-VersionE<gt>« für "
-"Statusänderungsaktualisierungen; »YYYY-MM-DD HH:MM:SS E<lt>AktionE<gt> "
-"E<lt>PktE<gt> E<lt>installierte-VersionE<gt> E<lt>verfügbare-VersionE<gt>« "
-"für Aktionen wobei I<E<lt>AktionE<gt>> entweder install, upgrade, remove "
-"oder purge ist; und »YYYY-MM-DD HH:MM:SS conffile E<lt>DateinameE<gt> "
-"E<lt>EntscheidungE<gt>« für Conffile-Änderungen ist, wobei "
-"I<E<lt>EntscheidungE<gt>> entweder install oder keep ist."
+#: dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
+msgstr "Gebe Hilfe über die B<--force->I<Sache>-Optionen."
 
 # type: TP
-#: dpkg.1:492
+#: dpkg.1:241
 #, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--no-debsig>"
+msgid "B<dpkg -Dh >|B< --debug=help>"
+msgstr "B<dpkg -Dh >|B< --debug=help>"
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
-msgstr "Versuche nicht, Paketsignaturen zu überprüfen."
+#: dpkg.1:244
+msgid "Give help about debugging options."
+msgstr "Gib Hilfe über Debugging-Optionen."
 
 # type: TP
-#: dpkg.1:497 dpkg.cfg.5:14
+#: dpkg.1:244
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg.1:500
-msgid "Configuration file with default options."
-msgstr "Konfigurationsdatei mit Standardeinstellungen der Optionen."
+#: dpkg.1:247
+msgid "Display B<dpkg> licence."
+msgstr "Zeige die B<dpkg>-Lizenz an."
 
 # type: TP
-#: dpkg.1:500
+#: dpkg.1:247
 #, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</var/log/dpkg.log>"
+msgid "B<dpkg --version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+#: dpkg.1:250
+msgid "Display B<dpkg> version information."
+msgstr "Zeige B<dpkg> Versionsinformationen an."
+
+# type: TP
+#: dpkg.1:250
+#, no-wrap
+msgid "B<dpkg-deb actions>"
+msgstr "B<dpkg-deb-Aktionen>"
+
+# type: Plain text
+#: dpkg.1:253
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
-"Standard-Protokolldatei (lesen Sie I</etc/dpkg/dpkg.cfg>(5) und die Option "
-"B<--log>)."
+"Lesen Sie B<dpkg-deb>(1) für weitere Informationen über die folgenden "
+"Aktionen."
 
 # type: Plain text
-#: dpkg.1:507
+#: dpkg.1:273
+#, no-wrap
 msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
-"Die anderen unten aufgeführten Dateien sind in ihrem Standardverzeichnis, "
-"lesen Sie den Text zur Option B<--admindir> um zu sehen, wie sie den Ort "
-"dieser Dateien ändern können."
+"B<dpkg -b> | B<--build> I<Verzeichnis> [I<Dateiname>]\n"
+"    Baue ein deb-Paket.\n"
+"B<dpkg -c> | B<--contents> I<Dateiname>\n"
+"    Liste den Inhalt eines deb-Paketes auf.\n"
+"B<dpkg -e> | B<--control> I<Dateiname> [I<Verzeichnis>]\n"
+"    Extrahiere Kontrollinformationen von einem Paket.\n"
+"B<dpkg -x> | B<--extract> I<Dateiname Verzeichnis>\n"
+"    Extrahiere die vom Paket enthaltenen Dateien.\n"
+"B<dpkg -f> | B<--field>  I<Dateiname> [I<Kontrollfeld>] ...\n"
+"    Zeige das/die Kontrollfeld(er) eines Paketes an.\n"
+"B<dpkg --fsys-tarfile> I<Dateiname>\n"
+"    Zeige die von einem Debian-Paket enthaltene Dateisystem-Tardatei an.\n"
+"B<dpkg -I> | B<--info> I<Dateiname> [I<Kontrolldatei>]\n"
+"    Zeige Informationen über ein Paket.\n"
+"B<dpkg -X> | B<--vextract> I<Dateiname> I<Verzeichnis>\n"
+"    Extrahiere und zeige die von einem Paket enthaltenen Dateinamen.\n"
 
 # type: TP
-#: dpkg.1:507
+#: dpkg.1:275
 #, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr "I</var/lib/dpkg/available>"
+msgid "B<dpkg-query actions>"
+msgstr "B<dpkg-query-Aktionen>"
 
 # type: Plain text
-#: dpkg.1:510
-msgid "List of available packages."
-msgstr "Liste der verfügbaren Pakete."
-
-# type: TP
-#: dpkg.1:510
-#, no-wrap
-msgid "I</var/lib/dpkg/status>"
-msgstr "I</var/lib/dpkg/status>"
+#: dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgstr ""
+"Lesen Sie B<dpkg-query>(1) für weitere Informationen über die folgenden "
+"Aktionen."
 
 # type: Plain text
-#: dpkg.1:516
+#: dpkg.1:291
+#, no-wrap
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
-msgstr ""
-"Statusse der verfügbaren Pakete. Diese Datei enthält Informationen darüber, "
-"ob ein Paket zur Entfernung markiert ist oder nicht, ob es installiert ist "
-"oder nicht usw. Lesen Sie den Abschnitt B<INFORMATIONEN ÜBER PAKETE> für "
-"weitere Informationen."
-
-# type: Plain text
-#: dpkg.1:519
-msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
 msgstr ""
-"Die folgenden Dateien sind Komponenten von Binärpaketen. Lesen Sie B<deb>(5) "
-"für weitere Informationen über sie:"
-
-# type: TP
-#: dpkg.1:519
-#, no-wrap
-msgid "I<control>"
-msgstr "I<control>"
-
-# type: TP
-#: dpkg.1:521
-#, no-wrap
-msgid "I<conffiles>"
-msgstr "I<conffiles>"
-
-# type: TP
-#: dpkg.1:523
-#, no-wrap
-msgid "I<preinst>"
-msgstr "I<preinst>"
-
-# type: TP
-#: dpkg.1:525
-#, no-wrap
-msgid "I<postinst>"
-msgstr "I<postinst>"
-
-# type: TP
-#: dpkg.1:527
-#, no-wrap
-msgid "I<prerm>"
-msgstr "I<prerm>"
-
-# type: TP
-#: dpkg.1:529
-#, no-wrap
-msgid "I<postrm>"
-msgstr "I<postrm>"
-
-# type: SH
-#: dpkg.1:532
-#, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr "UMGEBUNGSVARIABLEN"
-
-# type: TP
-#: dpkg.1:533
-#, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr "B<DPKG_NO_TSTP>"
+"B<dpkg -l> | B<--list> I<Paketnamen-Muster> ...\n"
+"    Liste auf das übergebene Suchmuster passende Pakete auf.\n"
+"B<dpkg -s> | B<--status> I<Paketname> ...\n"
+"    Berichte den Status der spezifizierten Pakete.\n"
+"B<dpkg -L> | B<--listfiles> I<Paket> ...\n"
+"    Liste die aus B<Paket> auf Ihrem System installierten Pakete auf.\n"
+"B<dpkg -S> | B<--search> I<Dateinamen-Suchmuster> ...\n"
+"    Suche nach einem Dateinamen in installierten Paketen.\n"
+"B<dpkg -p> | B<--print-avail> I<Paket>\n"
+"    Zeige Details über I<Paket>, wie in I</var/lib/dpkg/available> gefunden.\n"
 
 # type: Plain text
-#: dpkg.1:537
+#: dpkg.1:298
 msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
-"Definieren sie diese zu irgendetwas, falls Sie es bevorzugen, dass B<dpkg> "
-"eine neue Shell startet statt sich selber zu suspendieren, während es einen "
-"»Shell-Escape« durchführt."
+"Alle Optionen können auf der Kommandozeile oder in der B<dpkg>-"
+"Konfigurationsdatei I</etc/dpkg/dpkg.cfg> angegeben werden. Jede Zeile in "
+"der Konfigurationsdatei ist entweder eine Option (exakt die gleiche wie die "
+"Befehlszeilenoption nur ohne führende Gedankenstriche) oder ein Kommentar "
+"(falls es mit B<#> beginnt)."
 
 # type: TP
-#: dpkg.1:537
+#: dpkg.1:299
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+msgid "B<--abort-after=>I<number>"
+msgstr "B<--abort-after=>I<Zahl>"
 
 # type: Plain text
-#: dpkg.1:540
-msgid "The program B<dpkg> will execute when starting a new shell."
+#: dpkg.1:302
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
-"Das Programm, das B<dpkg> ausführen wird, wenn es eine neue Shell startet."
+"Ändere nach wie vielen Fehlern B<dpkg> abbrechen wird. Der Standardwert ist "
+"50."
 
 # type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:302
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<-B>|B<--auto-deconfigure>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:308
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
-msgstr ""
-"Setzt die Anzahl von Spalten die B<dpkg> verwenden soll, wenn es "
-"formatierten Text anzeigt. Derzeit nur von -l verwendet."
-
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
-#, no-wrap
-msgid "EXAMPLES"
-msgstr "BEISPIELE"
-
-# type: Plain text
-#: dpkg.1:547
-msgid "To list packages related to the editor B<vi>(1):"
-msgstr "Um Pakete mit Bezug zum B<vi>(1)-Editor aufzulisten:"
-
-# type: Plain text
-#: dpkg.1:549
-#, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-
-# type: Plain text
-#: dpkg.1:552
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
 msgstr ""
-"Um die Einträge von zwei Pakete in I</var/lib/dpkg/available> zu sehen:"
-
-# type: Plain text
-#: dpkg.1:554
-#, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
-msgstr "     B<dpkg --print-avail elvis vim | less>\n"
-
-# type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
-msgstr "Wenn Sie die Liste der Pakete selbst durchsuchen wollen:"
-
-# type: Plain text
-#: dpkg.1:559
-#, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
-msgstr "     B<less /var/lib/dpkg/available>\n"
-
-# type: Plain text
-#: dpkg.1:562
-msgid "To remove an installed elvis package:"
-msgstr "Um ein installiertes Elvis-Paket zu entfernen:"
+"Wenn ein Paket entfernt wird besteht die Möglichkeit, dass ein andere "
+"installierte Paket von dem entfernten Paket abhängt. Die Angabe dieser "
+"Option führt zur automatischen Dekonfiguration des Paketes, das von dem "
+"entfernten Paket abhängt."
 
-# type: Plain text
-#: dpkg.1:564
+# type: TP
+#: dpkg.1:308
 #, no-wrap
-msgid "     B<dpkg -r elvis>\n"
-msgstr "     B<dpkg -r elvis>\n"
-
-# type: Plain text
-#: dpkg.1:569
-msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
-msgstr ""
-"Um ein Paket zu installieren, müssen Sie es erst in einem Archiv oder auf "
-"einer CD-ROM finden. Die »available«-Datei zeigt, dass das vim-Paket im "
-"Bereich »editors« ist:"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgstr "B<-D>I<Oktal>B< | --debug=>I<Oktal>"
 
 # type: Plain text
-#: dpkg.1:572
-#, no-wrap
+#: dpkg.1:314
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
 msgstr ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
-
-# type: Plain text
-#: dpkg.1:575
-msgid "To make a local copy of the package selection states:"
-msgstr "Um eine lokale Kopie der Paketauswahl-Zustände zu erstellen:"
+"Schalte Debugging ein. I<Oktal> wird durch bitweise Oder-Verknüpfung der "
+"gewünschten Werte von der nachfolgenden Liste gebildet (beachten Sie, dass "
+"sich diese Werte in zukünftigen Veröffentlichungen verändern können). B<-Dh> "
+"oder B<--debug=help> zeigen diese Debugging-Werte an."
 
 # type: Plain text
-#: dpkg.1:577
+#: dpkg.1:326
 #, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "     B<dpkg --get-selections E<gt>meine_auswahl>\n"
-
-# type: Plain text
-#: dpkg.1:581
 msgid ""
-"You might transfer this file to another computer, and install it there with:"
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
 msgstr ""
-"Sie können diese Datei zu einem anderen Computer bringen und sie dort mit "
-"folgenden Befehlen installieren:"
+" Nummer  Beschreibung\n"
+"    1   Allgemein-hilfreiche Fortschrittsinformationen\n"
+"    2   Aufruf und Status der Betreuerskripte\n"
+"   10   Ausgabe für jede verarbeitete Datei\n"
+"  100   Umfangreiche Ausgabe für jede verarbeitete Datei\n"
+"   20   Ausgabe für jede Konfigurationsdatei\n"
+"  200   Umfangreiche Ausgabe für jede Konfigurationsdatei\n"
+"   40   Abhängigkeiten und Konflikte\n"
+"  400   Umfangreiche Abhängigkeiten/Konflikte-Ausgabe\n"
+" 1000   Umfangreiches Gelaber beispielsweise über das dpkg/info Verzeichnis\n"
+" 2000   Verrückte Mengen an Gelaber\n"
 
-# type: Plain text
-#: dpkg.1:584
+# type: TP
+#: dpkg.1:326
 #, no-wrap
-msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
-msgstr ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgstr "B<--force->I<Sachen> | B<--no-force->I<Sachen> | B<--refuse->I<Sachen>"
 
 # type: Plain text
-#: dpkg.1:590
+#: dpkg.1:333
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
-"Beachten Sie, dass dies nichts wirklich installiert oder entfernt, sondern "
-"lediglich den Auswahlzustand der angeforderten Pakete setzt. Sie werden eine "
-"andere Anwendung benötigen, um die angeforderten Pakete tatsächlich "
-"herunterzuladen und zu installieren. Starten Sie beispielsweise B<dselect> "
-"und wählen Sie »Installieren«."
+"Erzwinge oder verweigere (B<no-force> und B<refuse> bedeuten das gleiche) "
+"bestimmte Sachen. I<Sachen> ist eine Komma-separierte Liste von Dingen, die "
+"im folgenden beschrieben sind. B<--force-help> zeigt eine Nachricht an, die "
+"diese beschreibt. Mit (*) markierte Dinge werden standardmäßig erzwungen."
 
 # type: Plain text
-#: dpkg.1:593
+#: dpkg.1:337
 msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
-"Gewöhnlich werden Sie feststellen, dass B<dselect>(1) eine bequemere Art "
-"ist, den Paketauswahlzustand zu ändern."
-
-# type: SH
-#: dpkg.1:595
-#, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
-msgstr "ZUSÄTZLICHE FUNKTIONALITÄT"
+"I<Warnung. Diese Optionen sind hauptsächlich für den Einsatz durch Experten "
+"gedacht. Der Einsatz ohne komplettes Verständnis der Effekte kann Ihr "
+"gesamtes System zerstören.>"
 
 # type: Plain text
-#: dpkg.1:598
-msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
-msgstr ""
-"Zusätzliche Funktionalität kann durch die Installation jedes der folgenden "
-"Pakete erhalten werden: I<apt>, I<aptitude> und I<debsums>."
+#: dpkg.1:340
+msgid "B<all>: Turns on (or off) all force options."
+msgstr "B<all>: Schaltet alle »force«-Optionen ein (oder aus)."
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:343
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
-msgstr ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5) und B<dpkg-reconfigure>(8)."
-
-# type: Plain text
-#: dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
 msgstr ""
-"B<--no-act> gibt gewöhnlich weniger Informationen als hilfreich sein könnten."
-
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
-#, no-wrap
-msgid "AUTHORS"
-msgstr "AUTOREN"
+"B<downgrade>(*): Installiere ein Paket, selbst wenn eine neuere Version "
+"davon bereits installiert ist."
 
 # type: Plain text
-#: dpkg.1:616
-#, no-wrap
+#: dpkg.1:350
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
 msgstr ""
-"Lesen Sie I</usr/share/doc/dpkg/THANKS> für die Liste der Leute, die zu\n"
-"B<dpkg> beigetragen haben.\n"
-
-# type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "dpkg-architecture"
-msgstr "dpkg-architecture"
-
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, no-wrap
-msgid "2006-06-17"
-msgstr "2006-06-17"
-
-# type: Plain text
-#: dpkg-architecture.1:4
-msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
-msgstr "dpkg-architecture - Architektur zum Paketbau setzen und bestimmen"
-
-# type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
-msgstr "B<dpkg-architecture> [I<Optionen>] [I<Aktion>]"
+"I<Warnung: Derzeit führt Dpkg keine Abhängigkeitsüberprüfung bei der "
+"Installation älterer Versionen (als bereits installiert) durch (sog. "
+"Downgrade) und wird Sie daher nicht warnen, falls dadurch die Abhängigkeit "
+"eines anderen Pakets nicht mehr erfüllt ist. Dies kann ernsthafte "
+"Seiteneffekte haben, ein Downgrade einer essenziellen Systemkomponente kann "
+"ihr gesamtes System unbrauchbar machen. Verwenden Sie diese Option mit "
+"Vorsicht.>"
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:354
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
 msgstr ""
-"dpkg-architecture stellte eine Möglichkeit bereit, die Rechner-Architektur "
-"für den Paketbau zu bestimmen und zu setzen."
+"B<configure-any>: Konfiguriere auch jedes entpackte, aber unkonfigurierte "
+"Paket von dem das aktuelle Paket abhängt."
 
 # type: Plain text
-#: dpkg-architecture.1:17
-msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
-msgstr ""
-"Die Bau-Architektur wird immer über einen externen Aufruf an B<dpkg>(1) "
-"bestimmt und kann nicht auf der Kommandozeile gesetzt werden."
+#: dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
+msgstr "B<hold>: Verarbeite auch Pakete, die mit »halten« markiert sind."
 
 # type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg.1:362
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
-"Sie können die Host-Architektur (Gast-Architektur) spezifizieren, indem Sie "
-"eine oder beide der Optionen B<-a> oder B<-t> verwenden. Der Standardwert "
-"wird über einen externen Aufruf an B<gcc>(1) ermittelt oder ist identisch "
-"mit der Bauarchitektur, falls sowohl \\s-1CC\\s0 als auch Gcc nicht "
-"verfügbar sind. Einer von B<-a> oder B<-t> ist ausreichend, der Wert des "
-"anderen wird auf einen brauchbaren Wert gesetzt. Tatsächlich ist es oft "
-"besser nur einen der beiden anzugeben, da B<dpkg-architecture> Sie warnen "
-"wird, falls Ihre Wahl nicht mit dem Standardwert übereinstimmt."
-
-# type: TP
-#: dpkg-architecture.1:28
-#, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<-a>I<Debian-Architektur>"
-
-# type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
-msgstr "Setze die Debian-Architektur."
-
-# type: TP
-#: dpkg-architecture.1:31
-#, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr "B<-t>I<GNU-Systemtyp>"
-
-# type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
-msgstr "Setzt den GNU-Systemtyp."
-
-# type: TP
-#: dpkg-architecture.1:34
-#, no-wrap
-msgid "B<-f>"
-msgstr "B<-f>"
+"B<remove-reinstreq>: Entferne ein Paket, selbst falls es defekt ist und zur "
+"Neuinstallation markiert ist. Dies kann beispielsweise dazu führen, dass "
+"Teile des Pakets auf dem System bleiben und von B<dpkg> vergessen werden."
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:367
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
 msgstr ""
-"Existierende Umgebungsvariablen mit dem gleichen Namen wie vom Skript "
-"verwendet werden nicht überschrieben (d.h. sie werden von B<dpkg-"
-"architecture> verwendet), es sei denn, die »force«-Markierung ist gesetzt. "
-"Dies erlaubt es dem Benutzer einen Wert zu überschreiben, selbst wenn der "
-"Aufruf von B<dpkg-architecture> tief in einem anderen Skript versteckt ist "
-"(beispielsweise B<dpkg-buildpackage>(1))."
-
-# type: TP
-#: dpkg-architecture.1:43
-#, no-wrap
-msgid "B<-l>"
-msgstr "B<-l>"
+"B<remove-essential>: Entferne, selbst falls das Paket als essenziell "
+"betrachtet wird. Essenzielle Pakete enthalten hauptsächlich sehr "
+"grundlegende Unix-Befehle. Diese zu entfernen kann dazu führen, dass das "
+"gesamte System nicht mehr arbeitet - verwenden Sie dies Option daher mit "
+"Vorsicht."
 
 # type: Plain text
-#: dpkg-architecture.1:47
-msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
-msgstr ""
-"Zeige die Umgebungsvariablen, eine pro Zeile, in dem Format "
-"I<VARIABLE=Wert>. Dies ist die Standardaktion."
-
-# type: TP
-#: dpkg-architecture.1:47
-#, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr "B<-e>I<Debian-Architektur>"
+#: dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
+msgstr "B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen."
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg.1:373
 msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+"B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
-"Überprüfe auf Gleichheit der Architekturen. Standardmäßig wird I<Debian-"
-"Architektur> gegen die aktuelle Debian-Architektur auf dem Host geprüft. "
-"Diese Aktion expandiert nicht die Architektur-Platzhalter (Wildcards). Der "
-"Befehl beendet sich mit einem Exit-Status von 0, falls eine Übereinstimmung "
-"besteht, andernfalls mit 1."
-
-# type: TP
-#: dpkg-architecture.1:53
-#, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
-msgstr "B<-i>I<Architektur-Platzhalter>"
+"B<depends-version>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten."
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg.1:377
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
 msgstr ""
-"Überprüfe die Identität einer Architektur, indem I<Architektur-Platzhalter> "
-"als einen Architektur-Platzhalter expandiert und mit der aktuellen Debian-"
-"Architektur verglichen wird. Das Kommando endet mit einem Exit-Status von 0, "
-"falls eine Übereinstimmung gefunden wurde, ansonsten mit 1."
-
-# type: TP
-#: dpkg-architecture.1:59
-#, no-wrap
-msgid "B<-q>I<variable-name>"
-msgstr "B<-q>I<Variablenname>"
+"B<conflicts>: Installiere, selbst wenn es mit einem anderen Paket in "
+"Konflikt steht. Dies ist gefährlich, da dies gewöhnlich dazu führt, dass "
+"einige Dateien überschrieben werden."
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
-msgstr "Zeige den Wert einer einzelnen Variablen an."
-
-# type: TP
-#: dpkg-architecture.1:62
-#, no-wrap
-msgid "B<-s>"
-msgstr "B<-s>"
+#: dpkg.1:382
+msgid ""
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
+msgstr ""
+"B<confmiss>: Installiere immer fehlende Konfigurationsdateien. Dies ist "
+"gefährlich, da es bedeutet, dass eine Änderung (die Entfernung) an der Datei "
+"nicht erhalten wird."
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:387
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
-"Zeige ein Export-Kommando. Dies kann dazu verwendet werden, um "
-"Umgebungsvariablen mittels eval zu setzen."
-
-# type: TP
-#: dpkg-architecture.1:66
-#, no-wrap
-msgid "B<-u>"
-msgstr "B<-u>"
+"B<confnew>: Falls eine Conffile modifiziert wurde, installiere immer die "
+"neue Version ohne Rückfrage, es sei denn, B<--force-confdef> ist ebenfalls "
+"angegeben, in welchem Falle die Standardaktion bevorzugt wird."
 
 # type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
-msgstr "Zeige ein zu B<-s> ähnliches Kommando, nur lösche alle Variablen."
-
-# type: TP
-#: dpkg-architecture.1:69
-#, no-wrap
-msgid "B<-c>I< command>"
-msgstr "B<-c>I< Befehl>"
+#: dpkg.1:392
+msgid ""
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
+msgstr ""
+"B<confold>: Falls eine Conffile modifiziert wurde, behalte immer die alte "
+"Version ohne Rückfrage, es sei denn, B<--force-confdef> ist ebenfalls "
+"angegeben, in welchem Falle die Standardaktion bevorzugt wird."
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg.1:398
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
 msgstr ""
-"Führe einen I<Befehl> in einer Umgebung aus, in der alle Variablen auf die "
-"festgelegten Werte gesetzt sind."
+"B<confdef>: Falls eine Conffile verändert wurde, wähle immer die "
+"Standardaktion. Falls es keine Standardaktion gibt, halte an um den Benutzer "
+"zu fragen, es sei denn, B<--force-confnew> oder B<--force-confold> sind "
+"ebenfalls angegeben, in welchem Falle dies verwendet wird, um die endgültige "
+"Aktion zu bestimmen."
 
-# type: TP
-#: dpkg-architecture.1:73
-#, no-wrap
-msgid "B<-L>"
-msgstr "B<-L>"
+# type: Plain text
+#: dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
+msgstr ""
+"B<overwrite>: Überschreibe die Datei aus einem Paket mit einer Datei aus "
+"einem anderen Paket."
 
 # type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
-msgstr "Zeige eine Liste von gültigen Architekturnamen."
+#: dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
+msgstr ""
+"B<overwrite-dir> Überschreibe das Verzeichnis aus einem Paket mit einer "
+"Datei aus einem anderen Paket."
 
 # type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-#, fuzzy
-msgid "Print a usage message."
+#: dpkg.1:407
+msgid ""
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"Gebe einen Bedienungshinweis aus.\n"
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"Zeige eine Verwendungsmitteilung."
+"B<overwrite-diverted>: Überschreibe eine umgelenkte (»diverted«) Datei mit "
+"einer nicht-umgelenkten."
 
 # type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
-msgstr "Zeige die Programm-Version."
+#: dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
+msgstr "B<architecture>: Verarbeite sogar Pakete mit der falschen Architektur."
 
-# type: SH
-#: dpkg-architecture.1:83
-#, no-wrap
-msgid "TERMS"
-msgstr "AUSDRÜCKE"
+# type: Plain text
+#: dpkg.1:413
+msgid ""
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+msgstr ""
+"B<bad-path>: Im B<PATH> fehlen wichtige Programme, daher sind Probleme "
+"wahrscheinlich."
 
-# type: IP
-#: dpkg-architecture.1:84
-#, no-wrap
-msgid "build machine"
-msgstr "Baumaschine"
+# type: Plain text
+#: dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
+msgstr ""
+"B<not-root>: Versuche Sachen zu (de)installieren, selbst falls nicht root."
 
 # type: Plain text
-#: dpkg-architecture.1:86
-msgid "The machine the package is built on."
-msgstr "Die Maschine, auf der das Paket gebaut wird."
+#: dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+msgstr ""
+"B<bad-verify>: Installiere ein Paket selbst wenn die Authentizitätsprüfung "
+"fehlschlägt."
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:420
 #, no-wrap
-msgid "host machine"
-msgstr "Host-Maschine"
+msgid "B<--ignore-depends>=I<package>,..."
+msgstr "B<--ignore-depends>=I<Paket>,..."
 
 # type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
-msgstr "Die Maschine, für die das Paket gebaut ist."
+#: dpkg.1:424
+msgid ""
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
+msgstr ""
+"Ignoriere Abhängigkeitsüberprüfungen für ein bestimmtes Paket (tatsächlich "
+"wird die Überprüfung durchgeführt, aber nur Warnungen über Konflikte werden "
+"angezeigt, sonst nichts)."
 
-# type: IP
-#: dpkg-architecture.1:88
+# type: TP
+#: dpkg.1:424
 #, no-wrap
-msgid "Debian architecture"
-msgstr "Debian-Architektur"
+msgid "B<--new> | B<--old>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:428
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
-"Die Debian-Architektur-Zeichenkette, die den binären Baum im \\s-1FTP\\s0-"
-"Archiv spezifiziert. Beispiele: i386, sparc, hurd-i386."
+"Wähle das alte oder neue Binärpaketformat. Dies ist eine B<dpkg-deb>(1)-"
+"Option."
 
-# type: IP
-#: dpkg-architecture.1:91
+# type: TP
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
-msgid "architecture wildcard"
-msgstr "Architektur-Platzhalter"
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg.1:432
 msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
 msgstr ""
-"Ein Architektur-Platzhalter ist eine spezielle Architektur-Zeichenkette, die "
-"auf jede reale Architektur, die ein Teil davon ist, passt. Die allgemeine "
-"Form ist E<lt>KernE<gt>-E<lt>CPUE<gt>. Beispiele: linux-any, any-i386, hurd-"
-"any."
+"Lese oder überprüfe den Inhalt der Kontrolldatei beim Paketbau nicht. Dies "
+"ist eine B<dpkg-deb>(1)-Option."
 
-# type: IP
-#: dpkg-architecture.1:95
+# type: TP
+#: dpkg.1:432
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr "\\s-1GNU\\s0-Systemtyp"
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg.1:437
 msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
 msgstr ""
-"Eine Architektur-Spezifikations-Zeichenkette besteht aus zwei, durch einen "
-"Bindestrich getrennten Teilen: CPU und System. Beispiele: i386-linux-gnu, "
-"sparc-linux-gnu, i386-gnu, x86_64-netbsd."
+"Erledige alles, was gemacht werden soll, aber schreibe keine Änderungen. "
+"Dies wird verwendet um zu sehen, was mit der spezifizierten Änderung "
+"passieren würde ohne tatsächlich etwas zu modifizieren."
 
 # type: Plain text
-#: dpkg-architecture.1:103
+#: dpkg.1:442
 msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
 msgstr ""
-"B<dpkg-buildpackage> akzeptiert die B<-a>-Option und gibt dies an B<dpkg-"
-"architecture> weiter. Weitere Beispiele:"
+"Stellen Sie sicher, dass B<--no-act> vor dem Aktions-Parameter steht, oder "
+"Sie könnten mit unerwünschten Ergebnissen enden. (Beispielsweise wird B<dpkg "
+"--purge foo --no-act> zuerst das Paket foo bereinigen und dann versuchen, "
+"das Paket --no-act zu bereinigen, obwohl Sie wahrscheinlich davon ausgingen, "
+"dass tatsächlich gar nichts passieren sollte)"
+
+# type: TP
+#: dpkg.1:442
+#, no-wrap
+msgid "B<-R> | B<--recursive>"
+msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+#: dpkg.1:448
+msgid ""
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
-"CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+"Behandle rekursiv alle regulären Dateien, die auf das Muster B<*.deb> passen "
+"und im angegeben Verzeichnis sowie allen Unterverzeichnis liegen. Dies kann "
+"mit den Aktionen B<-i>, B<-A>, B<--install>, B<--unpack> und B<--avail> "
+"verwendet werden."
 
-# type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+# type: TP
+#: dpkg.1:448
+#, no-wrap
+msgid "B<-G>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg.1:452
 msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
-"Überprüfe, ob eine Architektur identisch zu der aktuellen Architektur oder "
-"einer übergebenen ist:"
-
-# type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr "dpkg-architecture -elinux-alpha"
+"Installiere ein Paket nicht, falls bereits eine neuere Version des gleichen "
+"Paketes installiert ist. Dies ist ein Alias für B<--refuse-downgrade>."
 
-# type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr "dpkg-architecture -amips -elinux-mips"
+# type: TP
+#: dpkg.1:452
+#, no-wrap
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgstr "B<--root=>I<Verz> | B<--admindir=>I<Verz> | B<--instdir=>I<Verz>"
 
 # type: Plain text
-#: dpkg-architecture.1:117
+#: dpkg.1:463
 msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
-"Überprüfe, ob die aktuelle oder eine mit -a übergebene Architektur Linux-"
-"Systeme sind:"
+"Ändere die Standardverzeichnisse. B<admindir> ist standardmäßig I</var/lib/"
+"dpkg> und enthält viele Dateien, die Informationen über den Status von "
+"installierten oder nicht-installierten Paketen enthalten usw. B<instdir> ist "
+"standardmäßig I</> und bezieht sich auf das Verzeichnis, wo Pakete hin "
+"installiert werden. B<instdir> ist auch das Verzeichnis, das an B<chroot>(2) "
+"vor dem Aufruf der Installationsskripte des Paketes übergeben wird, was "
+"bedeutet, dass die Skripte B<instdir> als ein Wurzelverzeichnis sehen. Eine "
+"Änderung von B<root> ändert B<instdir> auf I<Verz> und B<admindir> auf "
+"I<dir>B</var/lib/dpkg>."
 
-# type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
-msgstr "dpkg-architecture -ilinux-any"
+# type: TP
+#: dpkg.1:463
+#, no-wrap
+msgid "B<-O> | B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr "dpkg-architecture -ai386 -ilinux-any"
+#: dpkg.1:469
+msgid ""
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
+msgstr ""
+"Bearbeite nur die Pakete, die zur Installation ausgewählt sind. Die "
+"eigentliche Markierung erfolgt mit B<dselect> oder durch B<dpkg>, wenn es "
+"Pakete bearbeitet. Beispielsweise wird ein Paket bei der Entfernung als für "
+"die Deinstallation-ausgewählt markiert."
 
-# type: SH
-#: dpkg-architecture.1:122
+# type: TP
+#: dpkg.1:469
 #, no-wrap
-msgid "VARIABLES"
-msgstr "VARIABLEN"
+msgid "B<-E> | B<--skip-same-version>"
+msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr "Die folgenden Variablen werden von B<dpkg-architecture> gesetzt:"
+#: dpkg.1:473
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
+msgstr ""
+"Installiere das Paket nicht, falls die gleiche Version des Pakets bereits "
+"installiert ist."
 
-# type: IP
-#: dpkg-architecture.1:124
+# type: TP
+#: dpkg.1:473
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
-msgstr "\\s-1DEB_BUILD_ARCH\\s0"
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
-msgstr "Die Debian-Architektur der Baumaschine."
+#: dpkg.1:480
+msgid ""
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
+msgstr ""
+"Sende Paketstatusinformationen an den Dateideskriptor I<E<lt>nE<gt>>. Diese "
+"Option kann mehrfach angegeben werden. Statusaktualisierungen sind von der "
+"Form: »status: E<lt>PktE<gt>: E<lt>Pkt StatusE<gt>«. Fehler werden als "
+"»status: E<lt>PktE<gt>: error: Ausführliche-Fehlermeldung« berichtet. "
+"Konfigurationsdateikonflikte werden als »status: Conffile-"
+"Eingabeaufforderung: conffile : »aktuelle-conffile« »neue-conffile« "
+"useredited distedited« berichtet."
 
-# type: IP
-#: dpkg-architecture.1:126
+# type: TP
+#: dpkg.1:480
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
-msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgid "B<--log=>I<filename>"
+msgstr "B<--log=>I<Dateiname>"
 
 # type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr "Der Debian-Systemname der Baumaschine."
+#: dpkg.1:492
+msgid ""
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
+msgstr ""
+"Protokollierstatus-Änderungsaktualisierungen und -Aktionen in I<Dateiname> "
+"anstatt in die Standard-Datei I</var/log/dpkg.log>. Falls diese Option "
+"mehrfach übergeben wird, wird der letzte Dateiname verwendet. "
+"Protokollnachrichten sind von der Form »YYYY-MM-DD HH:MM:SS status "
+"E<lt>ZustandE<gt> E<lt>PktE<gt> E<lt>installierte-VersionE<gt>« für "
+"Statusänderungsaktualisierungen; »YYYY-MM-DD HH:MM:SS E<lt>AktionE<gt> "
+"E<lt>PktE<gt> E<lt>installierte-VersionE<gt> E<lt>verfügbare-VersionE<gt>« "
+"für Aktionen wobei I<E<lt>AktionE<gt>> entweder install, upgrade, remove "
+"oder purge ist; und »YYYY-MM-DD HH:MM:SS conffile E<lt>DateinameE<gt> "
+"E<lt>EntscheidungE<gt>« für Conffile-Änderungen ist, wobei "
+"I<E<lt>EntscheidungE<gt>> entweder install oder keep ist."
 
-# type: IP
-#: dpkg-architecture.1:128
+# type: TP
+#: dpkg.1:492
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
-msgstr "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgid "B<--no-debsig>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
-msgstr "Der Debian-CPU-Name der Baumaschine."
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
+msgstr "Versuche nicht, Paketsignaturen zu überprüfen."
 
-# type: IP
-#: dpkg-architecture.1:130
+# type: TP
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
-msgstr "Der \\s-1GNU\\s0-Systemname der Baumaschine."
+#: dpkg.1:500
+msgid "Configuration file with default options."
+msgstr "Konfigurationsdatei mit Standardeinstellungen der Optionen."
 
-# type: IP
-#: dpkg-architecture.1:132
+# type: TP
+#: dpkg.1:500
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgid "I</var/log/dpkg.log>"
+msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr "Der \\s-1CPU\\s0-Teil von \\s-1DEB_BUILD_GNU_TYPE\\s0"
-
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
-msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+msgstr ""
+"Standard-Protokolldatei (lesen Sie I</etc/dpkg/dpkg.cfg>(5) und die Option "
+"B<--log>)."
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
-msgstr "Der System-Teil von \\s-1DEB_BUILD_GNU_TYPE\\s0."
+#: dpkg.1:507
+msgid ""
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
+msgstr ""
+"Die anderen unten aufgeführten Dateien sind in ihrem Standardverzeichnis, "
+"lesen Sie den Text zur Option B<--admindir> um zu sehen, wie sie den Ort "
+"dieser Dateien ändern können."
 
-# type: IP
-#: dpkg-architecture.1:136
+# type: TP
+#: dpkg.1:507
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
-msgstr "\\s-1DEB_HOST_ARCH\\s0"
+msgid "I</var/lib/dpkg/available>"
+msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
-msgstr "Die Debian-Architektur der Host-Maschine."
+#: dpkg.1:510
+msgid "List of available packages."
+msgstr "Liste der verfügbaren Pakete."
 
-# type: IP
-#: dpkg-architecture.1:138
+# type: TP
+#: dpkg.1:510
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgid "I</var/lib/dpkg/status>"
+msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
-msgstr "Der Debian-Systemname der Host-Maschine."
+#: dpkg.1:516
+msgid ""
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+msgstr ""
+"Statusse der verfügbaren Pakete. Diese Datei enthält Informationen darüber, "
+"ob ein Paket zur Entfernung markiert ist oder nicht, ob es installiert ist "
+"oder nicht usw. Lesen Sie den Abschnitt B<INFORMATIONEN ÜBER PAKETE> für "
+"weitere Informationen."
+
+# type: Plain text
+#: dpkg.1:519
+msgid ""
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
+msgstr ""
+"Die folgenden Dateien sind Komponenten von Binärpaketen. Lesen Sie B<deb>(5) "
+"für weitere Informationen über sie:"
 
-# type: IP
-#: dpkg-architecture.1:140
+# type: TP
+#: dpkg.1:519
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
-msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
-
-# type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
-msgstr "Der Debian-CPU-Name der Host-Maschine."
+msgid "I<control>"
+msgstr "I<control>"
 
-# type: IP
-#: dpkg-architecture.1:142
+# type: TP
+#: dpkg.1:521
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
-msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
-
-# type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
-msgstr "Der \\s-1GNU\\s0-Systemtyp der Host-Maschine."
+msgid "I<conffiles>"
+msgstr "I<conffiles>"
 
-# type: IP
-#: dpkg-architecture.1:144
+# type: TP
+#: dpkg.1:523
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
-msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgid "I<preinst>"
+msgstr "I<preinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr "Der \\s-1CPU\\s0-Teil von \\s-1DEB_HOST_GNU_TYPE\\s0."
+# type: TP
+#: dpkg.1:525
+#, no-wrap
+msgid "I<postinst>"
+msgstr "I<postinst>"
 
-# type: IP
-#: dpkg-architecture.1:146
+# type: TP
+#: dpkg.1:527
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgid "I<prerm>"
+msgstr "I<prerm>"
 
-# type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr "Der System-Teil von \\s-1DEB_HOST_GNU_TYPE\\s0."
+# type: TP
+#: dpkg.1:529
+#, no-wrap
+msgid "I<postrm>"
+msgstr "I<postrm>"
 
 # type: SH
-#: dpkg-architecture.1:149
+#: dpkg.1:532
 #, no-wrap
-msgid "DEBIAN/RULES"
-msgstr "DEBIAN/RULES"
-
-# type: Plain text
-#: dpkg-architecture.1:157
-msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
-msgstr ""
-"Die Umgebungsvariablen, die von B<dpkg-architecture> gesetzt werden, werden "
-"an I<debian/rules> als Make-Variablen weitergegeben (lesen Sie hierzu die "
-"Make-Dokumentation). Allerdings sollten Sie sich nicht auf diese verlassen, "
-"da damit der manuelle Aufruf des Skripts verhindert wird. Stattdessen "
-"sollten Sie sie immer mit B<dpkg-architecture> mit der -q-Option "
-"initialisieren. Hier sind einige Beispiele, die auch zeigen, wie sie die "
-"Cross-Kompilierungs-Unterstützung in Ihrem Paket verbessern können:"
+msgid "ENVIRONMENT VARIABLES"
+msgstr "UMGEBUNGSVARIABLEN"
 
-# type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
-msgstr "Anstatt von:"
+# type: TP
+#: dpkg.1:533
+#, no-wrap
+msgid "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: dpkg-architecture.1:164
-#, no-wrap
+#: dpkg.1:537
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+"Definieren sie diese zu irgendetwas, falls Sie es bevorzugen, dass B<dpkg> "
+"eine neue Shell startet statt sich selber zu suspendieren, während es einen "
+"»Shell-Escape« durchführt."
 
-# type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
-msgstr "verwenden Sie bitte das folgende:"
+# type: TP
+#: dpkg.1:537
+#, no-wrap
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+#: dpkg.1:540
+msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"Das Programm, das B<dpkg> ausführen wird, wenn es eine neue Shell startet."
 
-# type: Plain text
-#: dpkg-architecture.1:173
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgid "B<COLUMNS>"
+msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: dpkg-architecture.1:183
-#, no-wrap
+#: dpkg.1:544
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Setzt die Anzahl von Spalten die B<dpkg> verwenden soll, wenn es "
+"formatierten Text anzeigt. Derzeit nur von -l verwendet."
 
-# type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
-msgstr "bitte verwenden Sie:"
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
+#, no-wrap
+msgid "EXAMPLES"
+msgstr "BEISPIELE"
 
 # type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
-msgstr "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+#: dpkg.1:547
+msgid "To list packages related to the editor B<vi>(1):"
+msgstr "Um Pakete mit Bezug zum B<vi>(1)-Editor aufzulisten:"
 
 # type: Plain text
-#: dpkg-architecture.1:193
+#: dpkg.1:549
 #, no-wrap
-msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
-msgstr ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:197
-msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+#: dpkg.1:552
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
-"oder, falls Sie nur den CPU- oder OS-Typ überprüfen müssen, verwenden Sie "
-"die DEB_HOST_ARCH_CPU- oder DEB_HOST_ARCH_OS-Variablen."
+"Um die Einträge von zwei Pakete in I</var/lib/dpkg/available> zu sehen:"
 
 # type: Plain text
-#: dpkg-architecture.1:202
-msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
-msgstr ""
-"Im allgemeinen wird der Aufruf von Dpkg in der »rules«-Datei, um Architektur-"
-"Informationen zu erhalten, abgelehnt (falls Sie Rückwärtskompatibilität "
-"bereitstellen wollen, siehe unten). Insbesondere die --print-architecture-"
-"Option ist unzuverlässig, da wir Debian-Architekturen haben, die nicht mit "
-"einem Prozessornamen übereinstimmen."
-
-# type: SH
-#: dpkg-architecture.1:203
+#: dpkg.1:554
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
-msgstr "RÜCKWÄRTSKOMPATIBILITÄT"
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:209
-msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
-msgstr ""
-"Die DEB_HOST_ARCH_CPU- und DEB_HOST_ARCH_OS-Variablen wurden erst in einer "
-"relativ neuen Version von B<dpkg-architecture> eingeführt (seit Dpkg "
-"1.13.2), vorher tendierten die I<debian/rules>-Dateien dazu, die Werte der "
-"DEB_HOST_GNU_CPU- oder DEB_HOST_GNU_TYPE-Variablen zu überprüfen, die aber "
-"Änderungen unterlagen."
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
+msgstr "Wenn Sie die Liste der Pakete selbst durchsuchen wollen:"
 
 # type: Plain text
-#: dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
-msgstr ""
-"Wo I<debian/rules>-Dateien diese Variablen überprüfen um festzustellen, wie "
-"oder was zu kompilieren ist, sollten diese aktualisiert werden, um die neuen "
-"Variablen und Werte zu verwenden. Sie möchten eventuell "
-"Rückwärtskompatibilität zu älteren Versionen von Dpkg-dev erhalten, indem "
-"Sie den folgenden Code verwenden:"
+#: dpkg.1:559
+#, no-wrap
+msgid "     B<less /var/lib/dpkg/available>\n"
+msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:218
-#, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
-msgstr ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+#: dpkg.1:562
+msgid "To remove an installed elvis package:"
+msgstr "Um ein installiertes Elvis-Paket zu entfernen:"
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
-msgstr ""
-"# Berücksichtige die Ausgabe des alten Dpkg-architecture.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+#: dpkg.1:564
+#, no-wrap
+msgid "     B<dpkg -r elvis>\n"
+msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
-msgstr "Und ähnlich für DEB_BUILD_ARCH_CPU und DEB_BUILD_ARCH_OS."
+#: dpkg.1:569
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
+msgstr ""
+"Um ein Paket zu installieren, müssen Sie es erst in einem Archiv oder auf "
+"einer CD-ROM finden. Die »available«-Datei zeigt, dass das vim-Paket im "
+"Bereich »editors« ist:"
 
 # type: Plain text
-#: dpkg-architecture.1:238
+#: dpkg.1:572
+#, no-wrap
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 msgstr ""
-"Falls Sie noch Versionen von Dpkg-dev, die B<dpkg-architecture> nicht "
-"enthielten, unterstützen wollen, erledigt dies folgendes:"
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg.1:575
+msgid "To make a local copy of the package selection states:"
+msgstr "Um eine lokale Kopie der Paketauswahl-Zustände zu erstellen:"
+
+# type: Plain text
+#: dpkg.1:577
 #, no-wrap
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "     B<dpkg --get-selections E<gt>meine_auswahl>\n"
+
+# type: Plain text
+#: dpkg.1:581
 msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"You might transfer this file to another computer, and install it there with:"
 msgstr ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"Sie können diese Datei zu einem anderen Computer bringen und sie dort mit "
+"folgenden Befehlen installieren:"
 
 # type: Plain text
-#: dpkg-architecture.1:253
+#: dpkg.1:584
 #, no-wrap
 msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 msgstr ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:257
+#: dpkg.1:590
 msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
-"Setzen Sie eine Untermenge dieser Zeilen oben in Ihre debian/rules-Datei; "
-"diese Standardwerte werden überschrieben, falls Dpkg-architecture verwendet "
-"wird."
+"Beachten Sie, dass dies nichts wirklich installiert oder entfernt, sondern "
+"lediglich den Auswahlzustand der angeforderten Pakete setzt. Sie werden eine "
+"andere Anwendung benötigen, um die angeforderten Pakete tatsächlich "
+"herunterzuladen und zu installieren. Starten Sie beispielsweise B<dselect> "
+"und wählen Sie »Installieren«."
 
 # type: Plain text
-#: dpkg-architecture.1:264
+#: dpkg.1:593
 msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
-"Sie benötigen nicht den ganzen Satz. Wählen Sie einen konsistenten Satz, der "
-"nur die Werte enthält, die Sie in der rules-Datei verwenden. Falls Sie "
-"beispielsweise nur die Host-Debian-Architektur benötigen, ist »DEB_HOST_ARCH="
-"\\`dpkg --print-architecture\\ ausreichend (dies ist in der Tat die Debian-"
-"Architektur der Baumaschine, aber denken Sie daran, dass wir nur zur "
-"»natürlichen« Kompilierung rückwärtskompatibel sein wollen)."
+"Gewöhnlich werden Sie feststellen, dass B<dselect>(1) eine bequemere Art "
+"ist, den Paketauswahlzustand zu ändern."
+
+# type: SH
+#: dpkg.1:595
+#, no-wrap
+msgid "ADDITIONAL FUNCTIONALITY"
+msgstr "ZUSÄTZLICHE FUNKTIONALITÄT"
 
 # type: Plain text
-#: dpkg-architecture.1:267
+#: dpkg.1:598
 msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
-"Die B<-e>- und B<-i>-Optionen wurden erst in relativ neuen Versionen von "
-"B<dpkg-architecture> eingeführt (seit Dpkg 1.13.13)."
+"Zusätzliche Funktionalität kann durch die Installation jedes der folgenden "
+"Pakete erhalten werden: I<apt>, I<aptitude> und I<debsums>."
 
 # type: Plain text
-#: dpkg-architecture.1:271
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+#: dpkg.1:608
+msgid ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+msgstr ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5) und B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: dpkg-architecture.1:276
+#: dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
+msgstr ""
+"B<--no-act> gibt gewöhnlich weniger Informationen als hilfreich sein könnten."
+
+# type: SH
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
+#, no-wrap
+msgid "AUTHORS"
+msgstr "AUTOREN"
+
+# type: Plain text
+#: dpkg.1:616
+#, no-wrap
 msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
 msgstr ""
-"B<dpkg-architecture> und diese Handbuchseite wurden ursprünglich von Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt> geschrieben."
+"Lesen Sie I</usr/share/doc/dpkg/THANKS> für die Liste der Leute, die zu\n"
+"B<dpkg> beigetragen haben.\n"
 
 # type: TH
-#: dpkg.cfg.5:1
+#: dpkg-architecture.1:1
 #, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg.cfg"
+msgid "dpkg-architecture"
+msgstr "dpkg-architecture"
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
-msgstr "dpkg.cfg - dpkg Konfigurationsdatei"
+#: dpkg-architecture.1:4
+msgid ""
+"dpkg-architecture - set and determine the architecture for package building"
+msgstr "dpkg-architecture - Architektur zum Paketbau setzen und bestimmen"
 
 # type: Plain text
-#: dpkg.cfg.5:11
-msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
-msgstr ""
-"Diese Datei enthält Standardoptionen für dpkg. Jede Zeile enthält eine "
-"einzelne Option, die exakt die gleiche wie für die normalen Kommandozeilen-"
-"Option von dpkg sind, abgesehen von den einleitenden Gedankenstrichen, die "
-"hier nicht verwendet werden. Kommentare sind durch Einleiten einer Zeile mit "
-"einem Rautenzeichen (\"B<#>\") erlaubt."
+#: dpkg-architecture.1:9
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgstr "B<dpkg-architecture> [I<Optionen>] [I<Aktion>]"
 
 # type: Plain text
-#: dpkg.cfg.5:16
-msgid "I<~/.dpkg.cfg>"
-msgstr "I<~/.dpkg.cfg>"
+#: dpkg-architecture.1:14
+msgid ""
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
+msgstr ""
+"dpkg-architecture stellte eine Möglichkeit bereit, die Rechner-Architektur "
+"für den Paketbau zu bestimmen und zu setzen."
 
 # type: Plain text
-#: dpkg.cfg.5:20
+#: dpkg-architecture.1:17
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
-"Lesen Sie I</usr/share/doc/dpkg/THANKS> für die Liste der Leute, die zu "
-"B<dpkg> beigetragen haben."
+"Die Bau-Architektur wird immer über einen externen Aufruf an B<dpkg>(1) "
+"bestimmt und kann nicht auf der Kommandozeile gesetzt werden."
 
 # type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
-msgstr "B<dpkg>(1)."
+#: dpkg-architecture.1:26
+msgid ""
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
+msgstr ""
+"Sie können die Host-Architektur (Gast-Architektur) spezifizieren, indem Sie "
+"eine oder beide der Optionen B<-a> oder B<-t> verwenden. Der Standardwert "
+"wird über einen externen Aufruf an B<gcc>(1) ermittelt oder ist identisch "
+"mit der Bauarchitektur, falls sowohl \\s-1CC\\s0 als auch Gcc nicht "
+"verfügbar sind. Einer von B<-a> oder B<-t> ist ausreichend, der Wert des "
+"anderen wird auf einen brauchbaren Wert gesetzt. Tatsächlich ist es oft "
+"besser nur einen der beiden anzugeben, da B<dpkg-architecture> Sie warnen "
+"wird, falls Ihre Wahl nicht mit dem Standardwert übereinstimmt."
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
-msgstr "dpkg-checkbuilddeps"
+msgid "COMMANDS"
+msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
+# type: TP
+#: dpkg-architecture.1:28
 #, no-wrap
-msgid "2006-05-23"
-msgstr "2006-05-23"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
-msgstr "dpkg-checkbuilddeps - überprüfe Bauabhängigkeiten und -konflikte"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> B<-B> [I<Kontrolldatei>]"
+msgid "B<-l>"
+msgstr "B<-l>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
+#: dpkg-architecture.1:32
 msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
-"Dieses Programm überprüft die im System installierten Pakete gegen die "
-"Bauabhängigkeiten und Baukonflikte, die in der Kontrolldatei aufgeführt "
-"sind. Falls welche davon nicht erfüllt sind, zeigt es diese an und beendet "
-"sich mit einem von Null verschiedenen Rückgabewert."
+"Zeige die Umgebungsvariablen, eine pro Zeile, in dem Format "
+"I<VARIABLE=Wert>. Dies ist die Standardaktion."
+
+# type: TP
+#: dpkg-architecture.1:32
+#, no-wrap
+msgid "B<-e>I<debian-architecture>"
+msgstr "B<-e>I<Debian-Architektur>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: dpkg-architecture.1:38
+msgid ""
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
-"Standardmäßig wird I<debian/control> gelesen, aber ein alternativer "
-"Kontrolldateiname kann auf der Kommandozeile angegeben werden."
+"Überprüfe auf Gleichheit der Architekturen. Standardmäßig wird I<Debian-"
+"Architektur> gegen die aktuelle Debian-Architektur auf dem Host geprüft. "
+"Diese Aktion expandiert nicht die Architektur-Platzhalter (Wildcards). Der "
+"Befehl beendet sich mit einem Exit-Status von 0, falls eine Übereinstimmung "
+"besteht, andernfalls mit 1."
 
 # type: TP
-#: dpkg-checkbuilddeps.1:17
+#: dpkg-architecture.1:38
 #, no-wrap
-msgid "B<-B>"
-msgstr "B<-B>"
+msgid "B<-i>I<architecture-wildcard>"
+msgstr "B<-i>I<Architektur-Platzhalter>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
+#: dpkg-architecture.1:44
 msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
-"Ignoriere I<Build-Depends-Indep>-Zeilen. Verwenden Sie dies, wenn keine arch-"
-"indep-Pakete gebaut werden."
+"Überprüfe die Identität einer Architektur, indem I<Architektur-Platzhalter> "
+"als einen Architektur-Platzhalter expandiert und mit der aktuellen Debian-"
+"Architektur verglichen wird. Das Kommando endet mit einem Exit-Status von 0, "
+"falls eine Übereinstimmung gefunden wurde, ansonsten mit 1."
 
 # type: TP
-#: dpkg-checkbuilddeps.1:21
+#: dpkg-architecture.1:44
 #, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
+msgid "B<-q>I<variable-name>"
+msgstr "B<-q>I<Variablenname>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
-msgstr "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
+msgstr "Zeige den Wert einer einzelnen Variablen an."
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: TP
+#: dpkg-architecture.1:47
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:joeyh@debian.org"
+msgid "B<-s>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-architecture.1:51
+msgid ""
+"Print an export command. This can be used to set the environment variables "
+"using eval."
+msgstr ""
+"Zeige ein Export-Kommando. Dies kann dazu verwendet werden, um "
+"Umgebungsvariablen mittels eval zu setzen."
 
-# type: TH
-#: dpkg-deb.1:1
+# type: TP
+#: dpkg-architecture.1:51
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
-
-# type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr "dpkg-deb - Debian-Paketarchiv (.deb) Manipulationswerkzeug"
+msgid "B<-u>"
+msgstr "B<-u>"
 
 # type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<Verzeichnis> [I<Archiv>|I<Verzeichnis>]"
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
+msgstr "Zeige ein zu B<-s> ähnliches Kommando, nur lösche alle Variablen."
 
-# type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<Archiv> [I<Kontrolldatei-Name> ..]"
+# type: TP
+#: dpkg-architecture.1:54
+#, no-wrap
+msgid "B<-c>I< command>"
+msgstr "B<-c>I< Befehl>"
 
 # type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<Archiv> [I<Kontrollfeld-Name> ...]"
+#: dpkg-architecture.1:58
+msgid ""
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
+msgstr ""
+"Führe einen I<Befehl> in einer Umgebung aus, in der alle Variablen auf die "
+"festgelegten Werte gesetzt sind."
 
-# type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<Archiv>"
+# type: TP
+#: dpkg-architecture.1:58
+#, no-wrap
+msgid "B<-L>"
+msgstr "B<-L>"
 
 # type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<Format>] I<Archiv>"
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
+msgstr "Zeige eine Liste von gültigen Architekturnamen."
 
-# type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
-msgstr ""
-"B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<Archiv-Verzeichnis>"
+# type: TP
+#: dpkg-architecture.1:69
+#, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<-a>I<Debian-Architektur>"
 
 # type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb> B<-e>|B<--control> I<Archiv-Verzeichnis>"
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr "Setze die Debian-Architektur."
 
-# type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<Archiv>"
+# type: TP
+#: dpkg-architecture.1:72
+#, no-wrap
+msgid "B<-t>I<gnu-system-type>"
+msgstr "B<-t>I<GNU-Systemtyp>"
 
 # type: Plain text
-#: dpkg-deb.1:39
-msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
-msgstr ""
-"B<dpkg-deb> packt und entpackt Debian-Archive und stellt Informationen über "
-"sie breit."
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
+msgstr "Setzt den GNU-Systemtyp."
 
-# type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:75
+#, no-wrap
+msgid "B<-f>"
+msgstr "B<-f>"
 
 # type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-architecture.1:82
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
+"Existierende Umgebungsvariablen mit dem gleichen Namen wie vom Skript "
+"verwendet werden nicht überschrieben (d.h. sie werden von B<dpkg-"
+"architecture> verwendet), es sei denn, die »force«-Markierung ist gesetzt. "
+"Dies erlaubt es dem Benutzer einen Wert zu überschreiben, selbst wenn der "
+"Aufruf von B<dpkg-architecture> tief in einem anderen Skript versteckt ist "
+"(beispielsweise B<dpkg-buildpackage>(1))."
 
 # type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
+#: dpkg-architecture.1:83
 #, no-wrap
-msgid "ACTION OPTIONS"
-msgstr ""
+msgid "TERMS"
+msgstr "AUSDRÜCKE"
 
-# type: TP
-#: dpkg-deb.1:54
+# type: IP
+#: dpkg-architecture.1:84
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr ""
+msgid "build machine"
+msgstr "Baumaschine"
 
 # type: Plain text
-#: dpkg-deb.1:66
-msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
-msgstr ""
+#: dpkg-architecture.1:86
+msgid "The machine the package is built on."
+msgstr "Die Maschine, auf der das Paket gebaut wird."
+
+# type: IP
+#: dpkg-architecture.1:86
+#, no-wrap
+msgid "host machine"
+msgstr "Host-Maschine"
 
 # type: Plain text
-#: dpkg-deb.1:72
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
-msgstr ""
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
+msgstr "Die Maschine, für die das Paket gebaut ist."
+
+# type: IP
+#: dpkg-architecture.1:88
+#, no-wrap
+msgid "Debian architecture"
+msgstr "Debian-Architektur"
 
 # type: Plain text
-#: dpkg-deb.1:84
+#: dpkg-architecture.1:91
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
+"Die Debian-Architektur-Zeichenkette, die den binären Baum im \\s-1FTP\\s0-"
+"Archiv spezifiziert. Beispiele: i386, sparc, hurd-i386."
+
+# type: IP
+#: dpkg-architecture.1:91
+#, no-wrap
+msgid "architecture wildcard"
+msgstr "Architektur-Platzhalter"
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:95
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgstr ""
+"Ein Architektur-Platzhalter ist eine spezielle Architektur-Zeichenkette, die "
+"auf jede reale Architektur, die ein Teil davon ist, passt. Die allgemeine "
+"Form ist E<lt>KernE<gt>-E<lt>CPUE<gt>. Beispiele: linux-any, any-i386, hurd-"
+"any."
 
-# type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr ""
+# type: IP
+#: dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
+msgstr "\\s-1GNU\\s0-Systemtyp"
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:99
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
+"Eine Architektur-Spezifikations-Zeichenkette besteht aus zwei, durch einen "
+"Bindestrich getrennten Teilen: CPU und System. Beispiele: i386-linux-gnu, "
+"sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
+# type: SH
+#: dpkg-architecture.1:100
 #, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr ""
+msgid "VARIABLES"
+msgstr "VARIABLEN"
 
 # type: Plain text
-#: dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
-msgstr ""
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
+msgstr "Die folgenden Variablen werden von B<dpkg-architecture> gesetzt:"
+
+# type: IP
+#: dpkg-architecture.1:102
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:117
-msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
-msgstr ""
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
+msgstr "Die Debian-Architektur der Baumaschine."
+
+# type: IP
+#: dpkg-architecture.1:104
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:125
-msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
-msgstr ""
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
+msgstr "Der Debian-Systemname der Baumaschine."
 
-# type: TP
-#: dpkg-deb.1:125
+# type: IP
+#: dpkg-architecture.1:106
 #, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr ""
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgstr "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:132
-msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
-msgstr ""
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr "Der Debian-CPU-Name der Baumaschine."
 
-# type: TP
-#: dpkg-deb.1:132
+# type: IP
+#: dpkg-architecture.1:108
 #, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr ""
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
-msgstr ""
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
+msgstr "Der \\s-1GNU\\s0-Systemname der Baumaschine."
 
-# type: Plain text
-#: dpkg-deb.1:139
-msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
-msgstr ""
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:148
-msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
-msgstr ""
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr "Der \\s-1CPU\\s0-Teil von \\s-1DEB_BUILD_GNU_TYPE\\s0"
+
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
-msgstr ""
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+msgstr "Der System-Teil von \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
-# type: TP
-#: dpkg-deb.1:150
+# type: IP
+#: dpkg-architecture.1:114
 #, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr ""
+msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:156
-msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
-msgstr ""
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
+msgstr "Die Debian-Architektur der Host-Maschine."
 
-# type: TP
-#: dpkg-deb.1:156
+# type: IP
+#: dpkg-architecture.1:116
 #, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr ""
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:160
-msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
-msgstr ""
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
+msgstr "Der Debian-Systemname der Host-Maschine."
+
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:165
-msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
-msgstr ""
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
+msgstr "Der Debian-CPU-Name der Host-Maschine."
+
+# type: IP
+#: dpkg-architecture.1:120
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:171
-msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
-msgstr ""
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
+msgstr "Der \\s-1GNU\\s0-Systemtyp der Host-Maschine."
+
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr ""
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr "Der \\s-1CPU\\s0-Teil von \\s-1DEB_HOST_GNU_TYPE\\s0."
 
-# type: TP
-#: dpkg-deb.1:174
+# type: IP
+#: dpkg-architecture.1:124
 #, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr ""
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: dpkg-deb.1:182
-msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
-msgstr ""
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr "Der System-Teil von \\s-1DEB_HOST_GNU_TYPE\\s0."
 
-# type: TP
-#: dpkg-deb.1:182
+# type: SH
+#: dpkg-architecture.1:127
 #, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr ""
+msgid "DEBIAN/RULES"
+msgstr "DEBIAN/RULES"
 
 # type: Plain text
-#: dpkg-deb.1:186
+#: dpkg-architecture.1:135
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
+"Die Umgebungsvariablen, die von B<dpkg-architecture> gesetzt werden, werden "
+"an I<debian/rules> als Make-Variablen weitergegeben (lesen Sie hierzu die "
+"Make-Dokumentation). Allerdings sollten Sie sich nicht auf diese verlassen, "
+"da damit der manuelle Aufruf des Skripts verhindert wird. Stattdessen "
+"sollten Sie sie immer mit B<dpkg-architecture> mit der -q-Option "
+"initialisieren. Hier sind einige Beispiele, die auch zeigen, wie sie die "
+"Cross-Kompilierungs-Unterstützung in Ihrem Paket verbessern können:"
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
-msgstr ""
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
+msgstr "Anstatt von:"
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 
-# type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
+# type: Plain text
+#: dpkg-architecture.1:145
+msgid "please use the following:"
+msgstr "verwenden Sie bitte das folgende:"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#: dpkg-architecture.1:149
+#, no-wrap
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
-"Gibt einen Bedienungshinweis, mit einer Zusammenfassung seiner Optionen und "
-"deren Verwendungen, aus."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 # type: Plain text
-#: dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Gibt B<dpkg-deb>'s Versionsnummer aus."
-
-# type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
+#: dpkg-architecture.1:151
 #, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-architecture.1:161
+#, no-wrap
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
-#, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "ANDERE OPTIONEN"
+# type: Plain text
+#: dpkg-architecture.1:164
+msgid "please use:"
+msgstr "bitte verwenden Sie:"
 
-# type: TP
-#: dpkg-deb.1:211
+# type: Plain text
+#: dpkg-architecture.1:167
 #, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr ""
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgstr "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
+#: dpkg-architecture.1:171
+#, no-wrap
 msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-architecture.1:175
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
+"oder, falls Sie nur den CPU- oder OS-Typ überprüfen müssen, verwenden Sie "
+"die DEB_HOST_ARCH_CPU- oder DEB_HOST_ARCH_OS-Variablen."
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+#: dpkg-architecture.1:180
+msgid ""
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
+"Im allgemeinen wird der Aufruf von Dpkg in der »rules«-Datei, um Architektur-"
+"Informationen zu erhalten, abgelehnt (falls Sie Rückwärtskompatibilität "
+"bereitstellen wollen, siehe unten). Insbesondere die --print-architecture-"
+"Option ist unzuverlässig, da wir Debian-Architekturen haben, die nicht mit "
+"einem Prozessornamen übereinstimmen."
 
-# type: TP
-#: dpkg-deb.1:227
+# type: SH
+#: dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--new>"
-msgstr ""
+msgid "BACKWARD COMPATIBILITY"
+msgstr "RÜCKWÄRTSKOMPATIBILITÄT"
 
 # type: Plain text
-#: dpkg-deb.1:232
+#: dpkg-architecture.1:187
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
-msgstr ""
-
-# type: TP
-#: dpkg-deb.1:232
-#, no-wrap
-msgid "B<--old>"
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
+"Die DEB_HOST_ARCH_CPU- und DEB_HOST_ARCH_OS-Variablen wurden erst in einer "
+"relativ neuen Version von B<dpkg-architecture> eingeführt (seit Dpkg "
+"1.13.2), vorher tendierten die I<debian/rules>-Dateien dazu, die Werte der "
+"DEB_HOST_GNU_CPU- oder DEB_HOST_GNU_TYPE-Variablen zu überprüfen, die aber "
+"Änderungen unterlagen."
 
 # type: Plain text
-#: dpkg-deb.1:240
+#: dpkg-architecture.1:192
 msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
+"Wo I<debian/rules>-Dateien diese Variablen überprüfen um festzustellen, wie "
+"oder was zu kompilieren ist, sollten diese aktualisiert werden, um die neuen "
+"Variablen und Werte zu verwenden. Sie möchten eventuell "
+"Rückwärtskompatibilität zu älteren Versionen von Dpkg-dev erhalten, indem "
+"Sie den folgenden Code verwenden:"
 
 # type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-architecture.1:196
+#, no-wrap
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 msgstr ""
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
-# type: TP
-#: dpkg-deb.1:246
+# type: Plain text
+#: dpkg-architecture.1:210
 #, no-wrap
-msgid "B<--debug>, B<-D>"
+msgid ""
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
+"# Berücksichtige die Ausgabe des alten Dpkg-architecture.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 
 # type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
-msgstr ""
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+msgstr "Und ähnlich für DEB_BUILD_ARCH_CPU und DEB_BUILD_ARCH_OS."
 
 # type: Plain text
-#: dpkg-deb.1:254
+#: dpkg-architecture.1:216
 msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
-msgstr "B<dpkg-deb -I> I<paket1>B<.deb> I<paket2>B<.deb> macht das Falsche."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
+msgstr ""
+"Falls Sie noch Versionen von Dpkg-dev, die B<dpkg-architecture> nicht "
+"enthielten, unterstützen wollen, erledigt dies folgendes:"
 
 # type: Plain text
-#: dpkg-deb.1:258
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
-"Es gibt keine Authentifizierung von  B<.deb>-Dateien; in der Tat, gibt es "
-"sogar noch nicht mal eine direkte Prüfsumme."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-architecture.1:231
+#, no-wrap
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 msgstr ""
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-
-# type: Plain text
-#: dpkg-deb.1:278
-#, fuzzy
+#: dpkg-architecture.1:235
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
-"B<dpkg-deb> und diese Handbuchseite wurden von Ian Jackson geschrieben. Sie "
-"unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der GNU "
-"General Public License Version veröffentlicht; es gibt KEINE HAFTUNG. Lesen "
-"Sie I</usr/share/doc/dpkg/copyright> und I</usr/share/common-licenses/GPL> "
-"für Details."
-
-# type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "dpkg-divert"
-msgstr "dpkg-divert"
-
-# type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
-msgstr "dpkg-divert - Hinwegsetzen über die Paketversion einer Datei"
-
-# type: Plain text
-#: dpkg-divert.8:10
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<Optionen>] [B<--add>] I<E<lt>DateiE<gt>>"
-
-# type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<Optionen>] B<--remove> I<E<lt>DateiE<gt>>"
-
-# type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr "B<dpkg-divert> [I<Optionen>] B<--list> I<E<lt>Glob-MusterE<gt>>"
-
-# type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<Optionen>] B<--truename> I<E<lt>DateiE<gt>>"
+"Setzen Sie eine Untermenge dieser Zeilen oben in Ihre debian/rules-Datei; "
+"diese Standardwerte werden überschrieben, falls Dpkg-architecture verwendet "
+"wird."
 
 # type: Plain text
-#: dpkg-divert.8:36
+#: dpkg-architecture.1:242
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
-"Datei »Diversionen« (Umlenkungen) sind eine Möglichkeit, B<dpkg>(1) dazu zu "
-"zwingen, eine Datei nicht an ihren Standardplatz, sondern an einem "
-"»umgelenkten« Ort zu installieren. Umlenkungen können innerhalb der Debian-"
-"Paketskripte verwendet werden, um eine Datei beiseitezuschieben, wenn sie "
-"einen Konflikt auslöst. Systemadministratoren können sie auch verwenden, um "
-"sich über die Konfigurationsdateien einiger Pakete hinwegzusetzen, oder wann "
-"immer einige Dateien (die nicht als »Conffiles« markiert sind) von Dpkg "
-"erhalten werden müssen, wenn eine neuere Version eines Paketes, die diese "
-"Dateien enthält, installiert wird."
+"Sie benötigen nicht den ganzen Satz. Wählen Sie einen konsistenten Satz, der "
+"nur die Werte enthält, die Sie in der rules-Datei verwenden. Falls Sie "
+"beispielsweise nur die Host-Debian-Architektur benötigen, ist »DEB_HOST_ARCH="
+"\\`dpkg --print-architecture\\ ausreichend (dies ist in der Tat die Debian-"
+"Architektur der Baumaschine, aber denken Sie daran, dass wir nur zur "
+"»natürlichen« Kompilierung rückwärtskompatibel sein wollen)."
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-architecture.1:245
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
-"B<dpkg-divert> ist das Hilfswerkzeug, das dazu verwendet wird, die Liste der "
-"Umleitungen zu erstellen und zu aktualisieren. Es funktioniert in drei "
-"grundlegenden Modi: Hinzufügen, Entfernen und Auflisten von Umleitungen. Die "
-"Optionen sind respektive B<--add>, B<--remove> und B<--list>. Zusätzlich "
-"kann es den echten Namen für eine umgeleitete Datei mit B<--truename> "
-"ausgeben. Andere Optionen (unten aufgeführt) können auch angegeben werden."
-
-# type: TP
-#: dpkg-divert.8:45 dselect.1:52
-#, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>VerzeichnisE<gt>>"
+"Die B<-e>- und B<-i>-Optionen wurden erst in relativ neuen Versionen von "
+"B<dpkg-architecture> eingeführt (seit Dpkg 1.13.13)."
 
 # type: Plain text
-#: dpkg-divert.8:48
+#: dpkg-architecture.1:249
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
-"Setze das Dpkg-Datenverzeichnis auf I<E<lt>VerzeichnisE<gt>> (Standard: I</"
-"var/lib/dpkg>)."
-
-# type: TP
-#: dpkg-divert.8:48
-#, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<--divert>I< E<lt>UmlenkzielE<gt>>"
+"B<dpkg-buildpackage> akzeptiert die B<-a>-Option und gibt dies an B<dpkg-"
+"architecture> weiter. Weitere Beispiele:"
 
 # type: Plain text
-#: dpkg-divert.8:52
-msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 msgstr ""
-"E<lt>UmlenkzielE<gt>> ist der Zielort, wo die Versionen der "
-"I<E<lt>DateiE<gt>>, wie sie von anderen Paketen bereitgestellt wird, hin "
-"umgelenkt wird."
+"CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 
-# type: TP
-#: dpkg-divert.8:52
-#, no-wrap
-msgid "B<--local>"
-msgstr "B<--local>"
+# type: Plain text
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
 
 # type: Plain text
-#: dpkg-divert.8:58
+#: dpkg-architecture.1:256
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
-"Gibt an, dass alle Versionen dieser Datei umgeleitet sind. Dies bedeutet, "
-"dass es keine Ausnahmen gibt, und egal was für ein Paket auch installiert "
-"ist, die Datei ist umgeleitet. Dies kann vom Administrator verwendet werden, "
-"um eine lokal geänderte Version zu installieren."
+"Überprüfe, ob eine Architektur identisch zu der aktuellen Architektur oder "
+"einer übergebenen ist:"
 
-# type: TP
-#: dpkg-divert.8:58
-#, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<--package>I< E<lt>PaketE<gt>>"
+# type: Plain text
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
+msgstr "dpkg-architecture -elinux-alpha"
+
+# type: Plain text
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
+msgstr "dpkg-architecture -amips -elinux-mips"
 
 # type: Plain text
-#: dpkg-divert.8:63
+#: dpkg-architecture.1:263
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
-"I<E<lt>PaketE<gt>> ist der Name des Pakets, dessen Kopie von "
-"I<E<lt>DateiE<gt>> nicht umgeleitet wird, d.h. I<E<lt>DateiE<gt>> wird für "
-"alle Pakete außer I<E<lt>PaketE<gt>> umgeleitet."
-
-# type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
-#, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+"Überprüfe, ob die aktuelle oder eine mit -a übergebene Architektur Linux-"
+"Systeme sind:"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
-msgstr "Ruhiger Modus, d.h. keine langatmige Ausgabe."
-
-# type: TP
-#: dpkg-divert.8:66
-#, no-wrap
-msgid "B<--rename>"
-msgstr "B<--rename>"
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
+msgstr "dpkg-architecture -ilinux-any"
 
 # type: Plain text
-#: dpkg-divert.8:70
-msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
-msgstr ""
-"Schiebe die Dateien tatsächlich beiseite (oder zurück). dpkg-divert wird den "
-"Arbeitsvorgang abbrechen, falls die Zieldatei bereits existiert."
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
+msgstr "dpkg-architecture -ai386 -ilinux-any"
 
-# type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
-#, no-wrap
-msgid "B<--test>"
-msgstr "B<--test>"
+# type: Plain text
+#: dpkg-architecture.1:271
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: dpkg-architecture.1:276
+msgid ""
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
-"Testmodus, d.h. führe keine Änderungen durch, sondern zeige sie lediglich."
+"B<dpkg-architecture> und diese Handbuchseite wurden ursprünglich von Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt> geschrieben."
 
-# type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
-msgstr "Gebe kurze Bedienungsanweisungen aus und beende sich erfolgreich."
+# type: TH
+#: dpkg.cfg.5:1
+#, no-wrap
+msgid "dpkg.cfg"
+msgstr "dpkg.cfg"
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
-msgstr "Gibt Programmnamen und Version aus und beende sich erfolgreich"
-
-# type: SH
-#: dpkg-divert.8:80
-#, no-wrap
-msgid "NOTES"
-msgstr "BEMERKUNGEN"
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
+msgstr "dpkg.cfg - dpkg Konfigurationsdatei"
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg.cfg.5:11
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
-"Beim Hinzufügen ist die Standardeinstellung B<--local> und B<--divert> "
-"I<E<lt>OriginalnameE<gt>.distrib>. Beim Entfernen müssen, falls angegeben, "
-"B<--package> oder B<--local> und B<--divert> übereinstimmen."
+"Diese Datei enthält Standardoptionen für dpkg. Jede Zeile enthält eine "
+"einzelne Option, die exakt die gleiche wie für die normalen Kommandozeilen-"
+"Option von dpkg sind, abgesehen von den einleitenden Gedankenstrichen, die "
+"hier nicht verwendet werden. Kommentare sind durch Einleiten einer Zeile mit "
+"einem Rautenzeichen (\"B<#>\") erlaubt."
 
 # type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
-msgstr "Verzeichnisse können mit B<dpkg-divert> nicht umgeleitet werden."
+#: dpkg.cfg.5:16
+msgid "I<~/.dpkg.cfg>"
+msgstr "I<~/.dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg.cfg.5:20
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
-"Vorsicht sollte beim Umleiten von Laufzeit-Bibliotheken walten gelassen "
-"werden, da B<ldconfig>(8) einen symbolischen Link, basierend auf dem in der "
-"Bibliothek eingebetteten DT_SONAME-Feld erstellt. Da ldconfig keine "
-"Umleitungen anerkennt (nur Dpkg tut dies), kann der Symlink am Ende auf die "
-"umgeleitete Bibliothek zeigen, falls die umgeleitete Bibliothek den gleichen "
-"SONAME wie die nicht-umgeleitete hat."
+"Lesen Sie I</usr/share/doc/dpkg/THANKS> für die Liste der Leute, die zu "
+"B<dpkg> beigetragen haben."
 
 # type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
-msgstr ""
-"Um alle Kopien von I</usr/bin/example> auf I</usr/bin/example.foo> "
-"umzuleiten, d.h. alle Pakete, die I</usr/bin/example> zur Verfügung stellen, "
-"dazu anzuleiten, diese Datei stattdessen als I</usr/bin/example.foo> zu "
-"installieren und die Umbenennung, falls notwendig, durchzuführen:"
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
+msgstr "B<dpkg>(1)."
 
-# type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
-msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+# type: TH
+#: dpkg-buildpackage.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
-msgstr "Um diese Umleitung zu entfernen:"
+#: dpkg-buildpackage.1:4
+#, fuzzy
+msgid "dpkg-buildpackage - build source packages"
+msgstr "dpkg-scanpackages - erstelle Packages-Dateien"
 
 # type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:8
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg-buildpackage> [I<Optionen>]"
 
 # type: Plain text
-#: dpkg-divert.8:107
+#: dpkg-buildpackage.1:13
 msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"Um für jedes Paket - außer Ihrem eigenen I<wibble>-Paket -, das versucht, I</"
-"usr/bin/example> zu installieren, dieses auf I</usr/bin/example.foo> "
-"umzulenken:"
+"B<dpkg-buildpackage> ist ein Kontrollskript das zu Automatisierung des "
+"Bauens von Paketen verwendet werden kann."
 
-# type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+# type: TP
+#: dpkg-buildpackage.1:15
+#, no-wrap
+msgid "B<-b>"
 msgstr ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:19
+msgid ""
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
+msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
 #, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/diversions>"
+msgid "B<-B>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:23
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
-"Datei, die die aktuelle Liste von Umleitungen des Systems enthält. Sie "
-"befindet sich im Dpkg-Administrationsverzeichnis, zusammen mit anderen für "
-"Dpkg wichtigen Dateien, wie »status« oder »available«."
+
+# type: TP
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:123
-msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+#: dpkg-buildpackage.1:26
+msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
-"Hinweis: B<dpkg-divert> erhält die alte Kopie dieser Datei, mit der Endung »-"
-"old«, bevor es sie mit der neuen ersetzt."
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr "Copyright (C) 1995 Ian Jackson."
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
+#, fuzzy
+msgid ""
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
+msgstr ""
+"Diese Optionen kontrollieren, ob das Original-Quellarchiv dem durch B<dpkg-"
+"buildpackage> und B<dpkg-genchanges> generierten Upload hinzugefügt wird, "
+"falls die Quellen erzeugt werden (d.h. B<-b> or B<-B> nicht verwendet "
+"wurden)."
 
-# type: TH
-#: dpkg-name.1:6
-#, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-name"
+# type: TP
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
-msgstr "dpkg-name - Debian-Pakete zu vollen Paketnamen umbenennen"
+#: dpkg-buildpackage.1:40
+#, fuzzy
+msgid ""
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
+msgstr ""
+"Standardmäßig, oder falls B<-si> angegeben wird, werden die Originalquellen "
+"hinzugefügt, falls die Versionsnummer auf B<-0> oder B<-1> endet, d.h. der "
+"Debian-Revisionsanteil der Versionsnummer ist B<0> oder B<1>."
+
+# type: TP
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-name.1:22
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<Verzeichnis>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
-"B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<Dateien>]"
+
+# type: TP
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-name.1:33
-msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
-"Diese Handbuchseite dokumentiert das B<dpkg-name> sh-Skript, dass eine "
-"einfache Möglichkeit bereitstellt, B<Debian>-Pakete in ihren vollen "
-"Paketnamen umzubenennen. Ein voller Paketname besteht aus "
-"E<lt>Paket<gt>_E<lt>Version<gt>_E<lt>ArchitekturE<gt>.deb wie in der "
-"Kontrolldatei des Pakets spezifiziert. Der E<lt>VersionE<gt>-Teil des "
-"Dateinamens besteht aus der Versionsinformation der Originalautoren optional "
-"gefolgt von einem Gedankenstrich und der Revisionsinformation."
 
 # type: TP
-#: dpkg-name.1:34
+#: dpkg-buildpackage.1:46
 #, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<-a, --no-architecture>"
+msgid "B<-a>I<architecture>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
-msgstr "Der Zieldateiname wird keine Architekturinformation enthalten."
+#: dpkg-buildpackage.1:51
+msgid ""
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
+msgstr ""
 
 # type: TP
-#: dpkg-name.1:37
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
 #, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<-k, --symlink>"
+msgid "B<-v>I<version>"
+msgstr "B<-v>I<Version>"
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
-msgstr "Erstelle einen Symlink, anstatt zu verschieben."
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
+#, fuzzy
+msgid ""
+"Use changelog information from all versions strictly later than I<version>."
+msgstr ""
+"Dies führt in B<dpkg-buildpackage>, B<dpkg-genchanges> und B<dpkg-"
+"parsechangelog> dazu, dass »changelog«-Informationen von allen Versionen, "
+"die strikt neuer als I<Version> sind, verwendet wird."
 
 # type: TP
-#: dpkg-name.1:40
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
 #, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<-o, --overwrite>"
+msgid "B<-C>I<changesdescription>"
+msgstr "B<-C>I<Änderungsbeschreibung>"
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+#, fuzzy
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
-"Existierende Dateien werden überschrieben, falls sie den gleichen Namen wie "
-"der Zieldateiname haben."
+"Lese die Beschreibung der Änderungen aus der Datei I<Änderungsbeschreibung> "
+"anstat die Informationen aus dem changelog-Datei des Quellbaums zu verwenden."
+"Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> verstanden."
 
 # type: TP
-#: dpkg-name.1:44
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<-s, --subdir> [I<Verzeichnis>]"
+msgid "B<-m>I<maintaineraddress>"
+msgstr "B<-m>I<Betreueradresse>"
 
 # type: Plain text
-#: dpkg-name.1:56
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, fuzzy
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
-"Dateien werden in ein Unterverzeichnis verschoben. Falls das als Argument "
-"existierende Verzeichnis existiert, dann werden die Dateien in das "
-"Verzeichnis verschoben, andernfalls wird das Zielverzeichnis aus dem Section-"
-"Feld des Kontrollteils des Pakets extrahiert. Das Zielverzeichnis wird "
-"»unstable/binary-E<lt>ArchitekturE<gt>/E<lt>Bereich<gt>« sein. Falls der "
-"Bereich nicht in der Kontrolldatei gefunden werden kann, dann wird »no-"
-"section« angenommen, und in diesem Fall, wie auch für die Bereiche »non-"
-"free« und »contrib« ist das Zielverzeichnis »E<lt>Bereich<gt>/binary-"
-"E<lt>ArchitekturE<gt>«. Das Bereichsfeld muss nicht angegeben werden, daher "
-"werden viele Pakete ihren Weg in das »no-section«-Gebiet finden. Verwenden "
-"Sie diese Option mit Vorsicht, sie ist unordentlich."
+"Verwende I<Betreueradresse> als Namen und Adresse des Betreuers diese "
+"Paketes, anstatt die Informationen aus der »control« des Quellbaums zu "
+"verwenden. Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> "
+"verstanden."
 
 # type: TP
-#: dpkg-name.1:56
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr "B<-c, --create-dir>"
+msgid "B<-e>I<maintaineraddress>"
+msgstr "B<-e>I<Betreueradresse>"
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
+#, fuzzy
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
-"Diese Option kann zusammen mit der -s-Option verwendet werden. Falls das "
-"Zielverzeichnis nicht gefunden werden kann, wird es automatisch erstellt. "
-"B<Verwenden Sie diese Option mit Vorsicht.>"
+"Verwende I<Betreueradresse> als Namen und E-Mail-Adresse des Betreuers für "
+"diesen Upload anstatt die Informationen aus der »changelog« des Quellbaums "
+"zu verwenden. Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> "
+"verstanden."
 
 # type: TP
-#: dpkg-name.1:61
+#: dpkg-buildpackage.1:72
 #, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<-h, --help>"
+msgid "B<-D>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
-msgstr "Gebe einen Bedienungshinweis aus und beende sich erfolgreich."
+#: dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
+msgstr ""
 
 # type: TP
-#: dpkg-name.1:64
+#: dpkg-buildpackage.1:75
 #, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<-v, --version>"
+msgid "B<-d>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-msgid "Print version information and exit successfully."
-msgstr "Gebe Versionsinformationen aus und beende sich erfolgreich."
+#: dpkg-buildpackage.1:78
+msgid "Do not check build dependencies and conflicts."
+msgstr ""
 
 # type: TP
-#: dpkg-name.1:67
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<-l, --license>"
+msgid "B<-W>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-buildpackage.1:84
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Gebe Copyright-Informationen aus und (eine Referenz auf GNU-)"
-"Lizenzinformationen und beende sich erfolgreich."
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
-msgstr "B<dpkg-name bar-foo.deb>"
+msgid "B<-E>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-buildpackage.1:92
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Die Datei »bar-foo.deb« wird in bar-foo_1.0-2_i386.deb oder etwas ähnliches "
-"(abhängig von der Information, die in dem Kontrollteil von »bar-foo.deb« "
-"ist) umbenannt."
 
 # type: TP
-#: dpkg-name.1:77
+#: dpkg-buildpackage.1:92
 #, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
-msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgid "B<-nc>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:82
-msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
-"Alle Dateien mit der Endung »deb« im Verzeichnis /root/debian und seiner "
-"Unterverzeichnisse werden von dpkg-name - falls notwendig - ohne "
-"Architekturinformation umbenannt."
 
 # type: TP
-#: dpkg-name.1:82
+#: dpkg-buildpackage.1:95
 #, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
-msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgid "B<-tc>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-buildpackage.1:101
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
-"B<Machen Sie dies nicht.> Ihr Archiv wird eine komplette Schweinerei werden, "
-"da viele Pakete nicht mit Bereichsinformationen kommen. B<Machen Sie dies "
-"nicht.>"
 
 # type: TP
-#: dpkg-name.1:88
+#: dpkg-buildpackage.1:101
 #, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-
-# type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
-msgstr "Dies kann beim Bau neuer Pakete verwendet werden."
-
-# type: Plain text
-#: dpkg-name.1:100
-msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
-"Einige Pakete folgen nicht der Namensstruktur "
-"E<lt>Paket<gt>_E<lt>VersionE<gt>_E<lt>ArchitekturE<gt>.deb. Pakete, die von "
-"dpkg-name umbenannt wurden, folgen dieser Struktur. Im allgemeinen hat diese "
-"keinen Einfluss darauf, wie Pakete von B<dselect>(1)/B<dpkg>(1) installiert "
-"werden, aber andere Installationswerkzeuge können von dieser "
-"Benennungsstruktur abhängen."
 
 # type: Plain text
-#: dpkg-name.1:107
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
 msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
+# type: TP
+#: dpkg-buildpackage.1:127
 #, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
+msgid "B<-p>I<sign-command>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-buildpackage.1:152
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
-"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> ist Freie Software; "
-"lesen Sie die GNU General Public License Version 2 oder neuer für die "
-"Kopierbedingungen. Es gibt B<keine> Haftung."
 
-# type: TH
-#: dpkg-query.1:1
+# type: TP
+#: dpkg-buildpackage.1:152
 #, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-query"
+msgid "B<-k>I<key-id>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
+#: dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<-s>"
+
 # type: Plain text
-#: dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#: dpkg-buildpackage.1:158
+msgid "Do not sign the source package."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<-u>"
+
 # type: Plain text
-#: dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:17
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:21
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<[--] >I<Dateiname>"
+
 # type: Plain text
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:29
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+# type: TP
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
+#, no-wrap
+msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:32
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg-query> B<--licence>|B<--license>"
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
+msgid ""
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
+msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:35
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg-query> B<--version>"
+# type: TP
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
+#, fuzzy, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr "B<-h>,B<--help>"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-buildpackage.1:185
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
-msgstr ""
+# type: Plain text
+#: dpkg-buildpackage.1:192
+#, fuzzy
+msgid ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
 
-# type: TP
-#: dpkg-query.1:41
+# type: TH
+#: dpkg-checkbuilddeps.1:1
 #, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr ""
+msgid "dpkg-checkbuilddeps"
+msgstr "dpkg-checkbuilddeps"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+msgstr "dpkg-checkbuilddeps - überprüfe Bauabhängigkeiten und -konflikte"
 
 # type: Plain text
-#: dpkg-query.1:50
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> B<-B> [I<Kontrolldatei>]"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:14
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
+"Dieses Programm überprüft die im System installierten Pakete gegen die "
+"Bauabhängigkeiten und Baukonflikte, die in der Kontrolldatei aufgeführt "
+"sind. Falls welche davon nicht erfüllt sind, zeigt es diese an und beendet "
+"sich mit einem von Null verschiedenen Rückgabewert."
 
 # type: Plain text
-#: dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+#: dpkg-checkbuilddeps.1:17
+msgid ""
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
+"Standardmäßig wird I<debian/control> gelesen, aber ein alternativer "
+"Kontrolldateiname kann auf der Kommandozeile angegeben werden."
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-checkbuilddeps.1:27
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
+"Ignoriere I<Build-Depends-Indep>-Zeilen. Verwenden Sie dies, wenn keine arch-"
+"indep-Pakete gebaut werden."
 
 # type: TP
-#: dpkg-query.1:60
+#: dpkg-checkbuilddeps.1:27
 #, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr ""
+msgid "B<-h>"
+msgstr "B<-h>"
 
 # type: Plain text
-#: dpkg-query.1:67
-msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
-msgstr ""
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
 
-# type: TP
-#: dpkg-query.1:67
+# type: UR
+#: dpkg-checkbuilddeps.1:33
 #, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:joeyh@debian.org"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>joeyh@debian.orgE<gt>."
+
+# type: TH
+#: dpkg-distaddfile.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-distaddfile"
+msgstr "dpkg-statoverride"
+
+# type: Plain text
+#: dpkg-distaddfile.1:4
+#, fuzzy
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
+"B<dpkg-distaddfile> fügte einen Eintag für eine benannte Datei in B<debian/"
+"files> hinzu."
 
 # type: Plain text
-#: dpkg-query.1:71
-msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+#: dpkg-distaddfile.1:8
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg-distaddfile> [I<Optionen>]I< Dateiname Bereich Priorität>"
+
+# type: Plain text
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
+"B<dpkg-distaddfile> fügte einen Eintag für eine benannte Datei in B<debian/"
+"files> hinzu."
 
-# type: TP
-#: dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
+# type: Plain text
+#: dpkg-distaddfile.1:18
+msgid ""
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-distaddfile.1:26
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:76
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
+msgid "B<-f>I<fileslistfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:82
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr ""
+msgid "B<debian/files>"
+msgstr "B<debian/files>"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-distaddfile.1:46
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:86
+# type: TH
+#: dpkg-deb.1:1
 #, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence> | B<--license>"
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
 
-# type: Plain text
-#: dpkg-query.1:89
-msgid "Display licence and copyright information."
-msgstr "Gebe Lizenz- und Copyright-Informationen aus."
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "2006-06-17"
 
 # type: Plain text
-#: dpkg-query.1:92
-msgid "Display version information."
-msgstr "Gibt Versionsinformationen aus."
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr "dpkg-deb - Debian-Paketarchiv (.deb) Manipulationswerkzeug"
 
-# type: TP
-#: dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:13
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
+"B<dpkg-deb> packt und entpackt Debian-Archive und stellt Informationen über "
+"sie breit."
 
-# type: TP
-#: dpkg-query.1:98
-#, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+#: dpkg-deb.1:27
+msgid ""
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:29
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<Verzeichnis> [I<Archiv>|I<Verzeichnis>]"
+
+# type: Plain text
+#: dpkg-deb.1:41
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:53
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:60
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:78
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
-msgstr ""
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<Archiv> [I<Kontrolldatei-Name> ..]"
 
-# type: SH
-#: dpkg-query.1:167
-#, no-wrap
-msgid "ENVIRONMENT"
+# type: Plain text
+#: dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-deb.1:86
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
+#: dpkg-deb.1:94
+msgid ""
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
 
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:wakkerma@debian.org"
-
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
-msgstr "dpkg-scanpackages"
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<Archiv>"
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#, no-wrap
-msgid "2006-05-10"
-msgstr "2006-05-10"
+# type: Plain text
+#: dpkg-deb.1:101
+msgid ""
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
-msgstr "dpkg-scanpackages - erstelle Packages-Dateien"
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<Archiv> [I<Kontrollfeld-Name> ...]"
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
-msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#: dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
 msgstr ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>ArchE<gt>> ] [B<-m>] I<Binärverz> "
-"I<Overridedatei> [I<Pfadpräfix>] B<E<gt>> I<Packages>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:43
+#: dpkg-deb.1:108
 msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
-"B<dpkg-scanpackages> schaut durch einen Baum von Debian-Binärpaketen und "
-"erstellt eine Packages-Datei, die von B<apt>(8), B<dselect>(1) usw. "
-"verwendet wird, um dem Benutzer zu erzählen, welche Pakete zur Installation "
-"verfügbar sind. Diese Packages-Dateien sind die gleichen, die auch auf den "
-"Debian-Archiv-Sites und CD-ROMs vorliegen. Sie können selbst B<dpkg-"
-"scanpackages> verwenden, falls Sie ein Verzeichnis von lokalen Paketen zur "
-"Installation auf einem Cluster von Maschinen anlegen."
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
+#: dpkg-deb.1:117
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
 msgstr ""
-"B<Hinweis:> Falls Sie auf die erzeugte Packages-Datei mit B<apt> zugreifen "
-"wollen, werden Sie wahrscheinlich die Datei mit B<gzip>(1) komprimieren "
-"müssen (und damit ein Packages.gz-Datei erstellen). Apt ignoriert - "
-"abgesehen von lokalem Zugriff (d.h. über B<file://>-Quellen) - "
-"unkomprimierte Packages-Dateien."
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
-msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
 msgstr ""
-"I<Binärverz> ist der Name des zu verarbeitenden Baums von Binärpaketen "
-"(beispielsweise B<contrib/binary-i386>). Am besten wird dies relativ zur "
-"Wurzel des Debian-Archivs erstellt, da jedes Filename-Feld in der neuen "
-"Packages-Datei mit dieser Zeichenkette beginnen wird."
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
-msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
-msgstr ""
-"I<Overridedatei> ist der Name der einzulesenden Datei, die Informationen "
-"darüber enthält, wie das Paket in die Distribution passt; siehe unten."
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<Archiv>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-deb.1:125
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
-"I<Pfadpräfix> ist eine optionale Zeichenkette, die vor das Dateinamenfeld "
-"gehängt werden soll."
 
 # type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr "Falls B<-u> angegeben ist, dann suche nach *.udeb anstatt *.deb."
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<Archiv-Verzeichnis>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-deb.1:129
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
-"Wenn B<-a>I<E<lt>ArchE<gt>> angegeben ist, dann wird ein Muster bestehend "
-"aus *_all.deb und *_arch.deb verwendet, anstatt nach allen Debs zu suchen."
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
+#: dpkg-deb.1:135
 msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
-"Falls mehr als eine Version eines Paketes gefunden wird, wird nur das neuste "
-"in die Ausgabe aufgenommen. Falls sie die gleiche Version haben und sich nur "
-"in der Architektur unterscheiden, wird das zuerst gefundene verwendet. Sie "
-"können diese Verhalten mit dem B<-m>-Schalter aufheben. Falls angegeben, "
-"werden alle gefundenen Pakete in die Ausgabe aufgenommen."
-
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr "DIE OVERRIDE-DATEI"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
-msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
 msgstr ""
-"Während der Großteil der Informationen über ein Paket in der Kontrolldatei "
-"gefunden werden kann, muss ein Teil von den Distributionszaren eingetragen "
-"werden, da sie sich nicht auf tatsächliche Abhängigkeiten und Beschreibungen "
-"des Pakets, sonder auf die Anordnung von Dateien für eine Veröffentlichung "
-"beziehen. Diese Informationen finden sich in der Override-Datei."
 
 # type: Plain text
-#: dpkg-scanpackages.1:91
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<Archiv-Verzeichnis>"
+
+# type: Plain text
+#: dpkg-deb.1:143
 msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
-"Die Override-Datei hat ein einfaches, durch Leerzeichen getrenntes Format. "
-"Kommentare sind erlaubt (angezeigt durch ein B<#>)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
-msgstr "I<Paket> I<Priorität> I<Bereich> [I<Betreuerinformation>]"
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<Archiv>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-deb.1:151
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
-"I<Paket> ist der Name des Pakets. Einträge in der Override-Datei für Pakete "
-"die nicht im Baum von Binärpaketen gefunden werden können, werden ignoriert."
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
+#: dpkg-deb.1:151
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<Archiv-Verzeichnis>"
+
+# type: Plain text
+#: dpkg-deb.1:155
 msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
-"I<Priorität> und I<Bereich> platzieren das Paket innerhalb des "
-"Veröffentlichungs-Baums; diese sollten nicht in der Kontrolldatei gefunden "
-"werden. Falls das Paket in einem Unterverzeichnis des I<Binärverz> gefunden "
-"wird, dann wird dies mit I<Bereich> überprüft."
 
 # type: Plain text
-#: dpkg-scanpackages.1:119
+#: dpkg-deb.1:159
 msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
-"I<Betreuerinformation> kann, falls vorhanden, entweder der Name des "
-"Betreuers für ein bedingungsloses Überschreiben, oder ansonsten "
-"I<AlterBetreuer> B<=E<gt>> I<NeuerBetreuer> um eine Ersetzung durchzuführen, "
-"sein."
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
+#: dpkg-deb.1:162
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"Die Override-Datei, die für die Erstellung der offiziellen Paketliste "
-"verwendet wird, kann im I<indices>-Verzeichnis auf jedem Debian-Spiegel "
-"gefunden werden."
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
+# type: TP
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
 #, fuzzy, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"DIAGNOSE\n"
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"DIAGNOSTIK"
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence> | B<--license>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
-msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
-"B<dpkg-scanpackages> gibt die gewöhnlichen selbsterklärenden Fehler aus. Es "
-"warnt auch über Pakete, die im falschen Unterverzeichnis sind, doppelt "
-"vorkommen, ein Filename-Feld in ihrer Kontrolldatei haben, in der Override-"
-"Datei fehlen oder für die Betreuer-Substitutionen vorliegen, die keinen "
-"Effekt haben."
-
-# type: Plain text
-#: dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
 
-# type: TH
-#: dpkg-scansources.1:1
+# type: TP
+#: dpkg-deb.1:173
 #, no-wrap
-msgid "dpkg-scansources"
-msgstr "dpkg-scansources"
+msgid "B<--showformat=>I<format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
-"dpkg-scansources - suche nach ».dsc«-Dateien und baue den »Sources«-Index"
 
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-deb.1:187
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
-"B<dpkg-scansources> [I<Optionen>] I<Binär-Verz> [I<Override-Datei> [I<Pfad-"
-"Prefix>]] B<E<gt>> I<Sources>"
 
 # type: Plain text
-#: dpkg-scansources.1:18
-msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr ""
+
+# type: TP
+#: dpkg-deb.1:189
+#, no-wrap
+msgid "B<-z>I<compress_level>"
 msgstr ""
-"<dpkg-scansources> durchsucht das übergebene I<Binär-Verz> nach I<.dsc>-"
-"Dateien. Diese werden verwendet, um einen Debian-Quell-Index zu erstellen, "
-"der auf der Standardausgabe ausgegeben wird."
 
 # type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-deb.1:193
 msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
+msgstr ""
+
+# type: TP
+#: dpkg-deb.1:193
+#, no-wrap
+msgid "B<-Z>I<compress_type>"
 msgstr ""
-"Die I<Override-Datei> wird, falls angegeben, verwendet, um die Prioritäten "
-"in den ergebenen Index-Datensätzen zu setzen und sich über das Betreuer-Feld "
-"in den I<.dsc>-Dateien hinwegzusetzen. Lesen Sie B<dpkg-scanpackages>(1) für "
-"das Format dieser Datei. \\s-1Beachten Sie\\s0: Da die Override-Datei nach "
-"Binär- und nicht Quellpaketen indiziert wird, gibt es ein hier kleines "
-"Problem. Die aktuelle Implementierung verwendet die höchste Priorität aller "
-"von einer I<.dsc>-Datei erzeugten Binärpakete für die Priorität des "
-"Quellpakets, und den Inhalt für das Hinwegsetzen über die Betreuer-"
-"Information aus dem Eintrag für das erste in der I<.dsc>-Datei aufgeführte "
-"Binärpaket. Dies könnte sich ändern."
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-deb.1:198
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
+msgstr ""
+
+# type: TP
+#: dpkg-deb.1:198
+#, no-wrap
+msgid "B<--new>"
 msgstr ""
-"Der I<Pfad-Präfix> wird, falls angegeben, vor das Directory-Feld in dem "
-"erzeugten Quell-Index vorangestellt. Sie verwenden dies im allgemeinen, "
-"damit das Directory-Feld den Pfad von der Spitze der Debian-Hierarchie "
-"enthält."
 
 # type: Plain text
-#: dpkg-scansources.1:44
-#, fuzzy
+#: dpkg-deb.1:203
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
-"B<Hinweis:> Falls Sie auf die erzeugte Packages-Datei mit B<apt>(8) "
-"zugreifen wollen, werden Sie wahrscheinlich die Datei mit B<gzip>(1) "
-"komprimieren müssen (und damit ein Packages.gz-Datei erstellen). Apt "
-"ignoriert - abgesehen von lokalem Zugriff (d.h. über B<file://>-Quellen) - "
-"unkomprimierte Packages-Dateien."
 
 # type: TP
-#: dpkg-scansources.1:45 install-info.8:272
+#: dpkg-deb.1:203
 #, no-wrap
-msgid "B<--debug>"
-msgstr "B<--debug>"
+msgid "B<--old>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
-msgstr "Schalte Debugging ein"
+#: dpkg-deb.1:211
+msgid ""
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
-msgstr "Zeige den Bedienungshinweis und sterbe."
+#: dpkg-deb.1:217
+msgid ""
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
+msgstr ""
 
-# type: IP
-#: dpkg-scansources.1:49
-#, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-n>, B<--no-sort>"
+# type: TP
+#: dpkg-deb.1:217
+#, fuzzy, no-wrap
+msgid "B<-D>, B<--debug>"
+msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-scansources.1:52
-msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
 msgstr ""
-"Sortiere die Index-Datensätze nicht. Normalerweise werden sie nach "
-"Quellpaketnamen sortiert."
-
-# type: IP
-#: dpkg-scansources.1:52
-#, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-s>, B<--source-override> I<Datei>"
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-deb.1:226
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
-msgstr ""
-"Verwenden Sie I<Datei> als Quell-Override-Datei. Die Standardeinstellung ist "
-"der Name der Override-Datei, die Sie angegeben haben, um I<.src> ergänzt."
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+msgstr "B<dpkg-deb -I> I<paket1>B<.deb> I<paket2>B<.deb> macht das Falsche."
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-deb.1:230
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
-"Die Quell-Override-Datei hat ein anderes Format als die Binär-Override-Datei."
-"Sie enthält nur zwei, durch Leerzeichen separierte Felder, der erste ist der "
-"Quellpaketname und der zweite der Bereich. Leerzeilen und Kommentarzeilen "
-"werden in normaler Art und Weise ignoriert. Falls ein Paket in beiden "
-"Dateien auftaucht, dann nimmt die Quell-Override Vorrang für die Einstellung "
-"des Bereichs."
+"Es gibt keine Authentifizierung von  B<.deb>-Dateien; in der Tat, gibt es "
+"sogar noch nicht mal eine direkte Prüfsumme."
 
 # type: Plain text
-#: dpkg-scansources.1:63
-msgid "Print the version number and exit."
-msgstr "Gebe die Versionsnummer aus und beende sich."
+#: dpkg-deb.1:237
+msgid ""
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:66
-msgid "B<dpkg-scanpackages>(1)."
-msgstr "B<dpkg-scanpackages>(1)."
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
-msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: dpkg-deb.1:252
+#, fuzzy
+msgid ""
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
+msgstr ""
+"B<dpkg-deb> und diese Handbuchseite wurden von Ian Jackson geschrieben. Sie "
+"unterliegen dem Copyright (C) 1995-1996 von ihm und sind unter der GNU "
+"General Public License Version veröffentlicht; es gibt KEINE HAFTUNG. Lesen "
+"Sie I</usr/share/doc/dpkg/copyright> und I</usr/share/common-licenses/GPL> "
+"für Details."
 
 # type: TH
-#: dpkg-source.1:2
+#: dpkg-divert.8:1
 #, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg-source"
+msgid "dpkg-divert"
+msgstr "dpkg-divert"
+
+# type: Plain text
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
+msgstr "dpkg-divert - Hinwegsetzen über die Paketversion einer Datei"
+
+# type: Plain text
+#: dpkg-divert.8:9
+#, fuzzy
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-divert.8:13
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian Quellpaket-"
-"Werkzeuge"
-
-# type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
-msgstr "B<dpkg-source> B<-x >I<Dateiname>B<.dsc> [I<Ausgabe-Verzeichnis>]"
 
 # type: Plain text
-#: dpkg-source.1:15
+#: dpkg-divert.8:23
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
-"B<dpkg-source -b> [I<Optionen>] I<Verzeichnis> [I<Orig-Verzeichnis>|I<Orig-"
-"targz>|'']"
+"Datei »Diversionen« (Umlenkungen) sind eine Möglichkeit, B<dpkg>(1) dazu zu "
+"zwingen, eine Datei nicht an ihren Standardplatz, sondern an einem "
+"»umgelenkten« Ort zu installieren. Umlenkungen können innerhalb der Debian-"
+"Paketskripte verwendet werden, um eine Datei beiseitezuschieben, wenn sie "
+"einen Konflikt auslöst. Systemadministratoren können sie auch verwenden, um "
+"sich über die Konfigurationsdateien einiger Pakete hinwegzusetzen, oder wann "
+"immer einige Dateien (die nicht als »Conffiles« markiert sind) von Dpkg "
+"erhalten werden müssen, wenn eine neuere Version eines Paketes, die diese "
+"Dateien enthält, installiert wird."
 
-# type: Plain text
-#: dpkg-source.1:18
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg-gencontrol> [I<Optionen>]"
+# type: TP
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<[--] >I<Dateiname>"
 
 # type: Plain text
-#: dpkg-source.1:21
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-shlibdeps> I<Optionen>"
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:24
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg-genchanges> [I<Optionen>]"
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--remove>I< E<lt>DateiE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:27
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg-buildpackage> [I<Optionen>]"
+#: dpkg-divert.8:31
+#, fuzzy
+msgid "Remove a diversion for I<file>."
+msgstr "Um diese Umleitung zu entfernen:"
 
-# type: Plain text
-#: dpkg-source.1:30
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg-distaddfile> [I<Optionen>]I< Dateiname Bereich Priorität>"
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--list> [I<E<lt>Glob-MusterE<gt>>]"
 
 # type: Plain text
-#: dpkg-source.1:33
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg-parsechangelog> [I<Optionen>]"
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
+msgstr ""
+
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-source.1:36
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
-msgstr "B<dpkg-source> packt und entpackt Debian Quellarchive."
+#: dpkg-divert.8:37
+#, fuzzy
+msgid "Print the real name for a diverted file."
+msgstr "Zeige den Wert einer einzelnen Variablen an."
+
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir> I<Verzeichnis>"
 
 # type: Plain text
-#: dpkg-source.1:42
+#: dpkg-divert.8:42
+#, fuzzy
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
-"B<dpkg-gencontrol> liest Informationen aus einem entpackten Debian-"
-"Quellcodebaum und erzeugt eine binäre Paketkontrolldatei (standardmäßig "
-"debian/tmp/DEBIAN/control); es fügt auch einen Eintrag für das Binärpaket zu "
-"B<debian/files> hinzu."
+"Setze das Dpkg-Datenverzeichnis auf I<E<lt>VerzeichnisE<gt>> (Standard: I</"
+"var/lib/dpkg>)."
+
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<--divert>I< E<lt>UmlenkzielE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-divert.8:46
+#, fuzzy
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
+"E<lt>UmlenkzielE<gt>> ist der Zielort, wo die Versionen der "
+"I<E<lt>DateiE<gt>>, wie sie von anderen Paketen bereitgestellt wird, hin "
+"umgelenkt wird."
 
-# type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
-msgstr ""
-"E<lt>BibliotheksnameE<gt> E<lt>Version/SONameE<gt> E<lt>AbhängigkeitenE<gt>"
+# type: TP
+#: dpkg-divert.8:46
+#, no-wrap
+msgid "B<--local>"
+msgstr "B<--local>"
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-divert.8:52
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
-"B<dpkg-genchanges> liest Informationen aus einem entpackten und gebauten "
-"Debian-Quellcodebaum und aus den darin erzeugten Dateien und erzeugt eine "
-"Debian-Kontrolldatei für das Hochladen (die B<.changes>-Datei)."
+"Gibt an, dass alle Versionen dieser Datei umgeleitet sind. Dies bedeutet, "
+"dass es keine Ausnahmen gibt, und egal was für ein Paket auch installiert "
+"ist, die Datei ist umgeleitet. Dies kann vom Administrator verwendet werden, "
+"um eine lokal geänderte Version zu installieren."
+
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<--package>I< E<lt>PaketE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:80
+#: dpkg-divert.8:57
+#, fuzzy
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
-"B<dpkg-buildpackage> ist ein Kontrollskript das zu Automatisierung des "
-"Bauens von Paketen verwendet werden kann."
+"I<E<lt>PaketE<gt>> ist der Name des Pakets, dessen Kopie von "
+"I<E<lt>DateiE<gt>> nicht umgeleitet wird, d.h. I<E<lt>DateiE<gt>> wird für "
+"alle Pakete außer I<E<lt>PaketE<gt>> umgeleitet."
+
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
 
 # type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
-msgstr ""
-"B<dpkg-distaddfile> fügte einen Eintag für eine benannte Datei in B<debian/"
-"files> hinzu."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
+msgstr "Ruhiger Modus, d.h. keine langatmige Ausgabe."
+
+# type: TP
+#: dpkg-divert.8:60
+#, no-wrap
+msgid "B<--rename>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-divert.8:64
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
-"B<dpkg-parsechangelog> liest das Änderungsprotokoll (»changelog«) eines "
-"entpackten Debian-Quellcodebaums ein, wertet diese aus und gibt die "
-"Informationen in der Standard-Ausgabe in maschinenlesbarer Form aus."
+"Schiebe die Dateien tatsächlich beiseite (oder zurück). dpkg-divert wird den "
+"Arbeitsvorgang abbrechen, falls die Zieldatei bereits existiert."
+
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, no-wrap
+msgid "B<--test>"
+msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-source.1:93
-msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
-"Keiner dieser Kommandos erlaubt es, mehrere  Optionen in eine zu "
-"kombinieren, und sie erlauben es nicht, den Wert einer Option in einem "
-"separaten Argument zu speichern."
+"Testmodus, d.h. führe keine Änderungen durch, sondern zeige sie lediglich."
 
 # type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
-#, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr ""
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"GEMEINSAME OPTIONEN\n"
-"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
-"ALLGEMEINE OPTIONEN"
+#: dpkg-divert.8:74
+#, no-wrap
+msgid "NOTES"
+msgstr "BEMERKUNGEN"
 
 # type: Plain text
-#: dpkg-source.1:96
+#: dpkg-divert.8:78
 msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
-"Viele dieser Programme haben Optionen gemeinsam; diese sind hier "
-"beschrieben, zusammen mit den Programmen, die diese akzeptieren."
+"Beim Hinzufügen ist die Standardeinstellung B<--local> und B<--divert> "
+"I<E<lt>OriginalnameE<gt>.distrib>. Beim Entfernen müssen, falls angegeben, "
+"B<--package> oder B<--local> und B<--divert> übereinstimmen."
 
-# type: TP
-#: dpkg-source.1:96
-#, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-h>,B<--help>"
+# type: Plain text
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
+msgstr "Verzeichnisse können mit B<dpkg-divert> nicht umgeleitet werden."
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-divert.8:86
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
-"Ziege den Gebrauchshinweis für das bestimmte Programm an, darunter eine "
-"Übersicht der Optionen, die es versteht. Diese Option wird von allen "
-"Werkzeugen für Quellpakete verstanden."
+"Vorsicht sollte beim Umleiten von Laufzeit-Bibliotheken walten gelassen "
+"werden, da B<ldconfig>(8) einen symbolischen Link, basierend auf dem in der "
+"Bibliothek eingebetteten DT_SONAME-Feld erstellt. Da ldconfig keine "
+"Umleitungen anerkennt (nur Dpkg tut dies), kann der Symlink am Ende auf die "
+"umgeleitete Bibliothek zeigen, falls die umgeleitete Bibliothek den gleichen "
+"SONAME wie die nicht-umgeleitete hat."
 
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-divert.8:91
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
-"Zeige die Version das bestimmte Programm an, darunter Copyright und Lizenz-"
-"Informationen. Diese Option wird von allen Werkzeugen für Quellpakete "
-"verstanden."
+"Um alle Kopien von I</usr/bin/example> auf I</usr/bin/example.foo> "
+"umzuleiten, d.h. alle Pakete, die I</usr/bin/example> zur Verfügung stellen, "
+"dazu anzuleiten, diese Datei stattdessen als I</usr/bin/example.foo> zu "
+"installieren und die Umbenennung, falls notwendig, durchzuführen:"
 
-# type: TP
-#: dpkg-source.1:106
-#, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<-v>I<Version>"
+# type: Plain text
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+
+# type: Plain text
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
+msgstr "Um diese Umleitung zu entfernen:"
+
+# type: Plain text
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --rename --remove /usr/bin/example"
 
 # type: Plain text
-#: dpkg-source.1:114
+#: dpkg-divert.8:101
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
-"Dies führt in B<dpkg-buildpackage>, B<dpkg-genchanges> und B<dpkg-"
-"parsechangelog> dazu, dass »changelog«-Informationen von allen Versionen, "
-"die strikt neuer als I<Version> sind, verwendet wird."
+"Um für jedes Paket - außer Ihrem eigenen I<wibble>-Paket -, das versucht, I</"
+"usr/bin/example> zu installieren, dieses auf I</usr/bin/example.foo> "
+"umzulenken:"
 
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-divert.8:103
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
-"In B<dpkg-gencontrol> setzt es die Versionsnummer des zu generierenden "
-"Binärpaketes."
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
+
+# type: Plain text
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
 # type: TP
-#: dpkg-source.1:119
+#: dpkg-divert.8:109
 #, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B<-C>I<Änderungsbeschreibung>"
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/diversions>"
+
+# type: Plain text
+#: dpkg-divert.8:114
+msgid ""
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
+msgstr ""
+"Datei, die die aktuelle Liste von Umleitungen des Systems enthält. Sie "
+"befindet sich im Dpkg-Administrationsverzeichnis, zusammen mit anderen für "
+"Dpkg wichtigen Dateien, wie »status« oder »available«."
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-divert.8:117
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
-"Lese die Beschreibung der Änderungen aus der Datei I<Änderungsbeschreibung> "
-"anstat die Informationen aus dem changelog-Datei des Quellbaums zu verwenden."
-"Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> verstanden."
+"Hinweis: B<dpkg-divert> erhält die alte Kopie dieser Datei, mit der Endung »-"
+"old«, bevor es sie mit der neuen ersetzt."
 
-# type: TP
-#: dpkg-source.1:126
-#, no-wrap
-msgid "B<-m>I<maintaineraddress>"
-msgstr "B<-m>I<Betreueradresse>"
+# type: Plain text
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
+msgstr "Copyright (C) 1995 Ian Jackson."
+
+# type: TH
+#: dpkg-genchanges.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-genchanges"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-genchanges.1:4
 #, fuzzy
+msgid "dpkg-genchanges - generate Debian .changes files"
+msgstr "dpkg-scanpackages - erstelle Packages-Dateien"
+
+# type: Plain text
+#: dpkg-genchanges.1:8
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg-genchanges> [I<Optionen>]"
+
+# type: Plain text
+#: dpkg-genchanges.1:16
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
-"Verwende I<Betreueradresse> als Namen und Adresse des Betreuers diese "
-"Paketes, anstatt die Informationen aus der »control« des Quellbaums zu "
-"verwenden. Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> "
-"verstanden."
-
-# type: TP
-#: dpkg-source.1:134
-#, no-wrap
-msgid "B<-e>I<maintaineraddress>"
-msgstr "B<-e>I<Betreueradresse>"
+"B<dpkg-genchanges> liest Informationen aus einem entpackten und gebauten "
+"Debian-Quellcodebaum und aus den darin erzeugten Dateien und erzeugt eine "
+"Debian-Kontrolldatei für das Hochladen (die B<.changes>-Datei)."
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:23
+#, fuzzy
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
-"Verwende I<Betreueradresse> als Namen und E-Mail-Adresse des Betreuers für "
-"diesen Upload anstatt die Informationen aus der »changelog« des Quellbaums "
-"zu verwenden. Dies wird von B<dpkg-buildpackage> und B<dpkg-genchanges> "
-"verstanden."
+"Dies führt in B<dpkg-buildpackage>, B<dpkg-genchanges> und B<dpkg-"
+"parsechangelog> dazu, dass »changelog«-Informationen von allen Versionen, "
+"die strikt neuer als I<Version> sind, verwendet wird."
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, no-wrap
 msgid "B<-si>, B<-sa>, B<-sd>"
 msgstr "B<-si>, B<-sa>, B<-sd>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-genchanges.1:49
 #, fuzzy
 msgid ""
 "These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 "Diese Optionen kontrollieren, ob das Original-Quellarchiv dem durch B<dpkg-"
 "buildpackage> und B<dpkg-genchanges> generierten Upload hinzugefügt wird, "
@@ -5719,7 +5433,7 @@ msgstr ""
 "wurden)."
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 #, fuzzy
 msgid ""
 "By default, or if B<-si> is specified, the original source will be included "
@@ -5731,75 +5445,69 @@ msgstr ""
 "Debian-Revisionsanteil der Versionsnummer ist B<0> oder B<1>."
 
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 msgid ""
 "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
 "exclusion and includes only the diff."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:163
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:169
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
 #, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:179
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:179
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:184
-msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:189
-msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:189
-#, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr ""
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<-si>, B<-sa>, B<-sd>"
 
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-genchanges.1:101
 msgid ""
 "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
 "a binary-only build is taking place.  B<-b> indicates that no source files "
@@ -5812,1094 +5520,1515 @@ msgid ""
 "being built."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:217
-msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
-msgstr ""
-
 # type: TP
-#: dpkg-source.1:217
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:224
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:224
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"B<debian/changelog>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-genchanges.1:115
+msgid ""
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:231
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
 #, no-wrap
-msgid "B<-f>I<fileslistfile>"
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:237
+#: dpkg-genchanges.1:120
 #, no-wrap
-msgid "B<-F>I<changelogformat>"
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-genchanges.1:131
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:244
+#: dpkg-genchanges.1:131
 #, no-wrap
-msgid "B<-W>"
+msgid "B<-q>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-genchanges.1:139
+msgid ""
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
+msgstr ""
+
+# type: Plain text
+#: dpkg-genchanges.1:155
+msgid ""
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
+msgstr ""
+
+# type: TH
+#: dpkg-gencontrol.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
+
+# type: Plain text
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:8
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg-gencontrol> [I<Optionen>]"
+
+# type: Plain text
+#: dpkg-gencontrol.1:15
+msgid ""
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
+msgstr ""
+"B<dpkg-gencontrol> liest Informationen aus einem entpackten Debian-"
+"Quellcodebaum und erzeugt eine binäre Paketkontrolldatei (standardmäßig "
+"debian/tmp/DEBIAN/control); es fügt auch einen Eintrag für das Binärpaket zu "
+"B<debian/files> hinzu."
+
+# type: Plain text
+#: dpkg-gencontrol.1:20
+#, fuzzy
+msgid "Sets the version number of the binary package which will be generated."
+msgstr ""
+"In B<dpkg-gencontrol> setzt es die Versionsnummer des zu generierenden "
+"Binärpaketes."
+
+# type: Plain text
+#: dpkg-gencontrol.1:24
+msgid ""
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
+msgstr ""
+
+# type: TP
+#: dpkg-gencontrol.1:55
+#, no-wrap
+msgid "B<-p>I<package>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-gencontrol.1:62
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:251
+#: dpkg-gencontrol.1:62
 #, no-wrap
-msgid "B<-E>"
+msgid "B<-n>I<filename>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:67
+msgid ""
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
+msgstr ""
+
+# type: TP
+#: dpkg-gencontrol.1:67
+#, no-wrap
+msgid "B<-is>, B<-ip>, B<-isp>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-gencontrol.1:76
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:257
+# type: TP
+#: dpkg-gencontrol.1:76
+#, no-wrap
+msgid "B<-P>I<packagebuilddir>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:89
+msgid ""
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
+msgstr ""
+
+# type: TP
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
+#, no-wrap
+msgid "B<-O>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:98
+msgid ""
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
+msgstr ""
+
+# type: TP
+#: dpkg-gencontrol.1:106
+#, no-wrap
+msgid "B<debian/control>"
+msgstr "B<debian/control>"
+
+# type: Plain text
+#: dpkg-gencontrol.1:111
+msgid ""
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:118
+msgid ""
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
+msgstr ""
+
+# type: TH
+#: dpkg-name.1:6
 #, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "dpkg-SOURCE OPTIONEN"
+msgid "dpkg-name"
+msgstr "dpkg-name"
+
+# type: Plain text
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
+msgstr "dpkg-name - Debian-Pakete zu vollen Paketnamen umbenennen"
+
+# type: Plain text
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg-divert> [I<Optionen>] [B<--add>] I<E<lt>DateiE<gt>>"
+
+# type: Plain text
+#: dpkg-name.1:27
+#, fuzzy
+msgid ""
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
+msgstr ""
+"Diese Handbuchseite dokumentiert das B<dpkg-name> sh-Skript, dass eine "
+"einfache Möglichkeit bereitstellt, B<Debian>-Pakete in ihren vollen "
+"Paketnamen umzubenennen. Ein voller Paketname besteht aus "
+"E<lt>Paket<gt>_E<lt>Version<gt>_E<lt>ArchitekturE<gt>.deb wie in der "
+"Kontrolldatei des Pakets spezifiziert. Der E<lt>VersionE<gt>-Teil des "
+"Dateinamens besteht aus der Versionsinformation der Originalautoren optional "
+"gefolgt von einem Gedankenstrich und der Revisionsinformation."
+
+# type: TP
+#: dpkg-name.1:29
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<-a, --no-architecture>"
+
+# type: Plain text
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
+msgstr "Der Zieldateiname wird keine Architekturinformation enthalten."
+
+# type: TP
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<-k, --symlink>"
+
+# type: Plain text
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
+msgstr "Erstelle einen Symlink, anstatt zu verschieben."
+
+# type: TP
+#: dpkg-name.1:35
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<-o, --overwrite>"
+
+# type: Plain text
+#: dpkg-name.1:39
+msgid ""
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
+msgstr ""
+"Existierende Dateien werden überschrieben, falls sie den gleichen Namen wie "
+"der Zieldateiname haben."
+
+# type: TP
+#: dpkg-name.1:39
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<-s, --subdir> [I<Verzeichnis>]"
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-name.1:51
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
+"Dateien werden in ein Unterverzeichnis verschoben. Falls das als Argument "
+"existierende Verzeichnis existiert, dann werden die Dateien in das "
+"Verzeichnis verschoben, andernfalls wird das Zielverzeichnis aus dem Section-"
+"Feld des Kontrollteils des Pakets extrahiert. Das Zielverzeichnis wird "
+"»unstable/binary-E<lt>ArchitekturE<gt>/E<lt>Bereich<gt>« sein. Falls der "
+"Bereich nicht in der Kontrolldatei gefunden werden kann, dann wird »no-"
+"section« angenommen, und in diesem Fall, wie auch für die Bereiche »non-"
+"free« und »contrib« ist das Zielverzeichnis »E<lt>Bereich<gt>/binary-"
+"E<lt>ArchitekturE<gt>«. Das Bereichsfeld muss nicht angegeben werden, daher "
+"werden viele Pakete ihren Weg in das »no-section«-Gebiet finden. Verwenden "
+"Sie diese Option mit Vorsicht, sie ist unordentlich."
 
 # type: TP
-#: dpkg-source.1:262
-#, no-wrap
-msgid "B<-x>"
-msgstr ""
+#: dpkg-name.1:51
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-c, --create-dir>"
 
 # type: Plain text
-#: dpkg-source.1:272
+#: dpkg-name.1:56
 msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
+"Diese Option kann zusammen mit der -s-Option verwendet werden. Falls das "
+"Zielverzeichnis nicht gefunden werden kann, wird es automatisch erstellt. "
+"B<Verwenden Sie diese Option mit Vorsicht.>"
 
-# type: Plain text
-#: dpkg-source.1:280
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
-msgstr ""
+# type: TP
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<-v, --version>"
 
-# type: Plain text
-#: dpkg-source.1:288
-msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
-msgstr ""
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<-l, --license>"
 
 # type: TP
-#: dpkg-source.1:288
+#: dpkg-name.1:67
 #, no-wrap
-msgid "B<-b>"
-msgstr ""
+msgid "B<dpkg-name bar-foo.deb>"
+msgstr "B<dpkg-name bar-foo.deb>"
 
 # type: Plain text
-#: dpkg-source.1:303
+#: dpkg-name.1:72
 msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
+"Die Datei »bar-foo.deb« wird in bar-foo_1.0-2_i386.deb oder etwas ähnliches "
+"(abhängig von der Information, die in dem Kontrollteil von »bar-foo.deb« "
+"ist) umbenannt."
 
 # type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+#: dpkg-name.1:72
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
-msgstr ""
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-name.1:77
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
+"Alle Dateien mit der Endung »deb« im Verzeichnis /root/debian und seiner "
+"Unterverzeichnisse werden von dpkg-name - falls notwendig - ohne "
+"Architekturinformation umbenannt."
 
 # type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+#: dpkg-name.1:77
 #, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr ""
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 
 # type: Plain text
-#: dpkg-source.1:330
+#: dpkg-name.1:83
 msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
+"B<Machen Sie dies nicht.> Ihr Archiv wird eine komplette Schweinerei werden, "
+"da viele Pakete nicht mit Bereichsinformationen kommen. B<Machen Sie dies "
+"nicht.>"
 
 # type: TP
-#: dpkg-source.1:330
+#: dpkg-name.1:83
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> mit B<-b>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 
 # type: Plain text
-#: dpkg-source.1:345
-msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
-msgstr ""
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
+msgstr "Dies kann beim Bau neuer Pakete verwendet werden."
 
 # type: Plain text
-#: dpkg-source.1:357
+#: dpkg-name.1:96
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
+"Einige Pakete folgen nicht der Namensstruktur "
+"E<lt>Paket<gt>_E<lt>VersionE<gt>_E<lt>ArchitekturE<gt>.deb. Pakete, die von "
+"dpkg-name umbenannt wurden, folgen dieser Struktur. Im allgemeinen hat diese "
+"keinen Einfluss darauf, wie Pakete von B<dselect>(1)/B<dpkg>(1) installiert "
+"werden, aber andere Installationswerkzeuge können von dieser "
+"Benennungsstruktur abhängen."
 
 # type: Plain text
-#: dpkg-source.1:368
+#: dpkg-name.1:104
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 msgstr ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 
 # type: Plain text
-#: dpkg-source.1:377
+#: dpkg-name.1:111
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
+"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> ist Freie Software; "
+"lesen Sie die GNU General Public License Version 2 oder neuer für die "
+"Kopierbedingungen. Es gibt B<keine> Haftung."
 
 # type: Plain text
-#: dpkg-source.1:406
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
-msgstr ""
+#: dpkg-parsechangelog.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg-parsechangelog> [I<Optionen>]"
 
 # type: Plain text
-#: dpkg-source.1:412
-msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
+#: dpkg-parsechangelog.1:4
+#, fuzzy
+msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgstr "dpkg-scanpackages - erstelle Packages-Dateien"
 
 # type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
-msgstr ""
+#: dpkg-parsechangelog.1:8
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg-parsechangelog> [I<Optionen>]"
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-parsechangelog.1:14
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
+"B<dpkg-parsechangelog> liest das Änderungsprotokoll (»changelog«) eines "
+"entpackten Debian-Quellcodebaums ein, wertet diese aus und gibt die "
+"Informationen in der Standard-Ausgabe in maschinenlesbarer Form aus."
 
-# type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
+# type: TP
+#: dpkg-parsechangelog.1:26
+#, no-wrap
+msgid "B<-L>I<libdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:430
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
+# type: TP
+#: dpkg-parsechangelog.1:41
+#, no-wrap
+msgid "B<debian/changelog>"
+msgstr "B<debian/changelog>"
+
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-parsechangelog.1:47
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:435
+# type: TH
+#: dpkg-query.1:1
 #, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "dpkg-GENCONTROL OPTIONEN"
+msgid "dpkg-query"
+msgstr "dpkg-query"
 
 # type: Plain text
-#: dpkg-source.1:438
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:438
-#, no-wrap
-msgid "B<-p>I<package>"
-msgstr ""
+# type: Plain text
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-query.1:12
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:445
-#, no-wrap
-msgid "B<-n>I<filename>"
-msgstr ""
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<Paket-Name-Muster>...]"
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-query.1:23
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:450
-#, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:459
-msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:459
+#: dpkg-query.1:27
 #, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-query.1:33
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
-#, no-wrap
-msgid "B<-O>"
-msgstr ""
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<Paket-Name-Muster>...]"
 
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-query.1:40
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:482
-#, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
-msgstr "dpkg-SHLIBDEPS OPTIONEN"
+# type: TP
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-a>|B<--startas> I<Pfadname>"
 
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-query.1:44
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:487
-#, no-wrap
-msgid "B<-e>I<executable>"
-msgstr ""
+#: dpkg-query.1:44
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<dpkg -i> | B<--install> I<Paketdatei>..."
 
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-query.1:49
 msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:491
+#: dpkg-query.1:49
 #, no-wrap
-msgid "B<-d>I<dependencyfield>"
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:497
+#: dpkg-query.1:55
 msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:507
-msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
-msgstr ""
+# type: TP
+#: dpkg-query.1:55
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-n>|B<--name> I<Prozessname>"
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-query.1:59
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
-msgstr ""
+#: dpkg-query.1:74
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-r>|B<--chroot> I<Wurzel>"
 
 # type: Plain text
-#: dpkg-source.1:526
-msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:526
+# type: Plain text
+#: dpkg-query.1:87
 #, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+msgid ""
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-query.1:92
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-query.1:98
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:540
+# type: Plain text
+#: dpkg-query.1:129
 #, no-wrap
-msgid "B<-t>I<type>"
+msgid ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:549
+#: dpkg-query.1:137
 msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr "dpkg-GENCHANGES OPTIONEN"
-
 # type: Plain text
-#: dpkg-source.1:552
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#: dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:552
+# type: SH
+#: dpkg-query.1:143
 #, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
+msgid "ENVIRONMENT"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-query.1:148
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:563
-#, no-wrap
-msgid "B<-q>"
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:571
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
-msgstr "dpkg-BUILDPACKAGE OPTIONS"
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: dpkg-source.1:574
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr ""
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
-# type: TP
-#: dpkg-source.1:574
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "B<-k>I<key-id>"
-msgstr ""
+msgid "dpkg-scanpackages"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
-msgstr ""
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
+msgstr "dpkg-scanpackages - erstelle Packages-Dateien"
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scanpackages.1:28
+#, fuzzy
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
+"B<dpkg-scansources> [I<Optionen>] I<Binär-Verz> [I<Override-Datei> [I<Pfad-"
+"Prefix>]] B<E<gt>> I<Sources>"
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scanpackages.1:41
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:628
-#, no-wrap
-msgid "B<-tc>"
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
+"B<dpkg-scanpackages> schaut durch einen Baum von Debian-Binärpaketen und "
+"erstellt eine Packages-Datei, die von B<apt>(8), B<dselect>(1) usw. "
+"verwendet wird, um dem Benutzer zu erzählen, welche Pakete zur Installation "
+"verfügbar sind. Diese Packages-Dateien sind die gleichen, die auch auf den "
+"Debian-Archiv-Sites und CD-ROMs vorliegen. Sie können selbst B<dpkg-"
+"scanpackages> verwenden, falls Sie ein Verzeichnis von lokalen Paketen zur "
+"Installation auf einem Cluster von Maschinen anlegen."
 
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scanpackages.1:51
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:634
-#, no-wrap
-msgid "B<-us>, B<-uc>"
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
+"B<Hinweis:> Falls Sie auf die erzeugte Packages-Datei mit B<apt> zugreifen "
+"wollen, werden Sie wahrscheinlich die Datei mit B<gzip>(1) komprimieren "
+"müssen (und damit ein Packages.gz-Datei erstellen). Apt ignoriert - "
+"abgesehen von lokalem Zugriff (d.h. über B<file://>-Quellen) - "
+"unkomprimierte Packages-Dateien."
 
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:637
-#, no-wrap
-msgid "B<-a>I<architecture>"
+#: dpkg-scanpackages.1:58
+msgid ""
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
+"I<Binärverz> ist der Name des zu verarbeitenden Baums von Binärpaketen "
+"(beispielsweise B<contrib/binary-i386>). Am besten wird dies relativ zur "
+"Wurzel des Debian-Archivs erstellt, da jedes Filename-Feld in der neuen "
+"Packages-Datei mit dieser Zeichenkette beginnen wird."
 
 # type: Plain text
-#: dpkg-source.1:642
+#: dpkg-scanpackages.1:62
 msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
+"I<Overridedatei> ist der Name der einzulesenden Datei, die Informationen "
+"darüber enthält, wie das Paket in die Distribution passt; siehe unten."
 
 # type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+#: dpkg-scanpackages.1:65
+msgid ""
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
+"I<Pfadpräfix> ist eine optionale Zeichenkette, die vor das Dateinamenfeld "
+"gehängt werden soll."
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scanpackages.1:69
+#, fuzzy
+msgid ""
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
+"Falls mehr als eine Version eines Paketes gefunden wird, wird nur das neuste "
+"in die Ausgabe aufgenommen. Falls sie die gleiche Version haben und sich nur "
+"in der Architektur unterscheiden, wird das zuerst gefundene verwendet. Sie "
+"können diese Verhalten mit dem B<-m>-Schalter aufheben. Falls angegeben, "
+"werden alle gefundenen Pakete in die Ausgabe aufgenommen."
 
 # type: TP
-#: dpkg-source.1:651
-#, no-wrap
-msgid "B<-D>"
-msgstr ""
+#: dpkg-scanpackages.1:71
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--udeb>"
+msgstr "B<-h>,B<--help>"
 
 # type: Plain text
-#: dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
+msgstr "Falls B<-u> angegeben ist, dann suche nach *.udeb anstatt *.deb."
 
 # type: TP
-#: dpkg-source.1:654
-#, no-wrap
-msgid "B<-d>"
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<Pfad>"
 
 # type: Plain text
-#: dpkg-source.1:657
-msgid "Do not check build dependencies and conflicts."
+#: dpkg-scanpackages.1:78
+msgid ""
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:657
-#, no-wrap
-msgid "B<-nc>"
-msgstr ""
+#: dpkg-scanpackages.1:78
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
+#, fuzzy, no-wrap
+msgid "DIAGNOSTICS"
 msgstr ""
+"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+"DIAGNOSE\n"
+"#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+"DIAGNOSTIK"
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-scanpackages.1:94
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
+"B<dpkg-scanpackages> gibt die gewöhnlichen selbsterklärenden Fehler aus. Es "
+"warnt auch über Pakete, die im falschen Unterverzeichnis sind, doppelt "
+"vorkommen, ein Filename-Feld in ihrer Kontrolldatei haben, in der Override-"
+"Datei fehlen oder für die Betreuer-Substitutionen vorliegen, die keinen "
+"Effekt haben."
+
+# type: Plain text
+#: dpkg-scanpackages.1:99
+#, fuzzy
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+
+# type: TH
+#: dpkg-scansources.1:1
+#, no-wrap
+msgid "dpkg-scansources"
+msgstr "dpkg-scansources"
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-scansources.1:4
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
+"dpkg-scansources - suche nach ».dsc«-Dateien und baue den »Sources«-Index"
 
-# type: SH
-#: dpkg-source.1:674
-#, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+# type: Plain text
+#: dpkg-scansources.1:13
+msgid ""
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
+"B<dpkg-scansources> [I<Optionen>] I<Binär-Verz> [I<Override-Datei> [I<Pfad-"
+"Prefix>]] B<E<gt>> I<Sources>"
 
 # type: Plain text
-#: dpkg-source.1:677
+#: dpkg-scansources.1:18
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
+"<dpkg-scansources> durchsucht das übergebene I<Binär-Verz> nach I<.dsc>-"
+"Dateien. Diese werden verwendet, um einen Debian-Quell-Index zu erstellen, "
+"der auf der Standardausgabe ausgegeben wird."
 
-# type: SH
-#: dpkg-source.1:677
-#, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+# type: Plain text
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
+"Die I<Override-Datei> wird, falls angegeben, verwendet, um die Prioritäten "
+"in den ergebenen Index-Datensätzen zu setzen und sich über das Betreuer-Feld "
+"in den I<.dsc>-Dateien hinwegzusetzen. Lesen Sie B<dpkg-scanpackages>(1) für "
+"das Format dieser Datei. \\s-1Beachten Sie\\s0: Da die Override-Datei nach "
+"Binär- und nicht Quellpaketen indiziert wird, gibt es ein hier kleines "
+"Problem. Die aktuelle Implementierung verwendet die höchste Priorität aller "
+"von einer I<.dsc>-Datei erzeugten Binärpakete für die Priorität des "
+"Quellpakets, und den Inhalt für das Hinwegsetzen über die Betreuer-"
+"Information aus dem Eintrag für das erste in der I<.dsc>-Datei aufgeführte "
+"Binärpaket. Dies könnte sich ändern."
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-scansources.1:33
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
+"Der I<Pfad-Präfix> wird, falls angegeben, vor das Directory-Feld in dem "
+"erzeugten Quell-Index vorangestellt. Sie verwenden dies im allgemeinen, "
+"damit das Directory-Feld den Pfad von der Spitze der Debian-Hierarchie "
+"enthält."
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-scansources.1:44
+#, fuzzy
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
+"B<Hinweis:> Falls Sie auf die erzeugte Packages-Datei mit B<apt>(8) "
+"zugreifen wollen, werden Sie wahrscheinlich die Datei mit B<gzip>(1) "
+"komprimieren müssen (und damit ein Packages.gz-Datei erstellen). Apt "
+"ignoriert - abgesehen von lokalem Zugriff (d.h. über B<file://>-Quellen) - "
+"unkomprimierte Packages-Dateien."
+
+# type: IP
+#: dpkg-scansources.1:46
+#, no-wrap
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-n>, B<--no-sort>"
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-scansources.1:49
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
+"Sortiere die Index-Datensätze nicht. Normalerweise werden sie nach "
+"Quellpaketnamen sortiert."
+
+# type: IP
+#: dpkg-scansources.1:49
+#, no-wrap
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-s>, B<--source-override> I<Datei>"
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-scansources.1:52
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
+"Verwenden Sie I<Datei> als Quell-Override-Datei. Die Standardeinstellung ist "
+"der Name der Override-Datei, die Sie angegeben haben, um I<.src> ergänzt."
 
 # type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
+"Die Quell-Override-Datei hat ein anderes Format als die Binär-Override-Datei."
+"Sie enthält nur zwei, durch Leerzeichen separierte Felder, der erste ist der "
+"Quellpaketname und der zweite der Bereich. Leerzeilen und Kommentarzeilen "
+"werden in normaler Art und Weise ignoriert. Falls ein Paket in beiden "
+"Dateien auftaucht, dann nimmt die Quell-Override Vorrang für die Einstellung "
+"des Bereichs."
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-scansources.1:58 install-info.8:272
 #, no-wrap
-msgid "B<Arch>"
-msgstr "B<Arch>"
+msgid "B<--debug>"
+msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
+msgstr "Schalte Debugging ein"
+
+# type: Plain text
+#: dpkg-scansources.1:68
+#, fuzzy
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<dpkg-scanpackages>(1)."
+
+# type: Plain text
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+
+# type: TH
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
+#, fuzzy, no-wrap
+msgid "dpkg-shlibdeps"
+msgstr "dpkg-checkbuilddeps"
+
+# type: Plain text
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:720
-#, no-wrap
-msgid "B<source:Version>"
-msgstr "B<source:Version>"
+# type: Plain text
+#: dpkg-shlibdeps.1:35
+msgid ""
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:723
-msgid "The source package version."
+#: dpkg-shlibdeps.1:41
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:41
 #, no-wrap
-msgid "B<source:Upstream-Version>"
-msgstr "B<source:Upstream-Version>"
+msgid "B<-e>I<executable>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:45
 msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<binary:Version>"
+msgid "B<-d>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:731
+#: dpkg-shlibdeps.1:51
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:731
-#, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<Source-Version>"
+# type: Plain text
+#: dpkg-shlibdeps.1:61
+msgid ""
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:736
+#: dpkg-shlibdeps.1:69
 msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:736
+#: dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "B<Installed-Size>"
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:745
+#: dpkg-shlibdeps.1:80
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
+msgstr ""
+
+# type: Plain text
+#: dpkg-shlibdeps.1:86
+msgid ""
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:745
+#: dpkg-shlibdeps.1:86
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B<-t>I<type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:754
+#: dpkg-shlibdeps.1:93
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:754
+#: dpkg-shlibdeps.1:93
 #, no-wrap
-msgid "B<F:>I<fieldname>"
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-shlibdeps.1:99
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:761
-#, no-wrap
-msgid "B<Format>"
-msgstr "B<Format>"
-
 # type: Plain text
-#: dpkg-source.1:771
+#: dpkg-shlibdeps.1:105
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:771
+#: dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
-msgstr ""
+msgid "B<debian/shlibs.local>"
+msgstr "B<debian/shlibs.local>"
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:774
+#: dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
-msgstr ""
+msgid "B</etc/dpkg/shlibs.override>"
+msgstr "B</etc/dpkg/shlibs.override>"
 
 # type: Plain text
-#: dpkg-source.1:779
-msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:779
+#: dpkg-shlibdeps.1:123
 #, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg:Upstream-Version>"
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr "B</etc/dpkg/shlibs.default>"
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:782
+#: dpkg-shlibdeps.1:129
+#, fuzzy
+msgid "B<deb-shlibs>(5)."
+msgstr "B<debian/shlibs.local>"
+
+# type: TH
+#: dpkg-source.1:2
 #, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg:Version>"
+msgid "dpkg-source"
+msgstr "dpkg-source"
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:6
+#, fuzzy
+msgid "dpkg-source, - Debian source package tools"
+msgstr "B<dpkg-source> packt und entpackt Debian Quellarchive."
+
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
+
+# type: Plain text
+#: dpkg-source.1:15
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
+msgstr "B<dpkg-source> packt und entpackt Debian Quellarchive."
+
+# type: Plain text
+#: dpkg-source.1:19
+msgid ""
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
+"Keiner dieser Kommandos erlaubt es, mehrere  Optionen in eine zu "
+"kombinieren, und sie erlauben es nicht, den Wert einer Option in einem "
+"separaten Argument zu speichern."
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:21
+#, fuzzy, no-wrap
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
+msgstr "B<dpkg-source> B<-x >I<Dateiname>B<.dsc> [I<Ausgabe-Verzeichnis>]"
+
+# type: Plain text
+#: dpkg-source.1:31
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:789
-#, no-wrap
-msgid "B<debian/control>"
-msgstr "B<debian/control>"
+# type: Plain text
+#: dpkg-source.1:37
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:45
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:794
-#, no-wrap
-msgid "B<debian/changelog>"
-msgstr "B<debian/changelog>"
+# type: Plain text
+#: dpkg-source.1:45
+#, fuzzy, no-wrap
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-source -b> [I<Optionen>] I<Verzeichnis> [I<Orig-Verzeichnis>|I<Orig-targz>|'']"
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:60
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:800
-#, no-wrap
-msgid "B<debian/files>"
-msgstr "B<debian/files>"
+# type: Plain text
+#: dpkg-source.1:75
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:82
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<debian/substvars>"
+# type: Plain text
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:816
-msgid "List of substitution variables and values."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
-msgstr "B<debian/shlibs.local>"
+# type: Plain text
+#: dpkg-source.1:118
+msgid ""
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:137
+msgid ""
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:819
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
-msgstr "B</etc/dpkg/shlibs.override>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> mit B<-b>"
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:173
+msgid ""
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:822
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
-msgstr "B</etc/dpkg/shlibs.default>"
+# type: Plain text
+#: dpkg-source.1:185
+msgid ""
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:196
+msgid ""
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:205
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:234
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-source.1:240
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
+msgstr ""
+
+# type: TP
+#: dpkg-source.1:240
+#, no-wrap
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:845
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
-msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
-"Diese Hilfsprogramme und diese Handbuchseite wurden von Ian Jackson "
-"geschrieben."
 
 # type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr "Copyright (C) 1995-1996 Ian Jackson"
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:258
+msgid ""
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr "Copyright (C) 2000 Wichert Akkerman"
+#: dpkg-source.1:263
+msgid ""
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:857
+#: dpkg-source.1:274
 msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
-"Dies ist Freie Software; lesen Sie die GNU General Public License Version 2 "
-"oder neuer für die Kopierbedingungen. Es gibt KEINE HAFTUNG. Lesen Sie B</"
-"usr/share/doc/dpkg/copyright> und B</usr/share/common-licenses/GPL> für "
-"Details."
+
+# type: Plain text
+#: dpkg-source.1:279
+#, fuzzy
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
 
 # type: TH
 #: dpkg-split.1:2
@@ -6913,37 +7042,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-split - Debian-Paketarchiv Teilungs- und Zusammensetzwerkzeug"
 
 # type: Plain text
-#: dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-split> B<-s>|B<--split> I<Komplettarchiv> [I<Präfix>]"
-
-# type: Plain text
-#: dpkg-split.1:13
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg-split> B<-j>|B<--join> I<Teil> ..."
-
-# type: Plain text
-#: dpkg-split.1:17
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-split> B<-I>|B<--info> I<Teil> ..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< Komplettausgabe Teil>"
-
-# type: Plain text
-#: dpkg-split.1:24
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg-split> B<-l>|B<--listq>"
-
-# type: Plain text
-#: dpkg-split.1:28
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<Paket> ...]"
+#: dpkg-split.1:10
+#, fuzzy
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<Optionen>] I<Aktionen>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6954,7 +7059,7 @@ msgstr ""
 "Medien wie Disketten zu ermöglichen."
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -6963,7 +7068,7 @@ msgstr ""
 "verwendet werden."
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6977,25 +7082,25 @@ msgstr ""
 "und B<--discard> erlauben die Verwaltung dieser Liste."
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:49
-#, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr ""
+# type: Plain text
+#: dpkg-split.1:33
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-split> B<-s>|B<--split> I<Komplettarchiv> [I<Präfix>]"
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -7003,27 +7108,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:68
-#, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr ""
+# type: Plain text
+#: dpkg-split.1:52
+#, fuzzy, no-wrap
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-split> B<-j>|B<--join> I<Teil> ..."
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -7031,7 +7136,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -7039,43 +7144,49 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-split> B<-I>|B<--info> I<Teil> ..."
+
+# type: Plain text
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
 "saying so instead (but still on standard output)."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:92
-#, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr ""
+# type: Plain text
+#: dpkg-split.1:76
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< Komplettausgabe Teil>"
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -7083,21 +7194,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -7105,117 +7216,96 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:127
-#, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr ""
+#: dpkg-split.1:111
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--listq>"
+msgstr "B<-l, --license>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
 "stored in the queue."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:134
-#, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr ""
+# type: Plain text
+#: dpkg-split.1:118
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-split> B<-d>|B<--discard> [I<Paket> ...]"
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-"Gibt B<dpkg-split>s Bedienungshinweis mit einer Zusammenfassung seiner "
-"Optionen und deren Verwendungen aus."
-
-# type: Plain text
-#: dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "Gibt B<dpkg-split>s Versionsnummer aus."
-
-# type: Plain text
-#: dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:166
-#, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
-msgstr ""
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
+msgstr "B<-a>|B<--startas> I<Pfadname>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:170
-#, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
-msgstr ""
+# type: Plain text
+#: dpkg-split.1:147
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--output> I<complete-output>"
+msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< Komplettausgabe Teil>"
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:178
-#, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr ""
+#: dpkg-split.1:155
+#, fuzzy, no-wrap
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -7224,19 +7314,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -7244,20 +7334,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "EXIT-STATUS"
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -7265,14 +7355,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -7280,28 +7370,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -7309,19 +7399,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -7329,12 +7419,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 #, fuzzy
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
@@ -7368,26 +7458,12 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-"B<dpkg-statoverride> [I<Optionen>] B<--add>I< E<lt>BenutzerE<gt> "
-"E<lt>GruppeE<gt> E<lt>ModusE<gt> E<lt>DateiE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<dpkg-statoverride> [I<Optionen>] B<--remove>I< E<lt>DateiE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr ""
-"B<dpkg-statoverride> [I<Optionen>] B<--list> [I<E<lt>Glob-MusterE<gt>>]"
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg-architecture> [I<Optionen>] [I<Aktion>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -7406,7 +7482,7 @@ msgstr ""
 "zu sein."
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -7416,19 +7492,20 @@ msgstr ""
 "hinzufügen, entfernen und auflisten von Hinwegsetzungen."
 
 # type: TP
-#: dpkg-statoverride.8:34
-#, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#: dpkg-statoverride.8:25
+#, fuzzy, no-wrap
+msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< E<lt>BenutzerE<gt> E<lt>GruppeE<gt> E<lt>ModusE<gt> E<lt>DateiE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
+#, fuzzy
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 "Füge eine Hinwegsetzung für B<E<lt>DateiE<gt>> hinzu. B<E<lt>DateiE<gt>> "
 "muss noch nicht existieren wenn diese Kommando verwendet wird; die "
@@ -7438,37 +7515,33 @@ msgstr ""
 "oder B<#65534>)."
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
+#, fuzzy
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 "Falls --update angegeben ist und die B<E<lt>DateiE<gt>> existiert, dann wird "
 "diese sofort auf den neuen Eigentümer und Modus eingestellt."
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--remove>I< E<lt>DateiE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
+#, fuzzy
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 "Entfernt eine Hinwegsetzung für B<E<lt>DateiE<gt>>, der Status von "
 "B<E<lt>DateiE<gt>> bleibt durch dieses Kommando unverändert."
 
 # type: TP
-#: dpkg-statoverride.8:48
-#, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+#: dpkg-statoverride.8:39
+#, fuzzy, no-wrap
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<E<lt>Glob-MusterE<gt>>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
@@ -7479,14 +7552,23 @@ msgstr ""
 "keine Hinwegsetzungen gibt oder keine auf den Glob passt, wird sich B<dpkg-"
 "statoverride> mit einem Exit-Wert von 1 beenden."
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+"Wechsle das Verzeichnis der Dpkg-Datenbank, wo auch die statoverride-Datei "
+"gelagert ist. Der Standard ist I</var/lib/dpkg>."
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
@@ -7496,13 +7578,13 @@ msgstr ""
 "hinwegzusetzen."
 
 # type: TP
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -7510,43 +7592,18 @@ msgstr ""
 "ändern, falls sie existiert."
 
 # type: Plain text
-#: dpkg-statoverride.8:64
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Sei nicht so ausführlich darüber, was wir machen."
 
-# type: Plain text
-#: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr "Zeige Bedienungsinformationen."
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr "Zeige Programmversion und Copyright."
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr "B<--admindir>"
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
-msgstr ""
-"Wechsle das Verzeichnis der Dpkg-Datenbank, wo auch die statoverride-Datei "
-"gelagert ist. Der Standard ist I</var/lib/dpkg>."
-
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -7557,7 +7614,7 @@ msgstr ""
 "für Dpkg wichtigen Dateien, wie »status« oder »available«."
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
@@ -7566,7 +7623,7 @@ msgstr ""
 "»-old« bevor es sie mit einer neuen ersetzt."
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
 
@@ -7657,6 +7714,12 @@ msgid ""
 "without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
 
+# type: TP
+#: dselect.1:52
+#, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir>I< E<lt>VerzeichnisE<gt>>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7887,6 +7950,11 @@ msgstr ""
 "Zeige die Copyright- und Lizenzinformationen von B<dselect> und beende sich "
 "erfolgreich."
 
+# type: Plain text
+#: dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr "Gebe Versionsinformationen aus und beende sich erfolgreich."
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -8942,27 +9010,13 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr "start-stop-daemon - startet und stoppt System-Daemon-Programme"
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr "B<start-stop-daemon> B<-S>|B<--start> I<Optionen> [B<-->] I<Argumente>"
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<Optionen>"
 
 # type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -8976,15 +9030,41 @@ msgstr ""
 "Prozess finden kann."
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:36
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
+msgstr ""
+"Hinweis: falls B<--pidfile> nicht angegeben ist, verhält sich B<start-stop-"
+"daemon> ähnlich zu B<killall>(1). B<start-stop-daemon> wird die "
+"Prozesstabelle nach Prozessen durchsuchen, die auf den Prozessnamen, uid und/"
+"oder gid (falls angegeben) passen. Jeder passender Prozess wird B<--start> "
+"daran hindern, den Daemon zu starten. Allen passenden Prozessen wird das "
+"KILL-Signal geschickt, fall B<--stop> angegeben ist. Für Daemons die "
+"langlebige Kinder haben, die ein B<--stop> überleben sollen, müssen Sie eine "
+"PID-Datei angeben."
+
+# type: Plain text
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|B<--start> I<Optionen> [B<-->] I<Argumente>"
+
+# type: Plain text
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 "Mittels B<--start> überprüft B<start-stop-daemon> auf die Existenz eines "
 "speziellen Prozesses. Falls ein solcher Prozess existiert, dann macht "
@@ -8996,15 +9076,22 @@ msgstr ""
 "Argument nach B<--> wird unverändert an das zu startende Programm "
 "weitergegeben."
 
+# type: IP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-n>, B<--no-sort>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 "Mit B<--stop> überprüft B<start-stop-daemon> auf auf die Existenz eines "
 "speziellen Prozesses. Falls ein solcher Prozess existiert, dann sendet "
@@ -9014,34 +9101,38 @@ msgstr ""
 "spezifiziert ist). Falls B<--retry> spezifiziert wurden dann wird B<start-"
 "stop-daemon> überprüfen, ob der/die Prozess(e) beendet wurden."
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-h>,B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
-msgstr ""
-"Hinweis: falls B<--pidfile> nicht angegeben ist, verhält sich B<start-stop-"
-"daemon> ähnlich zu B<killall>(1). B<start-stop-daemon> wird die "
-"Prozesstabelle nach Prozessen durchsuchen, die auf den Prozessnamen, uid und/"
-"oder gid (falls angegeben) passen. Jeder passender Prozess wird B<--start> "
-"daran hindern, den Daemon zu starten. Allen passenden Prozessen wird das "
-"KILL-Signal geschickt, fall B<--stop> angegeben ist. Für Daemons die "
-"langlebige Kinder haben, die ein B<--stop> überleben sollen, müssen Sie eine "
-"PID-Datei angeben."
+#: start-stop-daemon.8:76
+#, fuzzy
+msgid "Show usage information and exit."
+msgstr "Zeige Bedienungsinformationen."
 
 # type: TP
-#: start-stop-daemon.8:90
-#, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Zeige Programmversion und Copyright."
+
+# type: TP
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<Programm>"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -9050,24 +9141,24 @@ msgstr ""
 "diesem Programm sind."
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>|B<--pidfile> I<pid-Datei>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Überprüfe, ob ein Prozess die Datei I<pid-Datei> erstellt hat."
 
 # type: TP
-#: start-stop-daemon.8:98
-#, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>|B<--user> I<Benutzername>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -9075,24 +9166,24 @@ msgstr ""
 "spezifizierten Benutzer gehören."
 
 # type: TP
-#: start-stop-daemon.8:104
-#, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>|B<--group> I<Gruppe>|I<gid>"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Wechsle zum Starten des Prozesses zur I<Gruppe> oder I<gid>."
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<Prozessname>"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -9101,13 +9192,13 @@ msgstr ""
 "I<Prozessname>."
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<Signal>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -9116,13 +9207,13 @@ msgstr ""
 "spezifiziert (standardmäßig 15)."
 
 # type: TP
-#: start-stop-daemon.8:118
-#, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>|B<--retry> I<Zeitüberschreitung>|I<Plan>"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -9135,7 +9226,7 @@ msgstr ""
 "nicht beenden werden weitere im »Plan« angegebene Aktionen durchgeführt."
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -9147,7 +9238,7 @@ msgstr ""
 "spezifizierte Signal ist."
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -9163,7 +9254,7 @@ msgstr ""
 "bedeutet, den Rest des Plans falls notwendig für immer zu wiederholen."
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -9175,13 +9266,13 @@ msgstr ""
 "spezifizierte Signal ignoriert."
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<Pfadname>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -9191,13 +9282,13 @@ msgstr ""
 "Argumente verwendet."
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -9206,38 +9297,38 @@ msgstr ""
 "Rückgabewerte, führe aber keine Aktionen durch."
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Liefert den Rückgabewert 0 anstatt 1 falls keine Aktionen ausgeführt wurden "
 "(würden)."
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 "Gebe keine informationelle Meldungen aus, zeige nur Fehlermeldungen an."
 
 # type: TP
-#: start-stop-daemon.8:183
-#, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c>|B<--chuid> I<Benutzername>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -9258,13 +9349,13 @@ msgstr ""
 "wie B<nobody>)."
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<Wurzel>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -9273,13 +9364,13 @@ msgstr ""
 "Sie, das die PID-Datei auch nach dem chroot geschrieben wird."
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<Pfad>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -9291,13 +9382,13 @@ msgstr ""
 "Wurzelverzeichnis wechseln."
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -9316,35 +9407,35 @@ msgstr ""
 "oder wo es nicht sinnvoll ist, den Code hierfür hinzuzufügen."
 
 # type: TP
-#: start-stop-daemon.8:226
-#, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+#: start-stop-daemon.8:217
+#, fuzzy, no-wrap
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<Ganzzahl>"
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "Dies ändert die Priorität des Prozesses bevor er gestartet wird."
 
 # type: TP
-#: start-stop-daemon.8:229
-#, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+#: start-stop-daemon.8:220
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>|B<--umask> I<Maske>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr "Dies setzt die umask des Prozesses bevor er gestartet wird."
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -9364,40 +9455,18 @@ msgstr ""
 "Kombination mit der B<--background> Option sinnvoll."
 
 # type: TP
-#: start-stop-daemon.8:247
-#, no-wrap
-msgid "B<-v>|B<--verbose>"
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "Gibt ausführliche informative Meldungen aus."
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr "Gibt Hilfeinformationen aus und beendet sich dann."
-
-# type: TP
-#: start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
 # type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr "Gibt Versionsinformationen aus und beendet sich dann."
-
-# type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -9407,7 +9476,7 @@ msgstr ""
 "ukE<gt>."
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -9421,12 +9490,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -9436,56 +9499,13 @@ msgstr ""
 "Standardwerten für Kommandos"
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-"B<update-alternatives> [I<Optionen>] B<--install> I<Genname Symlink Altern "
-"Priorität> [B<--slave> I<Genname Symlink> I<Altern>]..."
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--remove> I<Name Pfad>"
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--remove-all> I<Name>"
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr "B<update-alternatives> [I<Optionen>] B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--auto> I<Name>"
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--display> I<Name>"
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--list> I<Name>"
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--config> I<Name>"
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr "B<update-alternatives> [I<Optionen>] B<--set> I<Name Pfad>"
-
-# type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -9495,7 +9515,7 @@ msgstr ""
 "System« bilden, an."
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -9513,7 +9533,7 @@ msgstr ""
 "Starten zu treffen, falls der Benutzer keine spezielle Wahl getroffen hat."
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -9539,7 +9559,7 @@ msgstr ""
 "explizit dazu aufgefordert wird."
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -9557,7 +9577,7 @@ msgstr ""
 "ist."
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -9572,7 +9592,7 @@ msgstr ""
 "vom B<postinst>- oder B<prerm>-Skript eines Debian-Paketes aufgerufen."
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -9593,7 +9613,7 @@ msgstr ""
 "eine I<Link-Gruppe>."
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -9610,7 +9630,7 @@ msgstr ""
 "Systemadministrator."
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -9625,7 +9645,7 @@ msgstr ""
 "wird automatisch in den manuellen Modus umgeschaltet."
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -9636,7 +9656,7 @@ msgstr ""
 "die Alternative mit der höchsten Priorität."
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -9656,7 +9676,7 @@ msgstr ""
 "wieder in den automatischen Zustand zurückzukehren."
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
@@ -9665,7 +9685,7 @@ msgstr ""
 "I<--set> Option verwenden (siehe unten)."
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -9674,13 +9694,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "BEGRIFFE"
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -9689,13 +9709,13 @@ msgstr ""
 "einige spezielle Begriffe helfen, seine Vorgehensweise zu erläutern."
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr "generischer Name"
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -9704,13 +9724,13 @@ msgstr ""
 "eine Reihe von Dateien mit ähnlicher Funktionalität bezieht."
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr "Symlink"
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -9721,13 +9741,13 @@ msgstr ""
 "sollen."
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr "Alternative"
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -9736,26 +9756,26 @@ msgstr ""
 "generischen Namens über das Alternativ-System zugreifbar gemacht werden kann."
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr "Alternativ-Verzeichnis"
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 "Ein Verzeichnis, standardmäßig I</etc/alternatives>, das die Symlinks "
 "enthält."
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr "administratives Verzeichnis"
 
 # type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -9764,26 +9784,26 @@ msgstr ""
 "B<update-alternatives> Zustandsinformationen enthält."
 
 # type: TP
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr "Linkgruppe"
 
 # type: Plain text
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 "Ein Satz zusammengehörender Symlinks, die als Gruppe aktualisiert werden "
 "sollen."
 
 # type: TP
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr "Master-Link"
 
 # type: Plain text
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
@@ -9792,13 +9812,13 @@ msgstr ""
 "Gruppe konfiguriert werden."
 
 # type: TP
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr "Slave-Link"
 
 # type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
 msgstr ""
@@ -9806,13 +9826,13 @@ msgstr ""
 "bestimmt wird."
 
 # type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr "automatischer Modus"
 
 # type: Plain text
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -9823,13 +9843,13 @@ msgstr ""
 "Alternative mit der höchsten Priorität zeigen."
 
 # type: TP
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr "manueller Modus"
 
 # type: Plain text
-#: update-alternatives.8:245
+#: update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -9837,149 +9857,14 @@ msgstr ""
 "Ist eine Linkgruppe im manuellen Modus, dann führt das Alternativ-System "
 "keine Änderungen an den Einstellungen des Systemadministrators durch."
 
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-"Es gibt mehrere Pakete die einen zum B<vi> kompatiblen Texteditor "
-"bereitstellen, beispielsweise B<nvi> und B<vim>. Welcher benutzt wird, wird "
-"durch die Linkgruppe B<vi> eingestellt, welche Links für das Programm selber "
-"und die zugehörige Handbuchseite beinhaltet."
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-"Um alle verfügbaren Programme anzuzeigen, die B<vi> bereitstellen, und die "
-"dazu gehörigen Einstellungen, benutzen Sie die I<--display> Aktion:"
-
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr "update-alternatives --display vi"
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-"Um eine bestimmte B<vi>-Implementation auszuwählen, benutzen Sie als Root "
-"den folgenden Befehl und wählen dann eine Zahl aus der Liste aus:"
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr "update-alternatives --config vi"
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-"Um zur automatischen Auswahl der B<vi>-Implementation zurückzukehren, führen "
-"Sie folgendes als Root aus:"
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr "update-alternatives --auto vi"
-
-# type: Plain text
-#: update-alternatives.8:290
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-"Genau eine Aktion muss angegeben werden, falls B<update-alternatives> eine "
-"sinnvolle Aufgabe erfüllen soll. Eine beliebige Anzahl von allgemeinen "
-"Optionen kann zusammen mit jeder Aktion spezifiziert werden."
-
-# type: TP
-#: update-alternatives.8:291
-#, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--verbose>"
-
-# type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr "Erzeugt mehr Kommentare über die Tätigkeit von B<update-alternatives.>"
-
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-"Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf. Diese Option "
-"ist noch nicht implementiert."
-
-# type: Plain text
-#: update-alternatives.8:304
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-"Führe nichts durch, sondern teile nur mit, was getan würde. Diese Option ist "
-"noch nicht implementiert."
-
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
-msgstr "Gebe Benutzungshinweise"
-
-# type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr "Gebe die Version von B<update-alternatives> aus."
-
-# type: TP
-#: update-alternatives.8:312
-#, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--altdir> I<Verzeichnis>"
-
-# type: Plain text
-#: update-alternatives.8:316
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-"Spezifiziert das Alternativ-Verzeichnis, wenn sich dieses von der "
-"Standardeinstellung unterscheiden soll."
-
-# type: TP
-#: update-alternatives.8:316
-#, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir> I<Verzeichnis>"
-
-# type: Plain text
-#: update-alternatives.8:320
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr ""
-"Spezifiziert das administrative Verzeichnis, wenn sich dieses vom "
-"Standardwert unterscheiden soll."
-
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr "B<--install> I<Genname Symlink Altern Priorität> [B<--slave> I<Genname Symlink Altern>] ..."
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -9998,7 +9883,7 @@ msgstr ""
 "von drei Argumenten gefolgt, können spezifiziert werden."
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -10018,13 +9903,13 @@ msgstr ""
 "Alternative zu zeigen."
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<Name Pfad>"
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
@@ -10033,13 +9918,13 @@ msgstr ""
 "zu I<--config>, ist aber nicht interaktiv und kann somit geskriptet werden."
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<Name Pfad>"
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -10060,13 +9945,13 @@ msgstr ""
 "geändert; nur die Information über die Alternative wird entfernt."
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<Name>"
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -10075,24 +9960,24 @@ msgstr ""
 "ist ein Name im Alternativ-Verzeichnis."
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr "Rufe B<--config> für alle Alternativen auf."
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto> I<Link>"
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -10103,13 +9988,13 @@ msgstr ""
 "installierte Alternative mit höchster Priorität zu zeigen."
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--display> I<Link>"
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -10125,41 +10010,94 @@ msgstr ""
 "höchsten Priorität."
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--list> I<Link>"
 
 # type: Plain text
-#: update-alternatives.8:407
-msgid "Display all targets of the link group."
-msgstr "Zeige alle Ziele der Linkgruppe an."
-
-# type: TP
-#: update-alternatives.8:407
-#, no-wrap
-msgid "B<--config> I<link>"
-msgstr "B<--config> I<Link>"
+#: update-alternatives.8:288
+msgid "Display all targets of the link group."
+msgstr "Zeige alle Ziele der Linkgruppe an."
+
+# type: TP
+#: update-alternatives.8:288
+#, no-wrap
+msgid "B<--config> I<link>"
+msgstr "B<--config> I<Link>"
+
+# type: Plain text
+#: update-alternatives.8:295
+msgid ""
+"Show available alternatives for a link group and allow the user to "
+"interactively select which one to use. The link group is updated and taken "
+"out of I<auto> mode."
+msgstr ""
+"Zeige die verfügbaren Alternativen für eine Linkgruppe an und erlaube es dem "
+"Benutzer interaktiv auszuwählen, welche zu benutzen ist. Die Linkgruppe wird "
+"aktualisiert und aus dem I<automatischen> Modus genommen."
+
+# type: TP
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--altdir> I<Verzeichnis>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+"Spezifiziert das Alternativ-Verzeichnis, wenn sich dieses von der "
+"Standardeinstellung unterscheiden soll."
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+"Spezifiziert das administrative Verzeichnis, wenn sich dieses vom "
+"Standardwert unterscheiden soll."
+
+# type: TP
+#: update-alternatives.8:311
+#, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr "Erzeugt mehr Kommentare über die Tätigkeit von B<update-alternatives.>"
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+"Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf. Diese Option "
+"ist noch nicht implementiert."
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:324
 msgid ""
-"Show available alternatives for a link group and allow the user to "
-"interactively select which one to use. The link group is updated and taken "
-"out of I<auto> mode."
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
 msgstr ""
-"Zeige die verfügbaren Alternativen für eine Linkgruppe an und erlaube es dem "
-"Benutzer interaktiv auszuwählen, welche zu benutzen ist. Die Linkgruppe wird "
-"aktualisiert und aus dem I<automatischen> Modus genommen."
+"Führe nichts durch, sondern teile nur mit, was getan würde. Diese Option ist "
+"noch nicht implementiert."
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -10168,13 +10106,13 @@ msgstr ""
 "Option geändert werden."
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -10183,24 +10121,24 @@ msgstr ""
 "admindir> Option geändert werden."
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr "Die angeforderte Aktion wurde erfolgreich ausgeführt."
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -10209,7 +10147,7 @@ msgstr ""
 "auf."
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -10224,7 +10162,66 @@ msgstr ""
 "sein; falls Sie dies nicht so empfinden, melden Sie dies bitte als Fehler."
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+#, fuzzy
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+"Es gibt mehrere Pakete die einen zum B<vi> kompatiblen Texteditor "
+"bereitstellen, beispielsweise B<nvi> und B<vim>. Welcher benutzt wird, wird "
+"durch die Linkgruppe B<vi> eingestellt, welche Links für das Programm selber "
+"und die zugehörige Handbuchseite beinhaltet."
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+"Um alle verfügbaren Programme anzuzeigen, die B<vi> bereitstellen, und die "
+"dazu gehörigen Einstellungen, benutzen Sie die I<--display> Aktion:"
+
+# type: Plain text
+#: update-alternatives.8:367
+#, fuzzy
+msgid "B<update-alternatives --display vi>"
+msgstr "update-alternatives --display vi"
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+"Um eine bestimmte B<vi>-Implementation auszuwählen, benutzen Sie als Root "
+"den folgenden Befehl und wählen dann eine Zahl aus der Liste aus:"
+
+# type: Plain text
+#: update-alternatives.8:374
+#, fuzzy
+msgid "B<update-alternatives --config vi>"
+msgstr "update-alternatives --config vi"
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+"Um zur automatischen Auswahl der B<vi>-Implementation zurückzukehren, führen "
+"Sie folgendes als Root aus:"
+
+# type: Plain text
+#: update-alternatives.8:381
+#, fuzzy
+msgid "B<update-alternatives --auto vi>"
+msgstr "update-alternatives --auto vi"
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
@@ -10234,7 +10231,7 @@ msgstr ""
 "eine E-Mail (in englisch) direkt an den Autor."
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -10245,7 +10242,7 @@ msgstr ""
 "in der Implementation oder in der Dokumentation; bitte melden Sie dies."
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -10256,7 +10253,7 @@ msgstr ""
 "neuer für die Kopierbedingungen. Es gibt KEINE HAFTUNG."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -10268,7 +10265,7 @@ msgstr ""
 "HAFTUNG."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
@@ -10277,12 +10274,392 @@ msgstr ""
 "GPL finden."
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+# type: Plain text
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+
+# type: Plain text
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "Abschnitt 5.2.14,"
+
+# type: Plain text
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> und diese Handbuchseite wurden von Ian Jackson geschrieben. "
+#~ "Sie werden hiermit von ihm lizenzfrei zur Verfügung gestellt."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>dirnameE<gt>>]"
+#~ msgstr ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>Verzeichnisname<gt>>]"
+
+# type: Plain text
+#~ msgid "Output the help screen and exit successfully."
+#~ msgstr "Gebe den Hilfebildschirm aus und beende sich erfolgreich."
+
+# type: Plain text
+#~ msgid "Output version and exit successfully."
+#~ msgstr "Gebe die Version aus und beende sich erfolgreich"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Print a usage message."
+#~ msgstr ""
+#~ "#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "Gebe einen Bedienungshinweis aus.\n"
+#~ "#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "Zeige eine Verwendungsmitteilung."
+
+# type: Plain text
+#~ msgid "Print program version."
+#~ msgstr "Zeige die Programm-Version."
+
+# type: TH
+#~ msgid "2006-05-23"
+#~ msgstr "2006-05-23"
+
+# type: Plain text
+#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#~ msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<Format>] I<Archiv>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<Archiv-Verzeichnis>"
+
+# type: TP
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Gibt einen Bedienungshinweis, mit einer Zusammenfassung seiner Optionen "
+#~ "und deren Verwendungen, aus."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Gibt B<dpkg-deb>'s Versionsnummer aus."
+
+# type: TP
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
+
+# type: SH
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "ANDERE OPTIONEN"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<Optionen>] B<--remove> I<E<lt>DateiE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<Optionen>] B<--list> I<E<lt>Glob-MusterE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<Optionen>] B<--truename> I<E<lt>DateiE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-divert> is the utility used to set up and update the list of "
+#~ "diversions. It functions in three basic modes - adding, removing, and "
+#~ "listing diversions.  The options are B<--add>, B<--remove>, and B<--"
+#~ "list>, respectively. Additionally, it can print out the real name for a "
+#~ "diverted file with B<--truename>. Other options (listed below) may also "
+#~ "be specified."
+#~ msgstr ""
+#~ "B<dpkg-divert> ist das Hilfswerkzeug, das dazu verwendet wird, die Liste "
+#~ "der Umleitungen zu erstellen und zu aktualisieren. Es funktioniert in "
+#~ "drei grundlegenden Modi: Hinzufügen, Entfernen und Auflisten von "
+#~ "Umleitungen. Die Optionen sind respektive B<--add>, B<--remove> und B<--"
+#~ "list>. Zusätzlich kann es den echten Namen für eine umgeleitete Datei mit "
+#~ "B<--truename> ausgeben. Andere Optionen (unten aufgeführt) können auch "
+#~ "angegeben werden."
+
+# type: Plain text
+#~ msgid "Output short usage instructions, and exit successfully."
+#~ msgstr "Gebe kurze Bedienungsanweisungen aus und beende sich erfolgreich."
+
+# type: Plain text
+#~ msgid "Output program name and version and exit successfully."
+#~ msgstr "Gibt Programmnamen und Version aus und beende sich erfolgreich"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#~ msgstr ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<Verzeichnis>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] "
+#~ "[B<-v>|B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] "
+#~ "[I<Dateien>]"
+
+# type: TP
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<-h, --help>"
+
+# type: Plain text
+#~ msgid "Print a usage message and exit successfully."
+#~ msgstr "Gebe einen Bedienungshinweis aus und beende sich erfolgreich."
+
+# type: Plain text
+#~ msgid ""
+#~ "Print copyright information and (a reference to GNU) license information "
+#~ "and exit successfully."
+#~ msgstr ""
+#~ "Gebe Copyright-Informationen aus und (eine Referenz auf GNU-)"
+#~ "Lizenzinformationen und beende sich erfolgreich."
+
+# type: Plain text
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
+
+# type: Plain text
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg-query> B<--version>"
+
+# type: Plain text
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Gebe Lizenz- und Copyright-Informationen aus."
+
+# type: Plain text
+#~ msgid "Display version information."
+#~ msgstr "Gibt Versionsinformationen aus."
+
+# type: TH
+#~ msgid "2006-05-10"
+#~ msgstr "2006-05-10"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
+#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#~ msgstr ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>ArchE<gt>> ] [B<-m>] "
+#~ "I<Binärverz> I<Overridedatei> [I<Pfadpräfix>] B<E<gt>> I<Packages>"
+
+# type: Plain text
+#~ msgid ""
+#~ "When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for "
+#~ "all debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+#~ msgstr ""
+#~ "Wenn B<-a>I<E<lt>ArchE<gt>> angegeben ist, dann wird ein Muster bestehend "
+#~ "aus *_all.deb und *_arch.deb verwendet, anstatt nach allen Debs zu suchen."
+
+# type: SH
+#~ msgid "THE OVERRIDE FILE"
+#~ msgstr "DIE OVERRIDE-DATEI"
+
+# type: Plain text
+#~ msgid ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source "
+#~ "package tools"
+#~ msgstr ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian Quellpaket-"
+#~ "Werkzeuge"
+
+# type: SH
+#, fuzzy
+#~ msgid "COMMON OPTIONS"
+#~ msgstr ""
+#~ "#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "GEMEINSAME OPTIONEN\n"
+#~ "#-#-#-#-#  de.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "ALLGEMEINE OPTIONEN"
+
+# type: Plain text
+#~ msgid ""
+#~ "Many of these programs share options; these are described here, together "
+#~ "with the programs that accept them."
+#~ msgstr ""
+#~ "Viele dieser Programme haben Optionen gemeinsam; diese sind hier "
+#~ "beschrieben, zusammen mit den Programmen, die diese akzeptieren."
+
+# type: Plain text
+#~ msgid ""
+#~ "Display the particular program's usage message, including a synopsis of "
+#~ "the options it understands.  This option is understood by all the source "
+#~ "package tools."
+#~ msgstr ""
+#~ "Ziege den Gebrauchshinweis für das bestimmte Programm an, darunter eine "
+#~ "Übersicht der Optionen, die es versteht. Diese Option wird von allen "
+#~ "Werkzeugen für Quellpakete verstanden."
+
+# type: Plain text
+#~ msgid ""
+#~ "Display the particular program's version, including copyright and license "
+#~ "information.  This option is understood by all the source package tools."
+#~ msgstr ""
+#~ "Zeige die Version das bestimmte Programm an, darunter Copyright und "
+#~ "Lizenz-Informationen. Diese Option wird von allen Werkzeugen für "
+#~ "Quellpakete verstanden."
+
+# type: SH
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "dpkg-SOURCE OPTIONEN"
+
+# type: SH
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "dpkg-GENCONTROL OPTIONEN"
+
+# type: SH
+#~ msgid "dpkg-SHLIBDEPS OPTIONS"
+#~ msgstr "dpkg-SHLIBDEPS OPTIONEN"
+
+# type: SH
+#~ msgid "dpkg-GENCHANGES OPTIONS"
+#~ msgstr "dpkg-GENCHANGES OPTIONEN"
+
+# type: SH
+#~ msgid "dpkg-BUILDPACKAGE OPTIONS"
+#~ msgstr "dpkg-BUILDPACKAGE OPTIONS"
+
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "Dies ist Freie Software; lesen Sie die GNU General Public License Version "
+#~ "2 oder neuer für die Kopierbedingungen. Es gibt KEINE HAFTUNG. Lesen Sie "
+#~ "B</usr/share/doc/dpkg/copyright> und B</usr/share/common-licenses/GPL> "
+#~ "für Details."
+
+# type: Plain text
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Gibt B<dpkg-split>s Bedienungshinweis mit einer Zusammenfassung seiner "
+#~ "Optionen und deren Verwendungen aus."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "Gibt B<dpkg-split>s Versionsnummer aus."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
+#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [I<Optionen>] B<--add>I< E<lt>BenutzerE<gt> "
+#~ "E<lt>GruppeE<gt> E<lt>ModusE<gt> E<lt>DateiE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-statoverride> [I<Optionen>] B<--remove>I< E<lt>DateiE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [I<Optionen>] B<--list> [I<E<lt>Glob-MusterE<gt>>]"
+
+# type: TP
+#~ msgid "B<--admindir>"
+#~ msgstr "B<--admindir>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+
+# type: TP
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "Print help information; then exit."
+#~ msgstr "Gibt Hilfeinformationen aus und beendet sich dann."
+
+# type: Plain text
+#~ msgid "Print version information; then exit."
+#~ msgstr "Gibt Versionsinformationen aus und beendet sich dann."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+#~ msgstr ""
+#~ "B<update-alternatives> [I<Optionen>] B<--install> I<Genname Symlink "
+#~ "Altern Priorität> [B<--slave> I<Genname Symlink> I<Altern>]..."
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--remove> I<Name Pfad>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--remove-all> I<Name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--display> I<Name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--list> I<Name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--config> I<Name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#~ msgstr "B<update-alternatives> [I<Optionen>] B<--set> I<Name Pfad>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Exactly one action must be specified if B<update-alternatives> is to "
+#~ "perform any meaningful task.  Any number of the common options may be "
+#~ "specified together with any action."
+#~ msgstr ""
+#~ "Genau eine Aktion muss angegeben werden, falls B<update-alternatives> "
+#~ "eine sinnvolle Aufgabe erfüllen soll. Eine beliebige Anzahl von "
+#~ "allgemeinen Optionen kann zusammen mit jeder Aktion spezifiziert werden."
+
+# type: Plain text
+#~ msgid "Give some usage information."
+#~ msgstr "Gebe Benutzungshinweise"
+
+# type: Plain text
+#~ msgid "Tell which version of B<update-alternatives> this is."
+#~ msgstr "Gebe die Version von B<update-alternatives> aus."
+
 # type: Plain text
 #~ msgid "I<E<lt>divert-toE<gt>> is the name used by other packages' versions."
 #~ msgstr ""
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 142122e0..ff57058e 100644
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,120 +15,118 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 # type: TH
-#: ./822-date.1:3
+#: ./822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr ""
 
 # type: TH
-#: ./822-date.1:3 ./cleanup-info.8:1 ./deb.5:1 ./deb-control.5:3 ./deb-old.5:1 ./dpkg.cfg.5:1 ./dpkg-name.1:6 ./dpkg-split.1:2 ./dselect.1:1 ./dselect.cfg.5:1 ./install-info.8:5 ./start-stop-daemon.8:1
+#: ./822-date.1:2
 #, no-wrap
-msgid "2006-02-28"
+msgid "2007-01-24"
 msgstr ""
 
 # type: TH
-#: ./822-date.1:3 ./cleanup-info.8:1 ./deb.5:1 ./deb-control.5:3 ./deb-old.5:1 ./dpkg.1:1 ./dpkg-architecture.1:1 ./dpkg.cfg.5:1 ./dpkg-checkbuilddeps.1:1 ./dpkg-deb.1:1 ./dpkg-divert.8:1 ./dpkg-name.1:6 ./dpkg-query.1:1 ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1 ./dpkg-source.1:2 ./dpkg-split.1:2 ./dselect.1:1 ./dselect.cfg.5:1 ./install-info.8:5 ./start-stop-daemon.8:1 ./update-alternatives.8:8
+#: ./822-date.1:2 ./cleanup-info.8:1 ./deb.5:1 ./deb-control.5:3 ./deb-old.5:1 ./deb-override.5:16 ./deb-shlibs.5:16 ./deb-substvars.5:2 ./dpkg.1:1 ./dpkg-architecture.1:1 ./dpkg.cfg.5:1 ./dpkg-buildpackage.1:1 ./dpkg-checkbuilddeps.1:1 ./dpkg-distaddfile.1:1 ./dpkg-deb.1:1 ./dpkg-divert.8:1 ./dpkg-genchanges.1:1 ./dpkg-gencontrol.1:1 ./dpkg-name.1:6 ./dpkg-parsechangelog.1:1 ./dpkg-query.1:1 ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1 ./dpkg-shlibdeps.1:1 ./dpkg-source.1:2 ./dpkg-split.1:2 ./dselect.1:1 ./dselect.cfg.5:1 ./install-info.8:5 ./start-stop-daemon.8:1 ./update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr ""
 
 # type: TH
-#: ./822-date.1:3 ./cleanup-info.8:1 ./dpkg-architecture.1:1 ./dpkg-checkbuilddeps.1:1 ./dpkg-divert.8:1 ./dpkg-name.1:6 ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1 ./dpkg-source.1:2 ./dpkg-split.1:2 ./dpkg-statoverride.8:1 ./install-info.8:5 ./start-stop-daemon.8:1 ./update-alternatives.8:8
+#: ./822-date.1:2 ./cleanup-info.8:1 ./deb-override.5:16 ./deb-shlibs.5:16 ./deb-substvars.5:2 ./dpkg-architecture.1:1 ./dpkg-buildpackage.1:1 ./dpkg-checkbuilddeps.1:1 ./dpkg-distaddfile.1:1 ./dpkg-divert.8:1 ./dpkg-genchanges.1:1 ./dpkg-gencontrol.1:1 ./dpkg-name.1:6 ./dpkg-parsechangelog.1:1 ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1 ./dpkg-shlibdeps.1:1 ./dpkg-source.1:2 ./dpkg-split.1:2 ./dpkg-statoverride.8:1 ./install-info.8:5 ./start-stop-daemon.8:1 ./update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr ""
 
 # type: SH
-#: ./822-date.1:4 ./cleanup-info.8:2 ./deb.5:2 ./deb-control.5:4 ./deb-old.5:2 ./dpkg.1:2 ./dpkg-architecture.1:2 ./dpkg.cfg.5:2 ./dpkg-checkbuilddeps.1:2 ./dpkg-deb.1:2 ./dpkg-divert.8:2 ./dpkg-name.1:7 ./dpkg-query.1:2 ./dpkg-scanpackages.1:17 ./dpkg-scansources.1:2 ./dpkg-source.1:3 ./dpkg-split.1:3 ./dpkg-statoverride.8:2 ./dselect.1:2 ./dselect.cfg.5:2 ./install-info.8:6 ./start-stop-daemon.8:2 ./update-alternatives.8:9
+#: ./822-date.1:3 ./cleanup-info.8:2 ./deb.5:2 ./deb-control.5:4 ./deb-old.5:2 ./deb-override.5:17 ./deb-shlibs.5:17 ./deb-substvars.5:3 ./dpkg.1:2 ./dpkg-architecture.1:2 ./dpkg.cfg.5:2 ./dpkg-buildpackage.1:2 ./dpkg-checkbuilddeps.1:2 ./dpkg-distaddfile.1:2 ./dpkg-deb.1:2 ./dpkg-divert.8:2 ./dpkg-genchanges.1:2 ./dpkg-gencontrol.1:2 ./dpkg-name.1:7 ./dpkg-parsechangelog.1:2 ./dpkg-query.1:2 ./dpkg-scanpackages.1:17 ./dpkg-scansources.1:2 ./dpkg-shlibdeps.1:2 ./dpkg-source.1:3 ./dpkg-split.1:3 ./dpkg-statoverride.8:2 ./dselect.1:2 ./dselect.cfg.5:2 ./install-info.8:6 ./start-stop-daemon.8:2 ./update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: ./822-date.1:5
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr ""
 
 # type: SH
-#: ./822-date.1:7 ./cleanup-info.8:5 ./deb.5:4 ./deb-control.5:7 ./deb-old.5:5 ./dpkg.1:5 ./dpkg-architecture.1:5 ./dpkg-checkbuilddeps.1:5 ./dpkg-deb.1:4 ./dpkg-divert.8:5 ./dpkg-name.1:9 ./dpkg-query.1:5 ./dpkg-scanpackages.1:20 ./dpkg-scansources.1:5 ./dpkg-source.1:8 ./dpkg-split.1:5 ./dpkg-statoverride.8:5 ./dselect.1:5 ./install-info.8:9 ./start-stop-daemon.8:5 ./update-alternatives.8:12
+#: ./822-date.1:6 ./cleanup-info.8:5 ./deb.5:4 ./deb-control.5:7 ./deb-old.5:5 ./deb-override.5:20 ./deb-shlibs.5:20 ./deb-substvars.5:7 ./dpkg.1:5 ./dpkg-architecture.1:5 ./dpkg-buildpackage.1:5 ./dpkg-checkbuilddeps.1:5 ./dpkg-distaddfile.1:5 ./dpkg-deb.1:5 ./dpkg-divert.8:5 ./dpkg-genchanges.1:5 ./dpkg-gencontrol.1:5 ./dpkg-name.1:10 ./dpkg-parsechangelog.1:5 ./dpkg-query.1:5 ./dpkg-scanpackages.1:20 ./dpkg-scansources.1:5 ./dpkg-shlibdeps.1:5 ./dpkg-source.1:7 ./dpkg-split.1:6 ./dpkg-statoverride.8:5 ./dselect.1:5 ./install-info.8:9 ./start-stop-daemon.8:5 ./update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:9
+#: ./822-date.1:8
 msgid "B<822-date>"
 msgstr ""
 
 # type: SH
-#: ./822-date.1:10 ./cleanup-info.8:10 ./deb.5:6 ./deb-control.5:10 ./deb-old.5:8 ./dpkg.1:19 ./dpkg-architecture.1:11 ./dpkg.cfg.5:5 ./dpkg-checkbuilddeps.1:8 ./dpkg-deb.1:36 ./dpkg-divert.8:26 ./dpkg-name.1:22 ./dpkg-query.1:36 ./dpkg-scanpackages.1:31 ./dpkg-scansources.1:14 ./dpkg-source.1:33 ./dpkg-split.1:28 ./dpkg-statoverride.8:19 ./dselect.1:18 ./dselect.cfg.5:5 ./install-info.8:25 ./start-stop-daemon.8:22 ./update-alternatives.8:60
+#: ./822-date.1:9 ./cleanup-info.8:11 ./deb.5:6 ./deb-control.5:10 ./deb-old.5:8 ./deb-override.5:23 ./deb-shlibs.5:23 ./deb-substvars.5:10 ./dpkg.1:19 ./dpkg-architecture.1:11 ./dpkg.cfg.5:5 ./dpkg-buildpackage.1:9 ./dpkg-checkbuilddeps.1:10 ./dpkg-distaddfile.1:9 ./dpkg-deb.1:10 ./dpkg-divert.8:10 ./dpkg-genchanges.1:10 ./dpkg-gencontrol.1:9 ./dpkg-name.1:16 ./dpkg-parsechangelog.1:9 ./dpkg-query.1:9 ./dpkg-scanpackages.1:29 ./dpkg-scansources.1:14 ./dpkg-shlibdeps.1:11 ./dpkg-source.1:12 ./dpkg-split.1:11 ./dpkg-statoverride.8:10 ./dselect.1:18 ./dselect.cfg.5:5 ./install-info.8:25 ./start-stop-daemon.8:10 ./update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:14
+#: ./822-date.1:15
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
+msgstr ""
+
+# type: Plain text
+#: ./822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
 msgstr ""
 
 # type: SH
-#: ./822-date.1:15 ./cleanup-info.8:29 ./dpkg.1:293 ./dpkg-architecture.1:27 ./dpkg-checkbuilddeps.1:16 ./dpkg-divert.8:44 ./dpkg-name.1:33 ./dpkg-query.1:93 ./dpkg-scansources.1:44 ./dpkg-statoverride.8:33 ./dselect.1:45 ./install-info.8:39 ./start-stop-daemon.8:88 ./update-alternatives.8:285
+#: ./822-date.1:20 ./cleanup-info.8:30 ./dpkg.1:293 ./dpkg-architecture.1:68 ./dpkg-buildpackage.1:14 ./dpkg-checkbuilddeps.1:18 ./dpkg-distaddfile.1:27 ./dpkg-deb.1:172 ./dpkg-divert.8:38 ./dpkg-genchanges.1:17 ./dpkg-gencontrol.1:16 ./dpkg-name.1:28 ./dpkg-parsechangelog.1:15 ./dpkg-query.1:69 ./dpkg-scanpackages.1:70 ./dpkg-scansources.1:45 ./dpkg-shlibdeps.1:36 ./dpkg-source.1:67 ./dpkg-split.1:137 ./dpkg-statoverride.8:51 ./dselect.1:45 ./install-info.8:39 ./start-stop-daemon.8:80 ./update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:18
+#: ./822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr ""
 
 # type: SH
-#: ./822-date.1:19 ./cleanup-info.8:47 ./dpkg.1:609 ./dpkg-deb.1:249 ./dpkg-name.1:91 ./dpkg-source.1:825 ./dpkg-split.1:221 ./dselect.1:427 ./update-alternatives.8:446
+#: ./822-date.1:24 ./cleanup-info.8:48 ./deb-substvars.5:126 ./dpkg.1:609 ./dpkg-buildpackage.1:181 ./dpkg-deb.1:221 ./dpkg-name.1:87 ./dpkg-source.1:264 ./dpkg-split.1:200 ./dselect.1:427 ./update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:22
+#: ./822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr ""
 
 # type: SH
-#: ./822-date.1:23 ./cleanup-info.8:50 ./deb.5:67 ./deb-control.5:204 ./deb-old.5:51 ./dpkg.1:599 ./dpkg-architecture.1:268 ./dpkg.cfg.5:21 ./dpkg-deb.1:265 ./dpkg-divert.8:124 ./dpkg-name.1:100 ./dpkg-query.1:182 ./dpkg-scanpackages.1:132 ./dpkg-scansources.1:64 ./dpkg-source.1:839 ./dpkg-split.1:245 ./dpkg-statoverride.8:85 ./dselect.1:443 ./dselect.cfg.5:21 ./install-info.8:277 ./update-alternatives.8:466
+#: ./822-date.1:28 ./cleanup-info.8:51 ./deb.5:67 ./deb-control.5:204 ./deb-old.5:51 ./deb-override.5:67 ./deb-shlibs.5:29 ./deb-substvars.5:130 ./dpkg.1:599 ./dpkg-architecture.1:268 ./dpkg.cfg.5:21 ./dpkg-deb.1:238 ./dpkg-divert.8:118 ./dpkg-name.1:97 ./dpkg-query.1:158 ./dpkg-scanpackages.1:95 ./dpkg-scansources.1:65 ./dpkg-shlibdeps.1:127 ./dpkg-source.1:275 ./dpkg-split.1:226 ./dpkg-statoverride.8:78 ./dselect.1:443 ./dselect.cfg.5:21 ./install-info.8:277 ./update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr ""
-
-# type: Plain text
-#: ./822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
-msgstr ""
-
-# type: Plain text
-#: ./822-date.1:31
-msgid "B<date>(1)."
+#: ./822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
 
 # type: SH
-#: ./822-date.1:32 ./cleanup-info.8:53 ./dpkg-architecture.1:272 ./dpkg.cfg.5:17 ./dpkg-checkbuilddeps.1:25 ./dpkg-deb.1:270 ./dpkg-divert.8:126 ./dpkg-query.1:173 ./dpkg-scansources.1:67 ./dpkg-source.1:845 ./dpkg-split.1:251 ./dpkg-statoverride.8:88 ./dselect.cfg.5:17 ./update-alternatives.8:455
+#: ./822-date.1:33 ./cleanup-info.8:54 ./deb-substvars.5:137 ./dpkg-architecture.1:272 ./dpkg.cfg.5:17 ./dpkg-checkbuilddeps.1:31 ./dpkg-deb.1:244 ./dpkg-divert.8:121 ./dpkg-query.1:149 ./dpkg-scansources.1:69 ./dpkg-split.1:232 ./dpkg-statoverride.8:81 ./dselect.cfg.5:17 ./update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 # type: Plain text
-#: ./822-date.1:35
+#: ./822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
 
 # type: TH
@@ -137,20 +135,24 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: ./cleanup-info.8:1 ./deb-substvars.5:2 ./dpkg-architecture.1:1 ./dpkg-checkbuilddeps.1:1 ./dpkg-divert.8:1 ./dpkg-name.1:6 ./dpkg-query.1:1 ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1 ./dpkg-split.1:2 ./dpkg-statoverride.8:1 ./start-stop-daemon.8:1 ./update-alternatives.8:8
+#, no-wrap
+msgid "2007-03-06"
+msgstr ""
+
 # type: Plain text
 #: ./cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
+#: ./cleanup-info.8:10
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:17
+#: ./cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -159,21 +161,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:20
+#: ./cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:23
+#: ./cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:28
+#: ./cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -182,79 +184,79 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./cleanup-info.8:30 ./dpkg-architecture.1:76 ./dpkg-divert.8:73 ./dpkg-scansources.1:47 ./dpkg-statoverride.8:64 ./dselect.1:121 ./install-info.8:195 ./update-alternatives.8:304
+#: ./cleanup-info.8:31
 #, no-wrap
-msgid "B<--help>"
+msgid "B<--unsafe>"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr ""
-
-# type: TP
-#: ./cleanup-info.8:33
-#, no-wrap
-msgid "B<--unsafe>"
+#: ./cleanup-info.8:34
+msgid "Set some additional possibly useful options."
 msgstr ""
 
 # type: Plain text
 #: ./cleanup-info.8:36
-msgid "Set some additional possibly useful options."
+msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
+msgstr ""
+
+# type: TP
+#: ./cleanup-info.8:36 ./dpkg-architecture.1:61 ./dpkg-divert.8:67 ./dpkg-scansources.1:60 ./dpkg-statoverride.8:44 ./dselect.1:121 ./install-info.8:195 ./update-alternatives.8:295
+#, no-wrap
+msgid "B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:38
-msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
+#: ./cleanup-info.8:39 ./dpkg-architecture.1:64 ./dpkg-buildpackage.1:177 ./dpkg-checkbuilddeps.1:30 ./dpkg-distaddfile.1:35 ./dpkg-deb.1:165 ./dpkg-divert.8:70 ./dpkg-genchanges.1:142 ./dpkg-gencontrol.1:101 ./dpkg-name.1:59 ./dpkg-parsechangelog.1:36 ./dpkg-query.1:62 ./dpkg-scanpackages.1:84 ./dpkg-scansources.1:62 ./dpkg-shlibdeps.1:112 ./dpkg-source.1:63 ./dpkg-split.1:130 ./dpkg-statoverride.8:47 ./update-alternatives.8:298
+msgid "Show the usage message and exit."
 msgstr ""
 
 # type: TP
-#: ./cleanup-info.8:38 ./dpkg-architecture.1:79 ./dpkg-deb.1:198 ./dpkg-divert.8:76 ./dpkg-query.1:89 ./dpkg-scansources.1:61 ./dpkg-source.1:101 ./dpkg-split.1:148 ./dpkg-statoverride.8:67 ./dselect.1:128 ./install-info.8:200 ./update-alternatives.8:307
+#: ./cleanup-info.8:39 ./dpkg-architecture.1:64 ./dpkg-buildpackage.1:177 ./dpkg-distaddfile.1:35 ./dpkg-deb.1:165 ./dpkg-divert.8:70 ./dpkg-genchanges.1:142 ./dpkg-gencontrol.1:101 ./dpkg-parsechangelog.1:36 ./dpkg-query.1:62 ./dpkg-scanpackages.1:84 ./dpkg-scansources.1:62 ./dpkg-shlibdeps.1:112 ./dpkg-source.1:63 ./dpkg-split.1:130 ./dpkg-statoverride.8:47 ./dselect.1:128 ./install-info.8:200 ./update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:41
-msgid "Output version and exit successfully."
+#: ./cleanup-info.8:42 ./dpkg-architecture.1:67 ./dpkg-buildpackage.1:180 ./dpkg-distaddfile.1:38 ./dpkg-deb.1:168 ./dpkg-divert.8:73 ./dpkg-genchanges.1:145 ./dpkg-gencontrol.1:104 ./dpkg-name.1:62 ./dpkg-parsechangelog.1:39 ./dpkg-query.1:65 ./dpkg-scanpackages.1:87 ./dpkg-scansources.1:64 ./dpkg-shlibdeps.1:115 ./dpkg-source.1:66 ./dpkg-split.1:133 ./dpkg-statoverride.8:50 ./update-alternatives.8:301
+msgid "Show the version and exit."
 msgstr ""
 
 # type: SH
-#: ./cleanup-info.8:42 ./dpkg.1:496 ./dpkg.cfg.5:12 ./dpkg-divert.8:114 ./dpkg-source.1:788 ./dpkg-split.1:235 ./dpkg-statoverride.8:75 ./dselect.cfg.5:12 ./update-alternatives.8:415
+#: ./cleanup-info.8:43 ./deb-substvars.5:121 ./dpkg.1:496 ./dpkg.cfg.5:12 ./dpkg-buildpackage.1:186 ./dpkg-distaddfile.1:39 ./dpkg-divert.8:108 ./dpkg-genchanges.1:146 ./dpkg-gencontrol.1:105 ./dpkg-parsechangelog.1:40 ./dpkg-shlibdeps.1:116 ./dpkg-split.1:215 ./dpkg-statoverride.8:68 ./dselect.cfg.5:12 ./update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 # type: TP
-#: ./cleanup-info.8:43
+#: ./cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:46
+#: ./cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:49
+#: ./cleanup-info.8:50
 msgid "Probably many."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:53
+#: ./cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:55
+#: ./cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
 # type: Plain text
-#: ./cleanup-info.8:57 ./dpkg-checkbuilddeps.1:32 ./dpkg-divert.8:130 ./dpkg-query.1:181 ./dpkg-statoverride.8:95
+#: ./cleanup-info.8:58 ./dpkg-checkbuilddeps.1:38 ./dpkg-divert.8:125 ./dpkg-query.1:157 ./dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -266,6 +268,12 @@ msgstr ""
 msgid "deb"
 msgstr ""
 
+# type: TH
+#: ./deb.5:1 ./deb-control.5:3 ./deb-old.5:1 ./dpkg.cfg.5:1 ./dselect.1:1 ./dselect.cfg.5:1 ./install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr ""
+
 # type: TH
 #: ./deb.5:1 ./deb-control.5:3 ./deb-old.5:1 ./dselect.1:1
 #, no-wrap
@@ -806,5147 +814,5170 @@ msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr ""
 
 # type: TH
-#: ./dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr ""
-
-# type: TH
-#: ./dpkg.1:1 ./dpkg-query.1:1
+#: ./deb-override.5:16
 #, no-wrap
-msgid "2006-04-09"
+msgid "deb-override"
 msgstr ""
 
 # type: TH
-#: ./dpkg.1:1 ./dpkg.cfg.5:1 ./dpkg-deb.1:1 ./dpkg-query.1:1 ./dselect.cfg.5:1
+#: ./deb-override.5:16 ./dpkg-buildpackage.1:1 ./dpkg-distaddfile.1:1 ./dpkg-genchanges.1:1 ./dpkg-gencontrol.1:1 ./dpkg-parsechangelog.1:1 ./dpkg-shlibdeps.1:1 ./dpkg-source.1:2
 #, no-wrap
-msgid "dpkg suite"
+msgid "2007-03-07"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:4
-msgid "dpkg - package manager for Debian"
+#: ./deb-override.5:19
+msgid "deb-override - Debian archive override file"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr ""
-
-# type: SH
-#: ./dpkg.1:9
-#, no-wrap
-msgid "WARNING"
+#: ./deb-override.5:22
+msgid "override"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:13
+#: ./deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:18
+#: ./deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:26
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is "
-"B<dselect>(1). B<dpkg> itself is controlled entirely via command line "
-"parameters, which consist of exactly one action and zero or more "
-"options. The action-parameter tells B<dpkg> what to do and options control "
-"the behavior of the action in some way."
+#: ./deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:31
+#: ./deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:40
-#, no-wrap
+#: ./deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#: ./deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
 
-# type: SH
-#: ./dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
+# type: Plain text
+#: ./deb-override.5:66
+msgid ""
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:48
-msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+#: ./deb-override.5:70
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
 msgstr ""
 
-# type: SS
-#: ./dpkg.1:48
+# type: TH
+#: ./deb-shlibs.5:16
 #, no-wrap
-msgid "PACKAGE STATES"
+msgid "deb-shlibs"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:49
+# type: TH
+#: ./deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
+msgid "2007-03-08"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:52
-msgid "The package is unpacked and configured OK."
+#: ./deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
+# type: Plain text
+#: ./deb-shlibs.5:22
+msgid "shlibs"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:56
+#: ./deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
+# type: Plain text
+#: ./deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:59
-msgid "The package is not installed on your system."
+#: ./deb-shlibs.5:30
+msgid "B<dpkg-shlibdeps>(1)."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:59
+# type: TH
+#: ./deb-substvars.5:2
 #, no-wrap
-msgid "B<unpacked>"
+msgid "deb-substvars"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:62
-msgid "The package is unpacked, but not configured."
+#: ./deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
+# type: Plain text
+#: ./deb-substvars.5:9
+msgid "substvars"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:66
+#: ./deb-substvars.5:20
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
+# type: Plain text
+#: ./deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
+#: ./deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string "
+"B<${}> (which is not a legal substitution) is replaced with a B<$> sign."
 msgstr ""
 
-# type: SS
-#: ./dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
+# type: Plain text
+#: ./deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+
+# type: Plain text
+#: ./deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:70
+#: ./deb-substvars.5:49
 #, no-wrap
-msgid "B<install>"
+msgid "B<Arch>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:73
-msgid "The package is selected for installation."
+#: ./deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:73
+#: ./deb-substvars.5:53
 #, no-wrap
-msgid "B<deinstall>"
+msgid "B<source:Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:77
-msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+#: ./deb-substvars.5:56
+msgid "The source package version."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:77
+#: ./deb-substvars.5:56
 #, no-wrap
-msgid "B<purge>"
+msgid "B<source:Upstream-Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:81
+#: ./deb-substvars.5:60
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
-msgstr ""
-
-# type: SS
-#: ./dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:82
+#: ./deb-substvars.5:60
 #, no-wrap
-msgid "B<hold>"
+msgid "B<binary:Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:86
+#: ./deb-substvars.5:64
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:86
+#: ./deb-substvars.5:64
 #, no-wrap
-msgid "B<reinst-required>"
+msgid "B<Source-Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:91
+#: ./deb-substvars.5:69
 msgid ""
-"A package marked B<reinst-required> is broken and requires "
-"reinstallation. These packages cannot be removed, unless forced with option "
-"B<--force-remove-reinstreq>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
 
-# type: SS
-#: ./dpkg.1:92 ./dpkg-architecture.1:42 ./update-alternatives.8:320
+# type: TP
+#: ./deb-substvars.5:69
 #, no-wrap
-msgid "ACTIONS"
+msgid "B<Installed-Size>"
+msgstr ""
+
+# type: Plain text
+#: ./deb-substvars.5:78
+msgid ""
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:93
+#: ./deb-substvars.5:78
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgid "B<Extra-Size>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:97
+#: ./deb-substvars.5:87
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:99
-msgid "Installation consists of the following steps:"
+# type: TP
+#: ./deb-substvars.5:87
+#, no-wrap
+msgid "B<F:>I<fieldname>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
+#: ./deb-substvars.5:94
+msgid ""
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
+msgstr ""
+
+# type: TP
+#: ./deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:106
+#: ./deb-substvars.5:104
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
+# type: TP
+#: ./deb-substvars.5:104
+#, no-wrap
+msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:113
-msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+#: ./deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
+msgstr ""
+
+# type: TP
+#: ./deb-substvars.5:107
+#, no-wrap
+msgid "B<shlibs:>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:120
+#: ./deb-substvars.5:111
 msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+"Variable settings with names of this form are generated by "
+"B<dpkg-shlibdeps>."
+msgstr ""
+
+# type: TP
+#: ./deb-substvars.5:111
+#, no-wrap
+msgid "B<dpkg:Upstream-Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:124
-msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+#: ./deb-substvars.5:114
+msgid "The upstream version of dpkg."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:124
+#: ./deb-substvars.5:114
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+msgid "B<dpkg:Version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:129
+#: ./deb-substvars.5:117
+msgid "The full version of dpkg."
+msgstr ""
+
+# type: Plain text
+#: ./deb-substvars.5:120
 msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:129
+#: ./deb-substvars.5:122
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgid "B<debian/substvars>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:134
-msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+#: ./deb-substvars.5:125
+msgid "List of substitution variables and values."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:136
-msgid "Configuring consists of the following steps:"
+#: ./deb-substvars.5:129 ./dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:141
+#: ./deb-substvars.5:136
 msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), "
+"B<dpkg-shlibdeps>(1), B<dpkg-source>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
+#: ./deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:144
+# type: SH
+#: ./deb-substvars.5:140 ./dpkg-name.1:105 ./install-info.8:281
 #, no-wrap
-msgid ""
-"B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | "
-"B<--pending>"
+msgid "COPYRIGHT"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:155
-msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+#: ./deb-substvars.5:142 ./dpkg-buildpackage.1:195 ./dpkg-distaddfile.1:49 ./dpkg-genchanges.1:158 ./dpkg-gencontrol.1:121 ./dpkg-parsechangelog.1:50 ./dpkg-shlibdeps.1:132 ./dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
+#: ./deb-substvars.5:144 ./dpkg-buildpackage.1:197 ./dpkg-distaddfile.1:51 ./dpkg-genchanges.1:160 ./dpkg-gencontrol.1:123 ./dpkg-parsechangelog.1:52 ./dpkg-shlibdeps.1:134 ./dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:160
-msgid "B<1.> Run I<prerm> script"
+#: ./deb-substvars.5:146 ./dpkg-buildpackage.1:199 ./dpkg-distaddfile.1:53 ./dpkg-genchanges.1:162 ./dpkg-gencontrol.1:125 ./dpkg-parsechangelog.1:54 ./dpkg-shlibdeps.1:136 ./dpkg-source.1:286
+msgid ""
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:163
-msgid "B<2.> Remove the installed files"
+# type: TH
+#: ./dpkg.1:1
+#, no-wrap
+msgid "dpkg"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
+# type: TH
+#: ./dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:167
+# type: TH
+#: ./dpkg.1:1 ./dpkg.cfg.5:1 ./dpkg-deb.1:1 ./dpkg-query.1:1 ./dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgid "dpkg suite"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:176
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
+#: ./dpkg.1:4
+msgid "dpkg - package manager for Debian"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:179
-msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
+#: ./dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:179
+# type: SH
+#: ./dpkg.1:9
 #, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgid "WARNING"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:185
+#: ./dpkg.1:13
 msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+# type: Plain text
+#: ./dpkg.1:18
+msgid ""
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:188
-msgid "Forget about uninstalled unavailable packages."
+#: ./dpkg.1:26
+msgid ""
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is "
+"B<dselect>(1). B<dpkg> itself is controlled entirely via command line "
+"parameters, which consist of exactly one action and zero or more "
+"options. The action-parameter tells B<dpkg> what to do and options control "
+"the behavior of the action in some way."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:188
+# type: Plain text
+#: ./dpkg.1:31
+msgid ""
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg.1:40
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:191
-msgid "Erase the existing information about what packages are available."
+#: ./dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:191
+# type: SH
+#: ./dpkg.1:43
 #, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
+msgid "INFORMATION ABOUT PACKAGES"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:196
+#: ./dpkg.1:48
 msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
+msgstr ""
+
+# type: SS
+#: ./dpkg.1:48
+#, no-wrap
+msgid "PACKAGE STATES"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:196
+#: ./dpkg.1:49
 #, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgid "B<installed>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:200
-msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
+#: ./dpkg.1:52
+msgid "The package is unpacked and configured OK."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:200
+#: ./dpkg.1:52
 #, no-wrap
-msgid "B<dpkg --set-selections>"
+msgid "B<half-installed>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:206
+#: ./dpkg.1:56
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+"The installation of the package has been started, but not completed for some "
+"reason."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:206
+#: ./dpkg.1:56
 #, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "B<not-installed>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:211
-msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+#: ./dpkg.1:59
+msgid "The package is not installed on your system."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:211
+#: ./dpkg.1:59
 #, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
+msgid "B<unpacked>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:215
-msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+#: ./dpkg.1:62
+msgid "The package is unpacked, but not configured."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:216
+#: ./dpkg.1:62
 #, no-wrap
-msgid "B<dpkg --print-architecture>"
+msgid "B<half-configured>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:219
-msgid "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+#: ./dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:219
+#: ./dpkg.1:66
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<config-files>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:230
-msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+#: ./dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr ""
+
+# type: SS
+#: ./dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:230
+#: ./dpkg.1:70
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "B<install>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:235
-msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
+#: ./dpkg.1:73
+msgid "The package is selected for installation."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:235
+#: ./dpkg.1:73
 #, no-wrap
-msgid "B<dpkg --help>"
+msgid "B<deinstall>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:238
-msgid "Display a brief help message."
+#: ./dpkg.1:77
+msgid ""
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:238
+#: ./dpkg.1:77
 #, no-wrap
-msgid "B<dpkg --force-help>"
+msgid "B<purge>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
+#: ./dpkg.1:81
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
+msgstr ""
+
+# type: SS
+#: ./dpkg.1:81
+#, no-wrap
+msgid "PACKAGE FLAGS"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:241
+#: ./dpkg.1:82
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<hold>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:244
-msgid "Give help about debugging options."
+#: ./dpkg.1:86
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:244
+#: ./dpkg.1:86
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<reinst-required>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:247
-msgid "Display B<dpkg> licence."
+#: ./dpkg.1:91
+msgid ""
+"A package marked B<reinst-required> is broken and requires "
+"reinstallation. These packages cannot be removed, unless forced with option "
+"B<--force-remove-reinstreq>."
+msgstr ""
+
+# type: SH
+#: ./dpkg.1:92
+#, no-wrap
+msgid "ACTIONS"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:247
+#: ./dpkg.1:93
 #, no-wrap
-msgid "B<dpkg --version>"
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:250
-msgid "Display B<dpkg> version information."
+#: ./dpkg.1:97
+msgid ""
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:250
-#, no-wrap
-msgid "B<dpkg-deb actions>"
+# type: Plain text
+#: ./dpkg.1:99
+msgid "Installation consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:253
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
+#: ./dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:273
-#, no-wrap
+#: ./dpkg.1:106
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:275
-#, no-wrap
-msgid "B<dpkg-query actions>"
+# type: Plain text
+#: ./dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
+#: ./dpkg.1:113
+msgid ""
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:291
-#, no-wrap
+#: ./dpkg.1:120
 msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in "
-"I</var/lib/dpkg/available>.\n"
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:298
+#: ./dpkg.1:124
 msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:299
+#: ./dpkg.1:124
 #, no-wrap
-msgid "B<--abort-after=>I<number>"
+msgid "B<dpkg --unpack >I<package_file> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:302
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+#: ./dpkg.1:129
+msgid ""
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:302
+#: ./dpkg.1:129
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:308
+#: ./dpkg.1:134
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
 
-# type: TP
-#: ./dpkg.1:308
-#, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+# type: Plain text
+#: ./dpkg.1:136
+msgid "Configuring consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:314
+#: ./dpkg.1:141
 msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:326
-#, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
+#: ./dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:326
+#: ./dpkg.1:144
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgid ""
+"B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | "
+"B<--pending>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:333
+#: ./dpkg.1:155
 msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified "
-"below. B<--force-help> displays a message describing them.  Things marked "
-"with (*) are forced by default."
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.1:337
-msgid ""
-"I<Warning: These options are mostly intended to be used by experts "
-"only. Using them without fully understanding their effects may break your "
-"whole system.>"
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:340
-msgid "B<all>: Turns on (or off) all force options."
+#: ./dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:343
-msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+#: ./dpkg.1:160
+msgid "B<1.> Run I<prerm> script"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:350
-msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
+#: ./dpkg.1:163
+msgid "B<2.> Remove the installed files"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:354
-msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+#: ./dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
+# type: TP
+#: ./dpkg.1:167
+#, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:362
+#: ./dpkg.1:176
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:367
+#: ./dpkg.1:179
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered "
-"essential. Essential packages contain mostly very basic Unix "
-"commands. Removing them might cause the whole system to stop working, so use "
-"with caution."
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
+# type: TP
+#: ./dpkg.1:179
+#, no-wrap
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:373
-msgid "B<depends-version>: Don't care about versions when checking dependencies."
+#: ./dpkg.1:185
+msgid ""
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:377
-msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+# type: TP
+#: ./dpkg.1:185
+#, no-wrap
+msgid "B<dpkg --forget-old-unavail>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:382
-msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
+#: ./dpkg.1:188
+msgid "Forget about uninstalled unavailable packages."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:387
-msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+# type: TP
+#: ./dpkg.1:188
+#, no-wrap
+msgid "B<dpkg --clear-avail>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:392
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+#: ./dpkg.1:191
+msgid "Erase the existing information about what packages are available."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:398
-msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
+# type: TP
+#: ./dpkg.1:191
+#, no-wrap
+msgid "B<dpkg -C> | B<--audit>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
+#: ./dpkg.1:196
+msgid ""
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
+# type: TP
+#: ./dpkg.1:196
+#, no-wrap
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:407
-msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+#: ./dpkg.1:200
+msgid ""
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
+# type: TP
+#: ./dpkg.1:200
+#, no-wrap
+msgid "B<dpkg --set-selections>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:413
-msgid "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+#: ./dpkg.1:206
+msgid ""
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
+# type: TP
+#: ./dpkg.1:206
+#, no-wrap
+msgid "B<dpkg --clear-selections>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+#: ./dpkg.1:211
+msgid ""
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:420
+#: ./dpkg.1:211
 #, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
+msgid "B<dpkg --yet-to-unpack>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:424
+#: ./dpkg.1:215
 msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:424
+#: ./dpkg.1:216
 #, no-wrap
-msgid "B<--new> | B<--old>"
+msgid "B<dpkg --print-architecture>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:428
-msgid "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+#: ./dpkg.1:219
+msgid "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:428 ./dpkg-deb.1:240
+#: ./dpkg.1:219
 #, no-wrap
-msgid "B<--nocheck>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:432
+#: ./dpkg.1:230
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:432
+#: ./dpkg.1:230
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.1:437
-msgid ""
-"Do everything which is supposed to be done, but don't write any "
-"changes. This is used to see what would happen with the specified action, "
-"without actually modifying anything."
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:442
+#: ./dpkg.1:235
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:442
+#: ./dpkg.1:235
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
+msgid "B<dpkg --help>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:448
-msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+#: ./dpkg.1:238
+msgid "Display a brief help message."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:448
+#: ./dpkg.1:238
 #, no-wrap
-msgid "B<-G>"
+msgid "B<dpkg --force-help>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:452
-msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+#: ./dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:452
+#: ./dpkg.1:241
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg -Dh >|B< --debug=help>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:463
-msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to "
-"I<dir>B</var/lib/dpkg>."
+#: ./dpkg.1:244
+msgid "Give help about debugging options."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:463
+#: ./dpkg.1:244
 #, no-wrap
-msgid "B<-O> | B<--selected-only>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:469
-msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+#: ./dpkg.1:247
+msgid "Display B<dpkg> licence."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:469
+#: ./dpkg.1:247
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:473
-msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
+#: ./dpkg.1:250
+msgid "Display B<dpkg> version information."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:473
+#: ./dpkg.1:250
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg-deb actions>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:480
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:480
-#, no-wrap
-msgid "B<--log=>I<filename>"
+#: ./dpkg.1:253
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:492
+#: ./dpkg.1:273
+#, no-wrap
 msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> "
-"E<lt>installed-versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and "
-"`YYYY-MM-DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for "
-"conffile changes where I<E<lt>decisionE<gt>> is either install or keep."
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:492
+#: ./dpkg.1:275
 #, no-wrap
-msgid "B<--no-debsig>"
+msgid "B<dpkg-query actions>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:495
-msgid "Do not try to verify package signatures."
+#: ./dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:497 ./dpkg.cfg.5:14
+#: ./dpkg.1:291
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
+msgid ""
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in "
+"I</var/lib/dpkg/available>.\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:500
-msgid "Configuration file with default options."
+#: ./dpkg.1:298
+msgid ""
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:500
+#: ./dpkg.1:299
 #, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+msgid "B<--abort-after=>I<number>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:507
-msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+#: ./dpkg.1:302
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:507
+#: ./dpkg.1:302
 #, no-wrap
-msgid "I</var/lib/dpkg/available>"
+msgid "B<-B>|B<--auto-deconfigure>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:510
-msgid "List of available packages."
+#: ./dpkg.1:308
+msgid ""
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:510
+#: ./dpkg.1:308
 #, no-wrap
-msgid "I</var/lib/dpkg/status>"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:516
+#: ./dpkg.1:314
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:519
-msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:519
-#, no-wrap
-msgid "I<control>"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:521
-#, no-wrap
-msgid "I<conffiles>"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:523
-#, no-wrap
-msgid "I<preinst>"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:525
-#, no-wrap
-msgid "I<postinst>"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:527
-#, no-wrap
-msgid "I<prerm>"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:529
-#, no-wrap
-msgid "I<postrm>"
-msgstr ""
-
-# type: SH
-#: ./dpkg.1:532
-#, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:533
+#: ./dpkg.1:326
 #, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.1:537
 msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
 msgstr ""
 
 # type: TP
-#: ./dpkg.1:537
+#: ./dpkg.1:326
 #, no-wrap
-msgid "B<SHELL>"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:540
-msgid "The program B<dpkg> will execute when starting a new shell."
-msgstr ""
-
-# type: TP
-#: ./dpkg.1:540 ./dpkg-query.1:168
-#, no-wrap
-msgid "B<COLUMNS>"
+#: ./dpkg.1:333
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified "
+"below. B<--force-help> displays a message describing them.  Things marked "
+"with (*) are forced by default."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:544
+#: ./dpkg.1:337
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
-msgstr ""
-
-# type: SH
-#: ./dpkg.1:545 ./dpkg-architecture.1:100 ./dpkg-divert.8:93 ./dpkg-name.1:71 ./update-alternatives.8:246
-#, no-wrap
-msgid "EXAMPLES"
+"I<Warning: These options are mostly intended to be used by experts "
+"only. Using them without fully understanding their effects may break your "
+"whole system.>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:547
-msgid "To list packages related to the editor B<vi>(1):"
+#: ./dpkg.1:340
+msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:549
-#, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+#: ./dpkg.1:343
+msgid ""
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:552
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+#: ./dpkg.1:350
+msgid ""
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:554
-#, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
+#: ./dpkg.1:354
+msgid ""
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:557
-msgid "To search the listing of packages yourself:"
+#: ./dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:559
-#, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
+#: ./dpkg.1:362
+msgid ""
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:562
-msgid "To remove an installed elvis package:"
+#: ./dpkg.1:367
+msgid ""
+"B<remove-essential>: Remove, even if the package is considered "
+"essential. Essential packages contain mostly very basic Unix "
+"commands. Removing them might cause the whole system to stop working, so use "
+"with caution."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:564
-#, no-wrap
-msgid "     B<dpkg -r elvis>\n"
+#: ./dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:569
-msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+#: ./dpkg.1:373
+msgid "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:572
-#, no-wrap
+#: ./dpkg.1:377
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:575
-msgid "To make a local copy of the package selection states:"
+#: ./dpkg.1:382
+msgid ""
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:577
-#, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+#: ./dpkg.1:387
+msgid ""
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:581
-msgid "You might transfer this file to another computer, and install it there with:"
+#: ./dpkg.1:392
+msgid ""
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:584
-#, no-wrap
+#: ./dpkg.1:398
 msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:590
-msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+#: ./dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:593
-msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+#: ./dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
+msgstr ""
+
+# type: Plain text
+#: ./dpkg.1:407
+msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
-# type: SH
-#: ./dpkg.1:595
-#, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
+# type: Plain text
+#: ./dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:598
-msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+#: ./dpkg.1:413
+msgid "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:608
-msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), "
-"B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+#: ./dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
+#: ./dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
-# type: SH
-#: ./dpkg.1:612 ./dselect.1:449 ./start-stop-daemon.8:257
+# type: TP
+#: ./dpkg.1:420
 #, no-wrap
-msgid "AUTHORS"
+msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.1:616
-#, no-wrap
+#: ./dpkg.1:424
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
-msgstr ""
-
-# type: TH
-#: ./dpkg-architecture.1:1
-#, no-wrap
-msgid "dpkg-architecture"
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
-# type: TH
-#: ./dpkg-architecture.1:1 ./dpkg-deb.1:1
+# type: TP
+#: ./dpkg.1:424
 #, no-wrap
-msgid "2006-06-17"
+msgid "B<--new> | B<--old>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:4
-msgid "dpkg-architecture - set and determine the architecture for package building"
+#: ./dpkg.1:428
+msgid "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
+# type: TP
+#: ./dpkg.1:428 ./dpkg-deb.1:211
+#, no-wrap
+msgid "B<--nocheck>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:14
+#: ./dpkg.1:432
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
+msgstr ""
+
+# type: TP
+#: ./dpkg.1:432
+#, no-wrap
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:17
+#: ./dpkg.1:437
 msgid ""
-"The build architecture is always determined by an external call to "
-"B<dpkg>(1), and can not be set at the command line."
+"Do everything which is supposed to be done, but don't write any "
+"changes. This is used to see what would happen with the specified action, "
+"without actually modifying anything."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:26
+#: ./dpkg.1:442
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:28
+#: ./dpkg.1:442
 #, no-wrap
-msgid "B<-a>I<debian-architecture>"
+msgid "B<-R> | B<--recursive>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: ./dpkg.1:448
+msgid ""
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:31
+#: ./dpkg.1:448
 #, no-wrap
-msgid "B<-t>I<gnu-system-type>"
+msgid "B<-G>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:34
-msgid "Set the GNU system type."
+#: ./dpkg.1:452
+msgid ""
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:34
+#: ./dpkg.1:452
 #, no-wrap
-msgid "B<-f>"
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:41
+#: ./dpkg.1:463
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to "
+"I<dir>B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:43
+#: ./dpkg.1:463
 #, no-wrap
-msgid "B<-l>"
+msgid "B<-O> | B<--selected-only>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:47
+#: ./dpkg.1:469
 msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:47
+#: ./dpkg.1:469
 #, no-wrap
-msgid "B<-e>I<debian-architecture>"
+msgid "B<-E> | B<--skip-same-version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:53
+#: ./dpkg.1:473
 msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+"Don't install the package if the same version of the package is already "
+"installed."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:53
+#: ./dpkg.1:473
 #, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:59
+#: ./dpkg.1:480
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:59
+#: ./dpkg.1:480
 #, no-wrap
-msgid "B<-q>I<variable-name>"
+msgid "B<--log=>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:62
-msgid "Print the value of a single variable."
+#: ./dpkg.1:492
+msgid ""
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> "
+"E<lt>installed-versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and "
+"`YYYY-MM-DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for "
+"conffile changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:62
+#: ./dpkg.1:492
 #, no-wrap
-msgid "B<-s>"
+msgid "B<--no-debsig>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:66
-msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+#: ./dpkg.1:495
+msgid "Do not try to verify package signatures."
 msgstr ""
 
-# type: TP
-#: ./dpkg-architecture.1:66
+# type: Plain text
+#: ./dpkg.1:497 ./dpkg.cfg.5:14
 #, no-wrap
-msgid "B<-u>"
+msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
+#: ./dpkg.1:500
+msgid "Configuration file with default options."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:69
+#: ./dpkg.1:500
 #, no-wrap
-msgid "B<-c>I< command>"
+msgid "I</var/log/dpkg.log>"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:73
+#: ./dpkg.1:507
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
 
 # type: TP
-#: ./dpkg-architecture.1:73
+#: ./dpkg.1:507
 #, no-wrap
-msgid "B<-L>"
+msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
+#: ./dpkg.1:510
+msgid "List of available packages."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:79 ./dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
+# type: TP
+#: ./dpkg.1:510
+#, no-wrap
+msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:82
-msgid "Print program version."
+#: ./dpkg.1:516
+msgid ""
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
 msgstr ""
 
-# type: SH
-#: ./dpkg-architecture.1:83
-#, no-wrap
-msgid "TERMS"
+# type: Plain text
+#: ./dpkg.1:519
+msgid ""
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:84
+# type: TP
+#: ./dpkg.1:519
 #, no-wrap
-msgid "build machine"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-architecture.1:86
-msgid "The machine the package is built on."
+msgid "I<control>"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:86
+# type: TP
+#: ./dpkg.1:521
 #, no-wrap
-msgid "host machine"
+msgid "I<conffiles>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:88
-msgid "The machine the package is built for."
+# type: TP
+#: ./dpkg.1:523
+#, no-wrap
+msgid "I<preinst>"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:88
+# type: TP
+#: ./dpkg.1:525
 #, no-wrap
-msgid "Debian architecture"
+msgid "I<postinst>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:91
-msgid ""
-"The Debian architecture string, which specifies the binary tree in the "
-"\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+# type: TP
+#: ./dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:91
+# type: TP
+#: ./dpkg.1:529
 #, no-wrap
-msgid "architecture wildcard"
+msgid "I<postrm>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:95
-msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is "
-"E<lt>kernelE<gt>-E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+# type: SH
+#: ./dpkg.1:532
+#, no-wrap
+msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:95
+# type: TP
+#: ./dpkg.1:533
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
+msgid "B<DPKG_NO_TSTP>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:99
+#: ./dpkg.1:537
 msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to "
-"B<dpkg-architecture>. Other examples:"
+# type: TP
+#: ./dpkg.1:537
+#, no-wrap
+msgid "B<SHELL>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+#: ./dpkg.1:540
+msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+# type: TP
+#: ./dpkg.1:540 ./dpkg-query.1:144
+#, no-wrap
+msgid "B<COLUMNS>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:110
+#: ./dpkg.1:544
 msgid ""
-"Check if an architecture is equal to the current architecture or a given "
-"one:"
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
+# type: SH
+#: ./dpkg.1:545 ./dpkg-architecture.1:246 ./dpkg-divert.8:87 ./dpkg-name.1:66 ./update-alternatives.8:356
+#, no-wrap
+msgid "EXAMPLES"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
+#: ./dpkg.1:547
+msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:117
-msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
+#: ./dpkg.1:549
+#, no-wrap
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
+#: ./dpkg.1:552
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
-
-# type: SH
-#: ./dpkg-architecture.1:122
+#: ./dpkg.1:554
 #, no-wrap
-msgid "VARIABLES"
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
+#: ./dpkg.1:557
+msgid "To search the listing of packages yourself:"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:124
+# type: Plain text
+#: ./dpkg.1:559
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
+#: ./dpkg.1:562
+msgid "To remove an installed elvis package:"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:126
+# type: Plain text
+#: ./dpkg.1:564
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
+#: ./dpkg.1:569
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:128
+# type: Plain text
+#: ./dpkg.1:572
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgid ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
+#: ./dpkg.1:575
+msgid "To make a local copy of the package selection states:"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:130
+# type: Plain text
+#: ./dpkg.1:577
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
+#: ./dpkg.1:581
+msgid "You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:132
+# type: Plain text
+#: ./dpkg.1:584
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
-
-# type: IP
-#: ./dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+#: ./dpkg.1:590
+msgid ""
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+#: ./dpkg.1:593
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:136
+# type: SH
+#: ./dpkg.1:595
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
+#: ./dpkg.1:598
+msgid ""
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:138
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+# type: Plain text
+#: ./dpkg.1:608
+msgid ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), "
+"B<deb-control>(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
+#: ./dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:140
+# type: SH
+#: ./dpkg.1:612 ./dpkg-buildpackage.1:193 ./dpkg-distaddfile.1:47 ./dpkg-genchanges.1:156 ./dpkg-gencontrol.1:119 ./dpkg-parsechangelog.1:48 ./dpkg-shlibdeps.1:130 ./dpkg-source.1:280 ./dselect.1:449 ./start-stop-daemon.8:242
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgid "AUTHORS"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
+#: ./dpkg.1:616
+#, no-wrap
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:142
+# type: TH
+#: ./dpkg-architecture.1:1
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgid "dpkg-architecture"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: ./dpkg-architecture.1:4
+msgid "dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:144
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+# type: Plain text
+#: ./dpkg-architecture.1:9
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: ./dpkg-architecture.1:14
+msgid ""
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
-# type: IP
-#: ./dpkg-architecture.1:146
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+# type: Plain text
+#: ./dpkg-architecture.1:17
+msgid ""
+"The build architecture is always determined by an external call to "
+"B<dpkg>(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: ./dpkg-architecture.1:26
+msgid ""
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
 # type: SH
-#: ./dpkg-architecture.1:149
+#: ./dpkg-architecture.1:27 ./dpkg-deb.1:28 ./dpkg-divert.8:24 ./dpkg-query.1:13 ./dpkg-source.1:20 ./dpkg-split.1:32 ./dpkg-statoverride.8:24 ./start-stop-daemon.8:37 ./update-alternatives.8:203
 #, no-wrap
-msgid "DEBIAN/RULES"
+msgid "COMMANDS"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:157
-msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to "
-"I<debian/rules> as make variables (see make documentation). However, you "
-"should not rely on them, as this breaks manual invocation of the "
-"script. Instead, you should always initialize them using "
-"B<dpkg-architecture> with the -q option. Here are some examples, which also "
-"show how you can improve the cross compilation support in your package:"
+# type: TP
+#: ./dpkg-architecture.1:28
+#, no-wrap
+msgid "B<-l>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:160 ./dpkg-architecture.1:177
-msgid "Instead of:"
+#: ./dpkg-architecture.1:32
+msgid ""
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:164
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+# type: TP
+#: ./dpkg-architecture.1:32
+#, no-wrap
+msgid "B<-e>I<debian-architecture>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:167
-msgid "please use the following:"
+#: ./dpkg-architecture.1:38
+msgid ""
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:171
+# type: TP
+#: ./dpkg-architecture.1:38
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture "
-"-qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture "
-"-qDEB_HOST_GNU_TYPE)\n"
+msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:173
-#, no-wrap
+#: ./dpkg-architecture.1:44
 msgid ""
-"configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) "
-"--host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:183
+# type: TP
+#: ./dpkg-architecture.1:44
 #, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+msgid "B<-q>I<variable-name>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:186
-msgid "please use:"
+#: ./dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:189
+# type: TP
+#: ./dpkg-architecture.1:47
 #, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgid "B<-s>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:193
-#, no-wrap
+#: ./dpkg-architecture.1:51
 msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:197
-msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+# type: TP
+#: ./dpkg-architecture.1:51
+#, no-wrap
+msgid "B<-u>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:202
-msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+#: ./dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
-# type: SH
-#: ./dpkg-architecture.1:203
+# type: TP
+#: ./dpkg-architecture.1:54
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
+msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:209
+#: ./dpkg-architecture.1:58
 msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+# type: TP
+#: ./dpkg-architecture.1:58
+#, no-wrap
+msgid "B<-L>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:218
+#: ./dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
+msgstr ""
+
+# type: TP
+#: ./dpkg-architecture.1:69
 #, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU "
-"2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS "
-"2E<gt>/dev/null)\n"
+msgid "B<-a>I<debian-architecture>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:232
+#: ./dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr ""
+
+# type: TP
+#: ./dpkg-architecture.1:72
 #, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture "
-"-qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+#: ./dpkg-architecture.1:75
+msgid "Set the GNU system type."
+msgstr ""
+
+# type: TP
+#: ./dpkg-architecture.1:75
+#, no-wrap
+msgid "B<-f>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:238
+#: ./dpkg-architecture.1:82
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:248
+# type: SH
+#: ./dpkg-architecture.1:83
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst "
-"hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+msgid "TERMS"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:253
+# type: IP
+#: ./dpkg-architecture.1:84
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgid "build machine"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+#: ./dpkg-architecture.1:86
+msgid "The machine the package is built on."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:264
-msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+# type: IP
+#: ./dpkg-architecture.1:86
+#, no-wrap
+msgid "host machine"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:267
-msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+#: ./dpkg-architecture.1:88
+msgid "The machine the package is built for."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-architecture.1:271
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+# type: IP
+#: ./dpkg-architecture.1:88
+#, no-wrap
+msgid "Debian architecture"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-architecture.1:276
+#: ./dpkg-architecture.1:91
 msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+"The Debian architecture string, which specifies the binary tree in the "
+"\\s-1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
 
-# type: TH
-#: ./dpkg.cfg.5:1
+# type: IP
+#: ./dpkg-architecture.1:91
 #, no-wrap
-msgid "dpkg.cfg"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
+msgid "architecture wildcard"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.cfg.5:11
+#: ./dpkg-architecture.1:95
 msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is "
+"E<lt>kernelE<gt>-E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg.cfg.5:16
-msgid "I<~/.dpkg.cfg>"
+# type: IP
+#: ./dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg.cfg.5:20
+#: ./dpkg-architecture.1:99
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
-msgstr ""
-
-# type: Plain text
-#: ./dpkg.cfg.5:22 ./dpkg-divert.8:126 ./dpkg-query.1:184 ./dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
 
-# type: TH
-#: ./dpkg-checkbuilddeps.1:1
+# type: SH
+#: ./dpkg-architecture.1:100
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
+msgid "VARIABLES"
 msgstr ""
 
-# type: TH
-#: ./dpkg-checkbuilddeps.1:1 ./dpkg-divert.8:1 ./dpkg-source.1:2 ./dpkg-statoverride.8:1
-#, no-wrap
-msgid "2006-05-23"
+# type: Plain text
+#: ./dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+# type: IP
+#: ./dpkg-architecture.1:102
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
+#: ./dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-checkbuilddeps.1:12
-msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+# type: IP
+#: ./dpkg-architecture.1:104
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: ./dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
 
-# type: TP
-#: ./dpkg-checkbuilddeps.1:17
+# type: IP
+#: ./dpkg-architecture.1:106
 #, no-wrap
-msgid "B<-B>"
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-checkbuilddeps.1:21
-msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+#: ./dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
 msgstr ""
 
-# type: TP
-#: ./dpkg-checkbuilddeps.1:21
+# type: IP
+#: ./dpkg-architecture.1:108
 #, no-wrap
-msgid "B<-h>"
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
+#: ./dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
-# type: UR
-#: ./dpkg-checkbuilddeps.1:27
+# type: IP
+#: ./dpkg-architecture.1:110
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#: ./dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
-# type: TH
-#: ./dpkg-deb.1:1
+# type: IP
+#: ./dpkg-architecture.1:112
 #, no-wrap
-msgid "dpkg-deb"
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+#: ./dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
+# type: IP
+#: ./dpkg-architecture.1:114
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
+#: ./dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
+# type: IP
+#: ./dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
+#: ./dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+# type: IP
+#: ./dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#: ./dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
+# type: IP
+#: ./dpkg-architecture.1:120
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
+#: ./dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:39
-msgid "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+# type: IP
+#: ./dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
+#: ./dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:53
-msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+# type: IP
+#: ./dpkg-architecture.1:124
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
-# type: SH
-#: ./dpkg-deb.1:53 ./dpkg-split.1:48
-#, no-wrap
-msgid "ACTION OPTIONS"
+# type: Plain text
+#: ./dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:54
+# type: SH
+#: ./dpkg-architecture.1:127
 #, no-wrap
-msgid "B<--build>, B<-b>"
+msgid "DEBIAN/RULES"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:66
+#: ./dpkg-architecture.1:135
 msgid ""
-"Creates a debian archive from the filesystem tree stored in "
-"I<directory>. I<directory> must have a B<DEBIAN> subdirectory, which "
-"contains the control information files such as the control file itself. This "
-"directory will I<not> appear in the binary package's filesystem archive, but "
-"instead the files in it will be put in the binary package's control "
-"information area."
+"The environment variables set by B<dpkg-architecture> are passed to "
+"I<debian/rules> as make variables (see make documentation). However, you "
+"should not rely on them, as this breaks manual invocation of the "
+"script. Instead, you should always initialize them using "
+"B<dpkg-architecture> with the -q option. Here are some examples, which also "
+"show how you can improve the cross compilation support in your package:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:72
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+#: ./dpkg-architecture.1:138 ./dpkg-architecture.1:155
+msgid "Instead of:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:84
+#: ./dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:91
-msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+#: ./dpkg-architecture.1:145
+msgid "please use the following:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
+#: ./dpkg-architecture.1:149
+#, no-wrap
+msgid ""
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture "
+"-qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture "
+"-qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:109
+#: ./dpkg-architecture.1:151
+#, no-wrap
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) "
+"--host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:109 ./dpkg-split.1:87
+# type: Plain text
+#: ./dpkg-architecture.1:161
 #, no-wrap
-msgid "B<--info>, B<-I>"
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
+#: ./dpkg-architecture.1:164
+msgid "please use:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:117
-msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+#: ./dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:125
+#: ./dpkg-architecture.1:171
+#, no-wrap
 msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:125
-#, no-wrap
-msgid "B<--show>, B<-W>"
+# type: Plain text
+#: ./dpkg-architecture.1:175
+msgid ""
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:132
+#: ./dpkg-architecture.1:180
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:132
+# type: SH
+#: ./dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--field>, B<-f>"
+msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
+#: ./dpkg-architecture.1:187
+msgid ""
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:139
+#: ./dpkg-architecture.1:192
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:148
+#: ./dpkg-architecture.1:196
+#, no-wrap
 msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one "
-"B<control-file-field> is specified then B<dpkg-deb> will precede each with "
-"its field name (and a colon and space)."
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU "
+"2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS "
+"2E<gt>/dev/null)\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
+#: ./dpkg-architecture.1:210
+#, no-wrap
+msgid ""
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture "
+"-qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:150
-#, no-wrap
-msgid "B<--contents>, B<-c>"
+# type: Plain text
+#: ./dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:156
+#: ./dpkg-architecture.1:216
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:156
+# type: Plain text
+#: ./dpkg-architecture.1:226
 #, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+msgid ""
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst "
+"hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:160
+#: ./dpkg-architecture.1:231
+#, no-wrap
 msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:165
+#: ./dpkg-architecture.1:235
 msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:171
+#: ./dpkg-architecture.1:242
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr ""
-
-# type: TP
-#: ./dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
+#: ./dpkg-architecture.1:245
+msgid ""
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:182
+#: ./dpkg-architecture.1:249
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to "
+"B<dpkg-architecture>. Other examples:"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:182
-#, no-wrap
-msgid "B<--control>, B<-e>"
+# type: Plain text
+#: ./dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:186
-msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+#: ./dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:190
+#: ./dpkg-architecture.1:256
 msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+"Check if an architecture is equal to the current architecture or a given "
+"one:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:193
-msgid "The target directory (but not its parents) will be created if necessary."
+#: ./dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:193 ./dpkg-split.1:143
-#, no-wrap
-msgid "B<--help>, B<-h>"
+# type: Plain text
+#: ./dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:198
+#: ./dpkg-architecture.1:263
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
+#: ./dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:203 ./dpkg-split.1:153
-#, no-wrap
-msgid "B<--licence>"
+# type: Plain text
+#: ./dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:210
-msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+#: ./dpkg-architecture.1:271
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr ""
 
-# type: SH
-#: ./dpkg-deb.1:210 ./dpkg-split.1:160
-#, no-wrap
-msgid "OTHER OPTIONS"
+# type: Plain text
+#: ./dpkg-architecture.1:276
+msgid ""
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:211
+# type: TH
+#: ./dpkg.cfg.5:1
 #, no-wrap
-msgid "B<--showformat=>I<format>"
+msgid "dpkg.cfg"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:216 ./dpkg-query.1:103
-msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+#: ./dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:225
+#: ./dpkg.cfg.5:11
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+#: ./dpkg.cfg.5:16
+msgid "I<~/.dpkg.cfg>"
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:227
-#, no-wrap
-msgid "B<--new>"
+# type: Plain text
+#: ./dpkg.cfg.5:20
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:232
-msgid "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+#: ./dpkg.cfg.5:22 ./dpkg-divert.8:120 ./dpkg-query.1:160 ./dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
 msgstr ""
 
-# type: TP
-#: ./dpkg-deb.1:232
+# type: TH
+#: ./dpkg-buildpackage.1:1
 #, no-wrap
-msgid "B<--old>"
+msgid "dpkg-buildpackage"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+#: ./dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build source packages"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-buildpackage.1:8
+msgid "B<dpkg-buildpackage> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:246
+#: ./dpkg-buildpackage.1:13
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
 
 # type: TP
-#: ./dpkg-deb.1:246
+#: ./dpkg-buildpackage.1:15
 #, no-wrap
-msgid "B<--debug>, B<-D>"
+msgid "B<-b>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
+#: ./dpkg-buildpackage.1:19
+msgid ""
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:254
-msgid "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+# type: TP
+#: ./dpkg-buildpackage.1:19 ./dpkg-checkbuilddeps.1:23
+#, no-wrap
+msgid "B<-B>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:258
+#: ./dpkg-buildpackage.1:23
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-deb.1:265
-msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+# type: TP
+#: ./dpkg-buildpackage.1:23
+#, no-wrap
+msgid "B<-S>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+#: ./dpkg-buildpackage.1:26
+msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-deb.1:278
+#: ./dpkg-buildpackage.1:33 ./dpkg-source.1:145
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See "
-"I</usr/share/doc/dpkg/copyright> and I</usr/share/common-licenses/GPL> for "
-"details."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated "
+"(i.e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
-# type: TH
-#: ./dpkg-divert.8:1
+# type: TP
+#: ./dpkg-buildpackage.1:33
 #, no-wrap
-msgid "dpkg-divert"
+msgid "B<-si>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
+#: ./dpkg-buildpackage.1:40
+msgid ""
+"Include the original source if the version number ends in B<-0> or B<-1>, "
+"i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:10
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
+# type: TP
+#: ./dpkg-buildpackage.1:40
+#, no-wrap
+msgid "B<-sa>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#: ./dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+# type: TP
+#: ./dpkg-buildpackage.1:43
+#, no-wrap
+msgid "B<-sd>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#: ./dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:36
-msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+# type: TP
+#: ./dpkg-buildpackage.1:46
+#, no-wrap
+msgid "B<-a>I<architecture>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:44
+#: ./dpkg-buildpackage.1:51
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:45 ./dselect.1:52
+#: ./dpkg-buildpackage.1:51 ./dpkg-genchanges.1:18 ./dpkg-gencontrol.1:17 ./dpkg-parsechangelog.1:29
 #, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgid "B<-v>I<version>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:48
-msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: "
-"I</var/lib/dpkg>)."
+#: ./dpkg-buildpackage.1:55 ./dpkg-parsechangelog.1:33
+msgid "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:48
+#: ./dpkg-buildpackage.1:55 ./dpkg-genchanges.1:23
 #, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
+msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:52
+#: ./dpkg-buildpackage.1:60 ./dpkg-genchanges.1:29
 msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:52
+#: ./dpkg-buildpackage.1:60 ./dpkg-genchanges.1:29
 #, no-wrap
-msgid "B<--local>"
+msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:58
+#: ./dpkg-buildpackage.1:66 ./dpkg-genchanges.1:35
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:58
+#: ./dpkg-buildpackage.1:66 ./dpkg-genchanges.1:35
 #, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
+msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:63
+#: ./dpkg-buildpackage.1:72 ./dpkg-genchanges.1:41
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:63 ./dpkg-statoverride.8:61 ./install-info.8:190 ./update-alternatives.8:296
+#: ./dpkg-buildpackage.1:72
 #, no-wrap
-msgid "B<--quiet>"
+msgid "B<-D>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
+#: ./dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:66
+#: ./dpkg-buildpackage.1:75
 #, no-wrap
-msgid "B<--rename>"
+msgid "B<-d>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:70
-msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+#: ./dpkg-buildpackage.1:78
+msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:70 ./install-info.8:269 ./update-alternatives.8:300
+#: ./dpkg-buildpackage.1:78 ./dpkg-source.1:103
 #, no-wrap
-msgid "B<--test>"
+msgid "B<-W>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: ./dpkg-buildpackage.1:84
+msgid ""
+"Turn certain errors into warnings. Only dpkg-source uses this, but "
+"B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
+# type: TP
+#: ./dpkg-buildpackage.1:84 ./dpkg-source.1:106
+#, no-wrap
+msgid "B<-E>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
+#: ./dpkg-buildpackage.1:92
+msgid ""
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but "
+"B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
-# type: SH
-#: ./dpkg-divert.8:80
+# type: TP
+#: ./dpkg-buildpackage.1:92
 #, no-wrap
-msgid "NOTES"
+msgid "B<-nc>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:84
-msgid ""
-"When adding, default is B<--local> and B<--divert> "
-"I<E<lt>originalE<gt>.distrib>. When removing, B<--package> or B<--local> and "
-"B<--divert> must match if specified."
+#: ./dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
+# type: TP
+#: ./dpkg-buildpackage.1:95
+#, no-wrap
+msgid "B<-tc>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:92
+#: ./dpkg-buildpackage.1:101
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, "
-"i.e. directs all packages providing I</usr/bin/example> to install it as "
-"I</usr/bin/example.foo>, performing the rename if required:"
+# type: TP
+#: ./dpkg-buildpackage.1:101
+#, no-wrap
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
+#.  what happens, if it contains spaces? (hs)
 # type: Plain text
-#: ./dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+#: ./dpkg-buildpackage.1:127
+msgid ""
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:101 ./dpkg-divert.8:111
-msgid "To remove that diversion:"
+# type: TP
+#: ./dpkg-buildpackage.1:127
+#, no-wrap
+msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
+#: ./dpkg-buildpackage.1:152
+msgid ""
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the "
+"B<-sgpg> option.  I<sign-command> should not contain spaces or any other "
+"shell metacharacters."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:107
-msgid ""
-"To divert any package trying to install I</usr/bin/example> to "
-"I</usr/bin/example.foo>, except your own I<wibble> package:"
+# type: TP
+#: ./dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename "
-"/usr/bin/example"
+#: ./dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
+msgstr ""
+
+# type: TP
+#: ./dpkg-buildpackage.1:155
+#, no-wrap
+msgid "B<-us>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: ./dpkg-buildpackage.1:158
+msgid "Do not sign the source package."
 msgstr ""
 
 # type: TP
-#: ./dpkg-divert.8:115
+#: ./dpkg-buildpackage.1:158
 #, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
+msgid "B<-uc>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:120
-msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+#: ./dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-divert.8:123
-msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension "
-"\"-old\", before replacing it with the new one."
+# type: TP
+#: ./dpkg-buildpackage.1:161 ./dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
+#: ./dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
-# type: TH
-#: ./dpkg-name.1:6
+# type: TP
+#: ./dpkg-buildpackage.1:165 ./dpkg-source.1:130
 #, no-wrap
-msgid "dpkg-name"
+msgid "B<-I>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
+#: ./dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-name.1:22
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] "
-"[B<-s>|B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] "
-"[B<-v>|B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] "
-"[I<files>]"
+# type: TP
+#: ./dpkg-buildpackage.1:170 ./dpkg-checkbuilddeps.1:19 ./dpkg-query.1:70 ./dpkg-shlibdeps.1:105
+#, no-wrap
+msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:33
+#: ./dpkg-buildpackage.1:174 ./dpkg-checkbuilddeps.1:23 ./dpkg-query.1:74 ./dpkg-shlibdeps.1:109
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"Change the location of the B<dpkg> database. The default location is "
+"I</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-name.1:34
+#: ./dpkg-buildpackage.1:174 ./dpkg-distaddfile.1:32 ./dpkg-deb.1:162 ./dpkg-genchanges.1:139 ./dpkg-gencontrol.1:98 ./dpkg-name.1:56 ./dpkg-parsechangelog.1:33 ./dpkg-query.1:59 ./dpkg-scanpackages.1:81 ./dpkg-shlibdeps.1:109 ./dpkg-source.1:60 ./dpkg-split.1:127
 #, no-wrap
-msgid "B<-a, --no-architecture>"
+msgid "B<-h>, B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
+#: ./dpkg-buildpackage.1:185
+msgid ""
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:37
+# type: Plain text
+#: ./dpkg-buildpackage.1:192
+msgid ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), "
+"B<gpg>(1), B<pgp>(1)."
+msgstr ""
+
+# type: TH
+#: ./dpkg-checkbuilddeps.1:1
 #, no-wrap
-msgid "B<-k, --symlink>"
+msgid "dpkg-checkbuilddeps"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
+#: ./dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:40
-#, no-wrap
-msgid "B<-o, --overwrite>"
+# type: Plain text
+#: ./dpkg-checkbuilddeps.1:9
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:44
+#: ./dpkg-checkbuilddeps.1:14
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:44
-#, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
+# type: Plain text
+#: ./dpkg-checkbuilddeps.1:17
+msgid ""
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:56
+#: ./dpkg-checkbuilddeps.1:27
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be "
-"`unstable/binary-E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section "
-"is not found in the control, then `no-section' is assumed, and in this case, "
-"as well as for sections `non-free' and `contrib' the target directory is "
-"`E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section field isn't "
-"required so a lot of packages will find their way to the `no-section' "
-"area. Use this option with care, it's messy."
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
 
 # type: TP
-#: ./dpkg-name.1:56
+#: ./dpkg-checkbuilddeps.1:27
 #, no-wrap
-msgid "B<-c, --create-dir>"
+msgid "B<-h>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:61
-msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+#: ./dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:61
+# type: UR
+#: ./dpkg-checkbuilddeps.1:33
 #, no-wrap
-msgid "B<-h, --help>"
+msgid "mailto:joeyh@debian.org"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
+#: ./dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:64
+# type: TH
+#: ./dpkg-distaddfile.1:1
 #, no-wrap
-msgid "B<-v, --version>"
+msgid "dpkg-distaddfile"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:67 ./dselect.1:131
-msgid "Print version information and exit successfully."
+#: ./dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
+# type: Plain text
+#: ./dpkg-distaddfile.1:8
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:71
-msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+#: ./dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:72
-#, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
+# type: Plain text
+#: ./dpkg-distaddfile.1:18
+msgid ""
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:77
+#: ./dpkg-distaddfile.1:26
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"The filename should be specified relative to the directory where "
+"B<dpkg-genchanges> will expect to find the files, usually B<..>, rather than "
+"being a pathname relative to the current directory when B<dpkg-distaddfile> "
+"is run."
 msgstr ""
 
 # type: TP
-#: ./dpkg-name.1:77
+#: ./dpkg-distaddfile.1:28 ./dpkg-genchanges.1:111 ./dpkg-gencontrol.1:46
 #, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgid "B<-f>I<fileslistfile>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:82
+#: ./dpkg-distaddfile.1:32 ./dpkg-gencontrol.1:50
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-name.1:82
+#: ./dpkg-distaddfile.1:40 ./dpkg-genchanges.1:147 ./dpkg-gencontrol.1:111
 #, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgid "B<debian/files>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:88
+#: ./dpkg-distaddfile.1:46
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: ./dpkg-name.1:88
+# type: TH
+#: ./dpkg-deb.1:1
 #, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgid "dpkg-deb"
+msgstr ""
+
+# type: TH
+#: ./dpkg-deb.1:1
+#, no-wrap
+msgid "2007-03-13"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:91
-msgid "This can be used when building new packages."
+#: ./dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:100
-msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+#: ./dpkg-deb.1:9
+msgid "B<dpkg-deb> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:107
-msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+#: ./dpkg-deb.1:13
+msgid "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
 
-# type: SH
-#: ./dpkg-name.1:107 ./dpkg-source.1:847 ./install-info.8:281
-#, no-wrap
-msgid "COPYRIGHT"
+# type: Plain text
+#: ./dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-name.1:113
+#: ./dpkg-deb.1:27
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying "
-"conditions. There is B<no> warranty."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
 
-# type: TH
-#: ./dpkg-query.1:1
+# type: TP
+#: ./dpkg-deb.1:29
 #, no-wrap
-msgid "dpkg-query"
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
+#: ./dpkg-deb.1:41
+msgid ""
+"Creates a debian archive from the filesystem tree stored in "
+"I<directory>. I<directory> must have a B<DEBIAN> subdirectory, which "
+"contains the control information files such as the control file itself. This "
+"directory will I<not> appear in the binary package's filesystem archive, but "
+"instead the files in it will be put in the binary package's control "
+"information area."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#: ./dpkg-deb.1:53
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#: ./dpkg-deb.1:60
+msgid ""
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:17
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#: ./dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:21
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#: ./dpkg-deb.1:78
+msgid ""
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+# type: TP
+#: ./dpkg-deb.1:78
+#, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:29
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#: ./dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:32
-msgid "B<dpkg-query> B<--licence>|B<--license>"
+#: ./dpkg-deb.1:86
+msgid ""
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:35
-msgid "B<dpkg-query> B<--version>"
+#: ./dpkg-deb.1:94
+msgid ""
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
+msgstr ""
+
+# type: TP
+#: ./dpkg-deb.1:94
+#, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:39
+#: ./dpkg-deb.1:101
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
 
-# type: SH
-#: ./dpkg-query.1:40
+# type: TP
+#: ./dpkg-deb.1:101
 #, no-wrap
-msgid "COMMANDS"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
 msgstr ""
 
-# type: TP
-#: ./dpkg-query.1:41
-#, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
+# type: Plain text
+#: ./dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:50
+#: ./dpkg-deb.1:108
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in "
-"I<package-name-pattern>. Please note you will probably have to quote "
-"I<package-name-pattern> to prevent the shell from performing filename "
-"expansion. For example this will list all package names starting with "
-"``libc6'':"
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+#: ./dpkg-deb.1:117
+msgid ""
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one "
+"B<control-file-field> is specified then B<dpkg-deb> will precede each with "
+"its field name (and a colon and space)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:60
-msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and "
-"B<--showformat> for a way to configure the output format."
+#: ./dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:60
+#: ./dpkg-deb.1:119
 #, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
+msgid "B<-c>, B<--contents> I<archive>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:67
+#: ./dpkg-deb.1:125
 msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the "
-"B<--showformat> option.  The default output format gives one line per "
-"matching package, each line having the name and installed version of the "
-"package, separated by a tab."
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:67
+#: ./dpkg-deb.1:125
 #, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
+msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:71
+#: ./dpkg-deb.1:129
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
 
-# type: TP
-#: ./dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
+# type: Plain text
+#: ./dpkg-deb.1:135
+msgid ""
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:76
-msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+#: ./dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:76
+#: ./dpkg-deb.1:138
 #, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
+msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:82
+#: ./dpkg-deb.1:143
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:82
+#: ./dpkg-deb.1:143
 #, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
+msgid "B<--fsys-tarfile> I<archive>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:86
+#: ./dpkg-deb.1:151
 msgid ""
-"Display details about I<package-name>, as found in "
-"I</var/lib/dpkg/available>."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:86
+#: ./dpkg-deb.1:151
 #, no-wrap
-msgid "B<--licence> | B<--license>"
+msgid "B<-e>, B<--control> I<archive directory>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:89
-msgid "Display licence and copyright information."
+#: ./dpkg-deb.1:155
+msgid ""
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:92
-msgid "Display version information."
-msgstr ""
-
-# type: TP
-#: ./dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
+#: ./dpkg-deb.1:159
+msgid ""
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:98
-msgid ""
-"Change the location of the B<dpkg> database. The default location is "
-"I</var/lib/dpkg>."
+#: ./dpkg-deb.1:162
+msgid "The target directory (but not its parents) will be created if necessary."
 msgstr ""
 
 # type: TP
-#: ./dpkg-query.1:98
+#: ./dpkg-deb.1:168 ./dpkg-query.1:65 ./dpkg-split.1:133
 #, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
+msgid "B<--license>, B<--licence>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+#: ./dpkg-deb.1:171 ./dpkg-name.1:65 ./dpkg-query.1:68 ./dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-query.1:111
+# type: TP
+#: ./dpkg-deb.1:173
 #, no-wrap
-msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+msgid "B<--showformat=>I<format>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:116
+#: ./dpkg-deb.1:178 ./dpkg-query.1:79
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and "
-"\\(lqB<$>\\(rq."
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:122
+#: ./dpkg-deb.1:187
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax "
-"\\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. Fields are printed right-aligned "
-"unless the width is negative in which case left alignment will be used. The "
-"following I<field>s are recognised:"
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:153
-#, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+#: ./dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-query.1:161
-msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+# type: TP
+#: ./dpkg-deb.1:189
+#, no-wrap
+msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+#: ./dpkg-deb.1:193
+msgid ""
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
 
-# type: SH
-#: ./dpkg-query.1:167
+# type: TP
+#: ./dpkg-deb.1:193
 #, no-wrap
-msgid "ENVIRONMENT"
+msgid "B<-Z>I<compress_type>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:172
+#: ./dpkg-deb.1:198
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
+msgstr ""
+
+# type: TP
+#: ./dpkg-deb.1:198
+#, no-wrap
+msgid "B<--new>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
+#: ./dpkg-deb.1:203
+msgid "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
 
-# type: UR
-#: ./dpkg-query.1:175 ./dpkg-statoverride.8:90
+# type: TP
+#: ./dpkg-deb.1:203
 #, no-wrap
-msgid "mailto:wakkerma@debian.org"
+msgid "B<--old>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-query.1:177 ./dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
+#: ./dpkg-deb.1:211
+msgid ""
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
-# type: TH
-#: ./dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
+# type: Plain text
+#: ./dpkg-deb.1:217
+msgid ""
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
 
-# type: TH
-#: ./dpkg-scanpackages.1:16 ./dpkg-scansources.1:1
+# type: TP
+#: ./dpkg-deb.1:217
 #, no-wrap
-msgid "2006-05-10"
+msgid "B<-D>, B<--debug>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
+#: ./dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:30
-msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#: ./dpkg-deb.1:226
+msgid "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:43
+#: ./dpkg-deb.1:230
 msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:53
+#: ./dpkg-deb.1:237
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:60
-msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+#: ./dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:64
+#: ./dpkg-deb.1:252
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See "
+"I</usr/share/doc/dpkg/copyright> and I</usr/share/common-licenses/GPL> for "
+"details."
+msgstr ""
+
+# type: TH
+#: ./dpkg-divert.8:1
+#, no-wrap
+msgid "dpkg-divert"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:67
-msgid "I<pathprefix> is an optional string to be prepended to the Filename fields."
+#: ./dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
+#: ./dpkg-divert.8:9
+msgid "B<dpkg-divert> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:74
+#: ./dpkg-divert.8:13
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:80
+#: ./dpkg-divert.8:23
 msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
 
-# type: SH
-#: ./dpkg-scanpackages.1:81
+# type: TP
+#: ./dpkg-divert.8:25
 #, no-wrap
-msgid "THE OVERRIDE FILE"
+msgid "[B<--add>] I<file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:87
-msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+#: ./dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-scanpackages.1:91
-msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+# type: TP
+#: ./dpkg-divert.8:28 ./dpkg-statoverride.8:35
+#, no-wrap
+msgid "B<--remove>I< file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+#: ./dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-scanpackages.1:102
-msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+# type: TP
+#: ./dpkg-divert.8:31
+#, no-wrap
+msgid "B<--list>I< glob-pattern>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:111
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+#: ./dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-scanpackages.1:119
-msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+# type: TP
+#: ./dpkg-divert.8:34
+#, no-wrap
+msgid "B<--truename>I< file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:124
-msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+#: ./dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
 
-# type: SH
-#: ./dpkg-scanpackages.1:125 ./update-alternatives.8:436
+# type: TP
+#: ./dpkg-divert.8:39 ./dpkg-statoverride.8:52 ./update-alternatives.8:307
 #, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-scanpackages.1:131
-msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+msgid "B<--admindir>I< directory>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+#: ./dpkg-divert.8:42
+msgid "Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 
-# type: TH
-#: ./dpkg-scansources.1:1
+# type: TP
+#: ./dpkg-divert.8:42
 #, no-wrap
-msgid "dpkg-scansources"
+msgid "B<--divert>I< divert-to>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:4
-msgid "dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+#: ./dpkg-divert.8:46
+msgid ""
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-scansources.1:13
-msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> "
-"[I<path-prefix>]] B<E<gt>> I<Sources>"
+# type: TP
+#: ./dpkg-divert.8:46
+#, no-wrap
+msgid "B<--local>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:18
+#: ./dpkg-divert.8:52
 msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-scansources.1:29
-msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this "
-"file. \\s-1NB:\\s0 Since the override file is indexed by binary, not source, "
-"packages, there's a bit of a problem here. The current implementation uses "
-"the highest priority of all the binary packages produced by a I<.dsc> file "
-"for the priority of the source package, and the override entry for the first "
-"binary package listed in the I<.dsc> file to modify maintainer "
-"information. This might change."
+# type: TP
+#: ./dpkg-divert.8:52
+#, no-wrap
+msgid "B<--package>I< package>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:33
+#: ./dpkg-divert.8:57
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
+msgstr ""
+
+# type: TP
+#: ./dpkg-divert.8:57 ./dpkg-statoverride.8:64 ./install-info.8:190 ./update-alternatives.8:316
+#, no-wrap
+msgid "B<--quiet>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:44
-msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+#: ./dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
 msgstr ""
 
 # type: TP
-#: ./dpkg-scansources.1:45 ./install-info.8:272
+#: ./dpkg-divert.8:60
 #, no-wrap
-msgid "B<--debug>"
+msgid "B<--rename>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:47
-msgid "Turn debugging on."
+#: ./dpkg-divert.8:64
+msgid ""
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
+msgstr ""
+
+# type: TP
+#: ./dpkg-divert.8:64 ./install-info.8:269 ./update-alternatives.8:320
+#, no-wrap
+msgid "B<--test>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:49
-msgid "Show the usage message and die."
+#: ./dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
-# type: IP
-#: ./dpkg-scansources.1:49
+# type: SH
+#: ./dpkg-divert.8:74
 #, no-wrap
-msgid "B<-n>, B<--no-sort>"
+msgid "NOTES"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:52
+#: ./dpkg-divert.8:78
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"When adding, default is B<--local> and B<--divert> "
+"I<E<lt>originalE<gt>.distrib>. When removing, B<--package> or B<--local> and "
+"B<--divert> must match if specified."
 msgstr ""
 
-# type: IP
-#: ./dpkg-scansources.1:52
-#, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
+# type: Plain text
+#: ./dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:55
+#: ./dpkg-divert.8:86
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:61
+#: ./dpkg-divert.8:91
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, "
+"i.e. directs all packages providing I</usr/bin/example> to install it as "
+"I</usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:63
-msgid "Print the version number and exit."
+#: ./dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:66
-msgid "B<dpkg-scanpackages>(1)."
+#: ./dpkg-divert.8:95 ./dpkg-divert.8:105
+msgid "To remove that diversion:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: ./dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr ""
 
-# type: TH
-#: ./dpkg-source.1:2
-#, no-wrap
-msgid "dpkg-source"
+# type: Plain text
+#: ./dpkg-divert.8:101
+msgid ""
+"To divert any package trying to install I</usr/bin/example> to "
+"I</usr/bin/example.foo>, except your own I<wibble> package:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:7
+#: ./dpkg-divert.8:103
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, "
-"dpkg-buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source "
-"package tools"
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename "
+"/usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
+#: ./dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:15
-msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> "
-"[I<orig-directory>|I<orig-targz>|'']"
+# type: TP
+#: ./dpkg-divert.8:109
+#, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:18
-msgid "B<dpkg-gencontrol> [I<options>]"
+#: ./dpkg-divert.8:114
+msgid ""
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:21
-msgid "B<dpkg-shlibdeps> I<options>"
+#: ./dpkg-divert.8:117
+msgid ""
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension "
+"\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:24
-msgid "B<dpkg-genchanges> [I<options>]"
+#: ./dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:27
-msgid "B<dpkg-buildpackage> [I<options>]"
+# type: TH
+#: ./dpkg-genchanges.1:1
+#, no-wrap
+msgid "dpkg-genchanges"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:30
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+#: ./dpkg-genchanges.1:4
+msgid "dpkg-genchanges - generate Debian .changes files"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:33
-msgid "B<dpkg-parsechangelog> [I<options>]"
+#: ./dpkg-genchanges.1:8
+msgid "B<dpkg-genchanges> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:36
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
+#: ./dpkg-genchanges.1:16
+msgid ""
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:42
+#: ./dpkg-genchanges.1:23
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to "
-"debian/tmp/DEBIAN/control); it also adds an entry for the binary package to "
-"B<debian/files>."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
+msgstr ""
+
+# type: TP
+#: ./dpkg-genchanges.1:41 ./dpkg-source.1:137
+#, no-wrap
+msgid "B<-si>, B<-sa>, B<-sd>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:68
+#: ./dpkg-genchanges.1:49
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names "
-"B<shlibs:>I<dependencyfield> where I<dependencyfield> is a dependency field "
-"name. Any other variables starting I<shlibs:> are removed from the file.  "
-"B<dpkg-shlibdeps> will read shared library dependency information from "
-"B<debian/shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control "
-"area file of the package containing the file which B<objdump> reports as "
-"satisfying the library dependency, or B</etc/dpkg/shlibs.default>.  The "
-"first match will be used.  The format for a shared library dependency "
-"information entry in these files is (see the Debian Policy Manual for "
-"details):"
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated "
+"(i.e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+#: ./dpkg-genchanges.1:57 ./dpkg-source.1:153
+msgid ""
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:76
+#: ./dpkg-genchanges.1:62 ./dpkg-source.1:158
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
+msgstr ""
+
+# type: TP
+#: ./dpkg-genchanges.1:62 ./dpkg-gencontrol.1:20 ./dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:80
+#: ./dpkg-genchanges.1:66 ./dpkg-source.1:91
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+# type: TP
+#: ./dpkg-genchanges.1:66 ./dpkg-gencontrol.1:24 ./dpkg-shlibdeps.1:99 ./dpkg-source.1:91
+#, no-wrap
+msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:89
+#: ./dpkg-genchanges.1:72 ./dpkg-gencontrol.1:30 ./dpkg-source.1:97
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Read substitution variables in I<substvarsfile>; the default is "
+"B<debian/substvars>."
+msgstr ""
+
+# type: TP
+#: ./dpkg-genchanges.1:72 ./dpkg-gencontrol.1:30 ./dpkg-source.1:97
+#, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:93
-msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+#: ./dpkg-genchanges.1:75 ./dpkg-gencontrol.1:33 ./dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
-# type: SS
-#: ./dpkg-source.1:93 ./update-alternatives.8:290
+# type: TP
+#: ./dpkg-genchanges.1:75 ./dpkg-gencontrol.1:33 ./dpkg-source.1:100
 #, no-wrap
-msgid "COMMON OPTIONS"
+msgid "B<-U>I<field>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:96
-msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+#: ./dpkg-genchanges.1:78 ./dpkg-gencontrol.1:36 ./dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:96
+#: ./dpkg-genchanges.1:78
 #, no-wrap
-msgid "B<-h>,B<--help>"
+msgid "B<-b>, B<-B>, B<-S>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:101
+#: ./dpkg-genchanges.1:101
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no "
+"architecture-independent binary package files are to be distributed either.  "
+"B<-S> specifies that only the source should be uploaded and no binary "
+"packages need to be made. The distinction between B<-b> and B<-B> is only "
+"used by B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> "
+"file for whatever files were produced by the B<binary-*> target(s) of the "
+"package being built."
+msgstr ""
+
+# type: TP
+#: ./dpkg-genchanges.1:101 ./dpkg-gencontrol.1:36 ./dpkg-source.1:68
+#, no-wrap
+msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:106
+#: ./dpkg-genchanges.1:106 ./dpkg-gencontrol.1:41
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:106
+#: ./dpkg-genchanges.1:106 ./dpkg-gencontrol.1:41 ./dpkg-parsechangelog.1:16 ./dpkg-source.1:75
 #, no-wrap
-msgid "B<-v>I<version>"
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:114
+#: ./dpkg-genchanges.1:111 ./dpkg-gencontrol.1:46 ./dpkg-parsechangelog.1:21
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:119
+#: ./dpkg-genchanges.1:115
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"Read the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:119
+#: ./dpkg-genchanges.1:115 ./dpkg-gencontrol.1:50 ./dpkg-parsechangelog.1:21 ./dpkg-source.1:82
 #, no-wrap
-msgid "B<-C>I<changesdescription>"
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:126
+#: ./dpkg-genchanges.1:120 ./dpkg-gencontrol.1:55 ./dpkg-parsechangelog.1:26 ./dpkg-source.1:87
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog "
-"file. This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:126
+#: ./dpkg-genchanges.1:120
 #, no-wrap
-msgid "B<-m>I<maintaineraddress>"
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:134
+#: ./dpkg-genchanges.1:131
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and "
-"B<dpkg-genchanges>."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:134
+#: ./dpkg-genchanges.1:131
+#, no-wrap
+msgid "B<-q>"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-genchanges.1:139
+msgid ""
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-genchanges.1:155
+msgid ""
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
+msgstr ""
+
+# type: TH
+#: ./dpkg-gencontrol.1:1
 #, no-wrap
-msgid "B<-e>I<maintaineraddress>"
+msgid "dpkg-gencontrol"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:142
-msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and "
-"B<dpkg-genchanges>."
+#: ./dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:142
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
+# type: Plain text
+#: ./dpkg-gencontrol.1:8
+msgid "B<dpkg-gencontrol> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:150
+#: ./dpkg-gencontrol.1:15
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to "
+"debian/tmp/DEBIAN/control); it also adds an entry for the binary package to "
+"B<debian/files>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:158
-msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+#: ./dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:163
+#: ./dpkg-gencontrol.1:24
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:163
+#: ./dpkg-gencontrol.1:55
 #, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
+msgid "B<-p>I<package>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:169
+#: ./dpkg-gencontrol.1:62
 msgid ""
-"Set an output substitution variable.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:169
+#: ./dpkg-gencontrol.1:62
 #, no-wrap
-msgid "B<-T>I<substvarsfile>"
+msgid "B<-n>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:179
+#: ./dpkg-gencontrol.1:67
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:179
+#: ./dpkg-gencontrol.1:67
 #, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
+msgid "B<-is>, B<-ip>, B<-isp>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:184
+#: ./dpkg-gencontrol.1:76
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the "
+"B<-U> option to delete the fields from the control file."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:184
+#: ./dpkg-gencontrol.1:76
 #, no-wrap
-msgid "B<-U>I<field>"
+msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:189
+#: ./dpkg-gencontrol.1:89
 msgid ""
-"Remove an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:189
+#: ./dpkg-gencontrol.1:89 ./dpkg-shlibdeps.1:80
 #, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-source.1:212
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no "
-"architecture-independent binary package files are to be distributed either.  "
-"B<-S> specifies that only the source should be uploaded and no binary "
-"packages need to be made. The distinction between B<-b> and B<-B> is only "
-"used by B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> "
-"file for whatever files were produced by the B<binary-*> target(s) of the "
-"package being built."
+msgid "B<-O>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:217
+#: ./dpkg-gencontrol.1:98
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"Print the control file to standard output, rather than to "
+"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if "
+"B<-P> was used)."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:217
+#: ./dpkg-gencontrol.1:106
 #, no-wrap
-msgid "B<-c>I<controlfile>"
+msgid "B<debian/control>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:224
+#: ./dpkg-gencontrol.1:111
 msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
-msgstr ""
-
-# type: TP
-#: ./dpkg-source.1:224
-#, no-wrap
-msgid "B<-l>I<changelogfile>"
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:231
+#: ./dpkg-gencontrol.1:118
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:231
+# type: TH
+#: ./dpkg-name.1:6
 #, no-wrap
-msgid "B<-f>I<fileslistfile>"
+msgid "dpkg-name"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:237
-msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, "
-"B<dpkg-genchanges> and B<dpkg-distaddfile>."
+#: ./dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:237
-#, no-wrap
-msgid "B<-F>I<changelogformat>"
+# type: Plain text
+#: ./dpkg-name.1:15
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:244
+#: ./dpkg-name.1:27
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:244
+#: ./dpkg-name.1:29
 #, no-wrap
-msgid "B<-W>"
+msgid "B<-a>, B<--no-architecture>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:251
-msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to "
-"B<dpkg-source>."
+#: ./dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:251
+#: ./dpkg-name.1:32
 #, no-wrap
-msgid "B<-E>"
+msgid "B<-k>, B<--symlink>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:257
-msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+#: ./dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:257
+# type: TP
+#: ./dpkg-name.1:35
 #, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
+msgid "B<-o>, B<--overwrite>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:262
+#: ./dpkg-name.1:39
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:262
+#: ./dpkg-name.1:39
 #, no-wrap
-msgid "B<-x>"
+msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:272
+#: ./dpkg-name.1:51
 msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be "
+"`unstable/binary-E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section "
+"is not found in the control, then `no-section' is assumed, and in this case, "
+"as well as for sections `non-free' and `contrib' the target directory is "
+"`E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section field isn't "
+"required so a lot of packages will find their way to the `no-section' "
+"area. Use this option with care, it's messy."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:280
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+# type: TP
+#: ./dpkg-name.1:51
+#, no-wrap
+msgid "B<-c>, B<--create-dir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:288
+#: ./dpkg-name.1:56
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:288
+#: ./dpkg-name.1:59
 #, no-wrap
-msgid "B<-b>"
+msgid "B<-v>, B<--version>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:303
-msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+# type: TP
+#: ./dpkg-name.1:62
+#, no-wrap
+msgid "B<-l>, B<--license>"
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:303 ./dpkg-source.1:642
+#: ./dpkg-name.1:67
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
+msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:311
+#: ./dpkg-name.1:72
 msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
+msgstr ""
+
+# type: TP
+#: ./dpkg-name.1:72
+#, no-wrap
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:323
+#: ./dpkg-name.1:77
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the "
-".orig.tar.gz from. That directory will have CVS/Entries files in it that "
-"will contain timestamps that differ from the ones in your working directory, "
-"thus causing them to be unnecessarily included in every .diff.gz, unless you "
-"use the B<-i> switch."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:323 ./dpkg-source.1:646
+#: ./dpkg-name.1:77
 #, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:330
+#: ./dpkg-name.1:83
 msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a "
-".tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:330
+#: ./dpkg-name.1:83
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:345
-msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than "
-"B<-sk> it will remove it again afterwards."
+#: ./dpkg-name.1:86
+msgid "This can be used when building new packages."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:357
+#: ./dpkg-name.1:96
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and "
-"B<dpkg-source> will create a new original source archive from it. If B<-sr> "
-"is used B<dpkg-source will remove that directory after it has been used.>"
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:368
+#: ./dpkg-name.1:104
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:377
+#: ./dpkg-name.1:111
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying "
+"conditions. There is B<no> warranty."
+msgstr ""
+
+# type: TH
+#: ./dpkg-parsechangelog.1:1
+#, no-wrap
+msgid "dpkg-parsechangelog"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:406
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to "
-"B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+#: ./dpkg-parsechangelog.1:4
+msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-parsechangelog.1:8
+msgid "B<dpkg-parsechangelog> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:412
+#: ./dpkg-parsechangelog.1:14
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, "
-"B<-sU> and B<-sR> should be used instead."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:412
+#: ./dpkg-parsechangelog.1:26
 #, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgid "B<-L>I<libdir>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
+#: ./dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
+msgstr ""
+
+# type: TP
+#: ./dpkg-parsechangelog.1:41
+#, no-wrap
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:422
+#: ./dpkg-parsechangelog.1:47
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
+msgstr ""
+
+# type: TH
+#: ./dpkg-query.1:1
+#, no-wrap
+msgid "dpkg-query"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
+#: ./dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:430
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+#: ./dpkg-query.1:8
+msgid "B<dpkg-query> [I<option>...] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:435
+#: ./dpkg-query.1:12
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:435
+# type: TP
+#: ./dpkg-query.1:14
 #, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:438
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#: ./dpkg-query.1:23
+msgid ""
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in "
+"I<package-name-pattern>. Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion. For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:438
+# type: Plain text
+#: ./dpkg-query.1:27
 #, no-wrap
-msgid "B<-p>I<package>"
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:445
+#: ./dpkg-query.1:33
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and "
+"B<--showformat> for a way to configure the output format."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:445
+#: ./dpkg-query.1:33
 #, no-wrap
-msgid "B<-n>I<filename>"
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:450
+#: ./dpkg-query.1:40
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the "
+"B<--showformat> option.  The default output format gives one line per "
+"matching package, each line having the name and installed version of the "
+"package, separated by a tab."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:450
+#: ./dpkg-query.1:40
 #, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
+msgid "B<-s>, B<--status> I<package-name> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:459
+#: ./dpkg-query.1:44
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the "
-"B<-U> option to delete the fields from the control file."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:459
+#: ./dpkg-query.1:44
 #, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:472
+#: ./dpkg-query.1:49
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:472 ./dpkg-source.1:534
+#: ./dpkg-query.1:49
 #, no-wrap
-msgid "B<-O>"
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:482
+#: ./dpkg-query.1:55
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if "
-"B<-P> was used)."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:482
+# type: TP
+#: ./dpkg-query.1:55
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid "B<-p>, B<--print-avail> I<package-name>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:487
+#: ./dpkg-query.1:59
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"Display details about I<package-name>, as found in "
+"I</var/lib/dpkg/available>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:487
+#: ./dpkg-query.1:74
 #, no-wrap
-msgid "B<-e>I<executable>"
+msgid "B<-f>, B<--showformat=>I<format>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:491
-msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+#: ./dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:491
+# type: Plain text
+#: ./dpkg-query.1:87
 #, no-wrap
-msgid "B<-d>I<dependencyfield>"
+msgid ""
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:497
+#: ./dpkg-query.1:92
 msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and "
+"\\(lqB<$>\\(rq."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:507
+#: ./dpkg-query.1:98
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax "
+"\\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. Fields are printed right-aligned "
+"unless the width is negative in which case left alignment will be used. The "
+"following I<field>s are recognised:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:515
+#: ./dpkg-query.1:129
+#, no-wrap
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+# type: Plain text
+#: ./dpkg-query.1:137
+msgid ""
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:526
-msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
+#: ./dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:526
+# type: SH
+#: ./dpkg-query.1:143
 #, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+msgid "ENVIRONMENT"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:534
+#: ./dpkg-query.1:148
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:540
-msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file "
-"(B<debian/substvars> by default)."
+#: ./dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:540
+# type: UR
+#: ./dpkg-query.1:151 ./dpkg-statoverride.8:83
 #, no-wrap
-msgid "B<-t>I<type>"
+msgid "mailto:wakkerma@debian.org"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is "
-"\"deb\". Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+#: ./dpkg-query.1:153 ./dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:549
+# type: TH
+#: ./dpkg-scanpackages.1:16
 #, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
+msgid "dpkg-scanpackages"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:552
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#: ./dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
+# type: Plain text
+#: ./dpkg-scanpackages.1:28
+msgid ""
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> "
+"[I<path-prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:563
+#: ./dpkg-scanpackages.1:41
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:563
-#, no-wrap
-msgid "B<-q>"
+# type: Plain text
+#: ./dpkg-scanpackages.1:51
+msgid ""
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:571
+#: ./dpkg-scanpackages.1:58
 msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:571
-#, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+# type: Plain text
+#: ./dpkg-scanpackages.1:62
+msgid ""
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-scanpackages.1:65
+msgid "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:574
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#: ./dpkg-scanpackages.1:69
+msgid ""
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:574
+#: ./dpkg-scanpackages.1:71
 #, no-wrap
-msgid "B<-k>I<key-id>"
+msgid "B<-u>, B<--udeb>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
+#: ./dpkg-scanpackages.1:74
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:577
+#: ./dpkg-scanpackages.1:74
 #, no-wrap
-msgid "B<-r>I<gain-root-command>"
+msgid "B<-a>, B<--arch> I<arch>"
 msgstr ""
 
-#.  what happens, if it contains spaces? (hs)
 # type: Plain text
-#: ./dpkg-source.1:603
+#: ./dpkg-scanpackages.1:78
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:603
+#: ./dpkg-scanpackages.1:78
 #, no-wrap
-msgid "B<-p>I<sign-command>"
+msgid "B<-m>, B<--multiversion>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:628
-msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the "
-"B<-sgpg> option.  I<sign-command> should not contain spaces or any other "
-"shell metacharacters."
+#: ./dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:628
+# type: SH
+#: ./dpkg-scanpackages.1:88 ./update-alternatives.8:346
 #, no-wrap
-msgid "B<-tc>"
+msgid "DIAGNOSTICS"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:634
+#: ./dpkg-scanpackages.1:94
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
-msgstr ""
-
-# type: TP
-#: ./dpkg-source.1:634
-#, no-wrap
-msgid "B<-us>, B<-uc>"
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: ./dpkg-scanpackages.1:99
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:637
+# type: TH
+#: ./dpkg-scansources.1:1
 #, no-wrap
-msgid "B<-a>I<architecture>"
+msgid "dpkg-scansources"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:642
-msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+#: ./dpkg-scansources.1:4
+msgid "dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+#: ./dpkg-scansources.1:13
+msgid ""
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> "
+"[I<path-prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
-msgstr ""
-
-# type: TP
-#: ./dpkg-source.1:651
-#, no-wrap
-msgid "B<-D>"
+#: ./dpkg-scansources.1:18
+msgid ""
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
+#: ./dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this "
+"file. \\s-1NB:\\s0 Since the override file is indexed by binary, not source, "
+"packages, there's a bit of a problem here. The current implementation uses "
+"the highest priority of all the binary packages produced by a I<.dsc> file "
+"for the priority of the source package, and the override entry for the first "
+"binary package listed in the I<.dsc> file to modify maintainer "
+"information. This might change."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:654
-#, no-wrap
-msgid "B<-d>"
+# type: Plain text
+#: ./dpkg-scansources.1:33
+msgid ""
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:657
-msgid "Do not check build dependencies and conflicts."
+#: ./dpkg-scansources.1:44
+msgid ""
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:657
+# type: IP
+#: ./dpkg-scansources.1:46
 #, no-wrap
-msgid "B<-nc>"
+msgid "B<-n>, B<--no-sort>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
+#: ./dpkg-scansources.1:49
+msgid ""
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:660
+# type: IP
+#: ./dpkg-scansources.1:49
 #, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+msgid "B<-s>, B<--source-override> I<file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:666
+#: ./dpkg-scansources.1:52
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three "
-"non-option arguments, the filename and the section and priority for the "
-"B<.changes> file."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:674
+#: ./dpkg-scansources.1:58
 msgid ""
-"The filename should be specified relative to the directory where "
-"B<dpkg-genchanges> will expect to find the files, usually B<..>, rather than "
-"being a pathname relative to the current directory when B<dpkg-distaddfile> "
-"is run."
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:674
+# type: TP
+#: ./dpkg-scansources.1:58 ./install-info.8:272
 #, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+msgid "B<--debug>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:677
-msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+#: ./dpkg-scansources.1:60
+msgid "Turn debugging on."
 msgstr ""
 
-# type: SH
-#: ./dpkg-source.1:677
-#, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+# type: Plain text
+#: ./dpkg-scansources.1:68
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:687
-msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+#: ./dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:694
-msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+#: ./dpkg-shlibdeps.1:1 ./dpkg-shlibdeps.1:4
+#, no-wrap
+msgid "dpkg-shlibdeps"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:701
-msgid ""
-"After all the substitutions have been done each occurrence of the string "
-"B<${}> (which is not a legal substitution) is replaced with a B<$> sign."
+#: ./dpkg-shlibdeps.1:10
+msgid "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:714
+#: ./dpkg-shlibdeps.1:35
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names "
+"B<shlibs:>I<dependencyfield> where I<dependencyfield> is a dependency field "
+"name. Any other variables starting I<shlibs:> are removed from the file.  "
+"B<dpkg-shlibdeps> will read shared library dependency information from "
+"B<debian/shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control "
+"area file of the package containing the file which B<objdump> reports as "
+"satisfying the library dependency, or B</etc/dpkg/shlibs.default>.  The "
+"first match will be used."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: ./dpkg-shlibdeps.1:41
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:716
+#: ./dpkg-shlibdeps.1:41
 #, no-wrap
-msgid "B<Arch>"
+msgid "B<-e>I<executable>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: ./dpkg-shlibdeps.1:45
+msgid ""
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:720
+#: ./dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "B<source:Version>"
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:723
-msgid "The source package version."
+#: ./dpkg-shlibdeps.1:51
+msgid ""
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:723
-#, no-wrap
-msgid "B<source:Upstream-Version>"
+# type: Plain text
+#: ./dpkg-shlibdeps.1:61
+msgid ""
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:727
+#: ./dpkg-shlibdeps.1:69
 msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:727
+#: ./dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "B<binary:Version>"
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:731
+#: ./dpkg-shlibdeps.1:80
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
-msgstr ""
-
-# type: TP
-#: ./dpkg-source.1:731
-#, no-wrap
-msgid "B<Source-Version>"
+"Start substitution variables with I<varnameprefix>B<:> instead of "
+"B<shlibs:>.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:736
+#: ./dpkg-shlibdeps.1:86
 msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:736
+#: ./dpkg-shlibdeps.1:86
 #, no-wrap
-msgid "B<Installed-Size>"
+msgid "B<-t>I<type>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:745
+#: ./dpkg-shlibdeps.1:93
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:745
+#: ./dpkg-shlibdeps.1:93
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:754
+#: ./dpkg-shlibdeps.1:99
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
-msgstr ""
-
-# type: TP
-#: ./dpkg-source.1:754
-#, no-wrap
-msgid "B<F:>I<fieldname>"
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:761
+#: ./dpkg-shlibdeps.1:105
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"Write substitution variables in I<substvarsfile>; the default is "
+"B<debian/substvars>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:761
+#: ./dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<Format>"
+msgid "B<debian/shlibs.local>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:771
-msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+#: ./dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:771
+#: ./dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
+msgid "B</etc/dpkg/shlibs.override>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: ./dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:774
+#: ./dpkg-shlibdeps.1:123
 #, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
+msgid "B</etc/dpkg/shlibs.default>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:779
-msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+#: ./dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:779
+# type: Plain text
+#: ./dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
+msgstr ""
+
+# type: TH
+#: ./dpkg-source.1:2
 #, no-wrap
-msgid "B<dpkg:Upstream-Version>"
+msgid "dpkg-source"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: ./dpkg-source.1:6
+msgid "dpkg-source, - Debian source package tools"
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:782
-#, no-wrap
-msgid "B<dpkg:Version>"
+# type: Plain text
+#: ./dpkg-source.1:11
+msgid "B<dpkg-source> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:785
-msgid "The full version of dpkg."
+#: ./dpkg-source.1:15
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:788
+#: ./dpkg-source.1:19
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:789
+#: ./dpkg-source.1:21
 #, no-wrap
-msgid "B<debian/control>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:794
+#: ./dpkg-source.1:31
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:794
-#, no-wrap
-msgid "B<debian/changelog>"
+# type: Plain text
+#: ./dpkg-source.1:37
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:800
+#: ./dpkg-source.1:45
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:800
+#: ./dpkg-source.1:45
 #, no-wrap
-msgid "B<debian/files>"
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr ""
+
+# type: Plain text
+#: ./dpkg-source.1:60
+msgid ""
+"Build a source package. One or two non-option arguments should be "
+"supplied. The first is taken as the name of the directory containing the "
+"unpacked source tree. If a second argument is supplied it should be the name "
+"of the original source directory or tarfile or the empty string if the "
+"package is a Debian-specific one and so has no Debianisation diffs. If no "
+"second argument is supplied then B<dpkg-source> will look for the original "
+"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
+"original source directory I<directory>B<.orig> or the empty string (no "
+"original source, and so no diff) depending on the arguments."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:813
+#: ./dpkg-source.1:75
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:813
-#, no-wrap
-msgid "B<debian/substvars>"
+# type: Plain text
+#: ./dpkg-source.1:82
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:816
-msgid "List of substitution variables and values."
+#: ./dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
+# type: Plain text
+#: ./dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: ./dpkg-source.1:118
+msgid ""
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
 
-# type: TP
-#: ./dpkg-source.1:819
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
+# type: Plain text
+#: ./dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the "
+".orig.tar.gz from. That directory will have CVS/Entries files in it that "
+"will contain timestamps that differ from the ones in your working directory, "
+"thus causing them to be unnecessarily included in every .diff.gz, unless you "
+"use the B<-i> switch."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: ./dpkg-source.1:137
+msgid ""
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a "
+".tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: ./dpkg-source.1:822
+#: ./dpkg-source.1:158
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: ./dpkg-source.1:173
+msgid ""
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than "
+"B<-sk> it will remove it again afterwards."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:828
+#: ./dpkg-source.1:185
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and "
+"B<dpkg-source> will create a new original source archive from it. If B<-sr> "
+"is used B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:835
+#: ./dpkg-source.1:196
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, "
-"B<{> and B<}> are not legal in package names or version numbers."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:839
+#: ./dpkg-source.1:205
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:845
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+#: ./dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to "
+"B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
+#: ./dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, "
+"B<-sU> and B<-sR> should be used instead."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
+# type: TP
+#: ./dpkg-source.1:240
+#, no-wrap
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
+#: ./dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-source.1:857
+#: ./dpkg-source.1:250
 msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See "
-"B</usr/share/doc/dpkg/copyright> and B</usr/share/common-licenses/GPL> for "
-"details."
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
 
-# type: TH
-#: ./dpkg-split.1:2
-#, no-wrap
-msgid "dpkg-split"
+# type: Plain text
+#: ./dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:5
-msgid "dpkg-split - Debian package archive split/join tool"
+#: ./dpkg-source.1:258
+msgid ""
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
+#: ./dpkg-source.1:263
+msgid ""
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:13
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
+#: ./dpkg-source.1:274
+msgid ""
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, "
+"B<{> and B<}> are not legal in package names or version numbers."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:17
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
+#: ./dpkg-source.1:279
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
+# type: TH
+#: ./dpkg-split.1:2
+#, no-wrap
+msgid "dpkg-split"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:24
-msgid "B<dpkg-split> B<-l>|B<--listq>"
+#: ./dpkg-split.1:5
+msgid "dpkg-split - Debian package archive split/join tool"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:28
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
+#: ./dpkg-split.1:10
+msgid "B<dpkg-split> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:33
+#: ./dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -5954,14 +5985,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:37
+#: ./dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:45
+#: ./dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -5970,25 +6001,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:48
+#: ./dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:49
+#: ./dpkg-split.1:33
 #, no-wrap
-msgid "B<--split>, B<-s>"
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:52
+#: ./dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:60
+#: ./dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -5996,27 +6027,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:68
+#: ./dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:68
+#: ./dpkg-split.1:52
 #, no-wrap
-msgid "B<--join>, B<-j>"
+msgid "B<-j>, B<--join> I<part>..."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:72
+#: ./dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:76
+#: ./dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6024,7 +6055,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:81
+#: ./dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6032,17 +6063,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:83
+#: ./dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:86
+#: ./dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
+# type: TP
+#: ./dpkg-split.1:71
+#, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr ""
+
 # type: Plain text
-#: ./dpkg-split.1:92
+#: ./dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6050,25 +6087,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:92
+#: ./dpkg-split.1:76
 #, no-wrap
-msgid "B<--auto>, B<-a>"
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:95
+#: ./dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:100
+#: ./dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:107
+#: ./dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6076,21 +6113,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:113
+#: ./dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:120
+#: ./dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:127
+#: ./dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6098,18 +6135,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:127
+#: ./dpkg-split.1:111
 #, no-wrap
-msgid "B<--listq>, B<-l>"
+msgid "B<-l>, B<--listq>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:130
+#: ./dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:134
+#: ./dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -6117,96 +6154,77 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:134
+#: ./dpkg-split.1:118
 #, no-wrap
-msgid "B<--discard>, B<-d>"
+msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:138
+#: ./dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:143
+#: ./dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-
 # type: TP
-#: ./dpkg-split.1:161
+#: ./dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:166
+#: ./dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:166
+#: ./dpkg-split.1:143
 #, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
+msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:170
+#: ./dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 "
-"bytes). The default is 450Kb."
+"bytes). The default is 450 KiB."
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:170
+#: ./dpkg-split.1:147
 #, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:173
+#: ./dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:178
+#: ./dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:178
+#: ./dpkg-split.1:155
 #, no-wrap
-msgid "B<--npquiet>, B<-Q>"
+msgid "B<-Q>, B<--npquiet>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:189
+#: ./dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -6215,18 +6233,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:189
+#: ./dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:194
+#: ./dpkg-split.1:171
 msgid "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:200
+#: ./dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -6234,20 +6252,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:205
+#: ./dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: ./dpkg-split.1:205 ./update-alternatives.8:429
+#: ./dpkg-split.1:183 ./update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:211
+#: ./dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -6255,14 +6273,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:217
+#: ./dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:221
+#: ./dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -6270,28 +6288,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:225
+#: ./dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:228
+#: ./dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:231
+#: ./dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:235
+#: ./dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -6299,18 +6317,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./dpkg-split.1:236
+#: ./dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:240
+#: ./dpkg-split.1:220
 msgid "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:245
+#: ./dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to "
 "B<dpkg-split> and are unlikely to be useful to other programs, and in any "
@@ -6318,12 +6336,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:250
+#: ./dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-split.1:260
+#: ./dpkg-split.1:241
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
 "Copyright (C) 1995-1996 by him and released under the GNU General Public "
@@ -6351,23 +6369,11 @@ msgstr ""
 
 # type: Plain text
 #: ./dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:28
+#: ./dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -6378,122 +6384,100 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:32
+#: ./dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 
 # type: TP
-#: ./dpkg-statoverride.8:34
+#: ./dpkg-statoverride.8:25
 #, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:41
+#: ./dpkg-statoverride.8:32
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a `B<#>' "
-"(for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:44
+#: ./dpkg-statoverride.8:35
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
-msgstr ""
-
-# type: TP
-#: ./dpkg-statoverride.8:44
-#, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:48
+#: ./dpkg-statoverride.8:39
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 
 # type: TP
-#: ./dpkg-statoverride.8:48
+#: ./dpkg-statoverride.8:39
 #, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<--list> [I<glob-pattern>]"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:53
+#: ./dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
 "glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
 
+# type: Plain text
+#: ./dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+
 # type: TP
-#: ./dpkg-statoverride.8:53
+#: ./dpkg-statoverride.8:56
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:57
+#: ./dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
 msgstr ""
 
 # type: TP
-#: ./dpkg-statoverride.8:57
+#: ./dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr ""
 
-# type: Plain text
-#: ./dpkg-statoverride.8:61
-msgid "Immediately try to change the file to the new owner and mode if it exists."
-msgstr ""
-
 # type: Plain text
 #: ./dpkg-statoverride.8:64
-msgid "Be less verbose about what we do."
+msgid "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 
 # type: Plain text
 #: ./dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr ""
-
-# type: TP
-#: ./dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr ""
-
-# type: Plain text
-#: ./dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
+msgid "Be less verbose about what we do."
 msgstr ""
 
 # type: TP
-#: ./dpkg-statoverride.8:76
+#: ./dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:81
+#: ./dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -6501,14 +6485,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:84
+#: ./dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: ./dpkg-statoverride.8:90
+#: ./dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr ""
 
@@ -6579,6 +6563,12 @@ msgid ""
 "without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
 
+# type: TP
+#: ./dselect.1:52
+#, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr ""
+
 # type: Plain text
 #: ./dselect.1:57
 msgid ""
@@ -6799,6 +6789,11 @@ msgid ""
 "successfully."
 msgstr ""
 
+# type: Plain text
+#: ./dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr ""
+
 # type: SH
 #: ./dselect.1:132
 #, no-wrap
@@ -7838,149 +7833,167 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
+#: ./start-stop-daemon.8:9
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: ./start-stop-daemon.8:17
+msgid ""
+"B<start-stop-daemon> is used to control the creation and termination of "
+"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
+"B<--name> options, B<start-stop-daemon> can be configured to find existing "
+"instances of a running process."
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#: ./start-stop-daemon.8:36
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
 msgstr ""
 
-# type: Plain text
-#: ./start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
+# type: TP
+#: ./start-stop-daemon.8:38
+#, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:29
+#: ./start-stop-daemon.8:55
 msgid ""
-"B<start-stop-daemon> is used to control the creation and termination of "
-"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
-"B<--name> options, B<start-stop-daemon> can be configured to find existing "
-"instances of a running process."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if "
+"B<--oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
+msgstr ""
+
+# type: TP
+#: ./start-stop-daemon.8:55
+#, no-wrap
+msgid "B<-K>, B<--stop>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:48
+#: ./start-stop-daemon.8:73
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
+msgstr ""
+
+# type: TP
+#: ./start-stop-daemon.8:73
+#, no-wrap
+msgid "B<-H>, B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:68
-msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then "
-"B<start-stop-daemon> will check that the process(es) have terminated."
+#: ./start-stop-daemon.8:76
+msgid "Show usage information and exit."
+msgstr ""
+
+# type: TP
+#: ./start-stop-daemon.8:76
+#, no-wrap
+msgid "B<-V>, B<--version>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:87
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
+#: ./start-stop-daemon.8:79
+msgid "Show the program version and exit."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:90
+#: ./start-stop-daemon.8:81
 #, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:94
+#: ./start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to "
 "B</proc/>I<pid>B</exe>)."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:94
+#: ./start-stop-daemon.8:85
 #, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:98
+#: ./start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:98
+#: ./start-stop-daemon.8:89
 #, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:104
+#: ./start-stop-daemon.8:95
 msgid "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:104
+#: ./start-stop-daemon.8:95
 #, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:107
+#: ./start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:107
+#: ./start-stop-daemon.8:98
 #, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:113
+#: ./start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to "
 "B</proc/>I<pid>B</stat>)."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:113
+#: ./start-stop-daemon.8:104
 #, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:118
+#: ./start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:118
+#: ./start-stop-daemon.8:109
 #, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:128
+#: ./start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -7989,7 +8002,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:139
+#: ./start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -7997,7 +8010,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:155
+#: ./start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -8007,7 +8020,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:165
+#: ./start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -8015,61 +8028,61 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:165
+#: ./start-stop-daemon.8:156
 #, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:173
+#: ./start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:173
+#: ./start-stop-daemon.8:164
 #, no-wrap
-msgid "B<-t>|B<--test>"
+msgid "B<-t>, B<--test>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:177
+#: ./start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:177
+#: ./start-stop-daemon.8:168
 #, no-wrap
-msgid "B<-o>|B<--oknodo>"
+msgid "B<-o>, B<--oknodo>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:180
+#: ./start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:180
+#: ./start-stop-daemon.8:171
 #, no-wrap
-msgid "B<-q>|B<--quiet>"
+msgid "B<-q>, B<--quiet>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:183
+#: ./start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:183
+#: ./start-stop-daemon.8:174
 #, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:200
+#: ./start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -8081,26 +8094,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:200
+#: ./start-stop-daemon.8:191
 #, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:206
+#: ./start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:206
+#: ./start-stop-daemon.8:197
 #, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:214
+#: ./start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, "
@@ -8109,13 +8122,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:214
+#: ./start-stop-daemon.8:205
 #, no-wrap
-msgid "B<-b>|B<--background>"
+msgid "B<-b>, B<--background>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:226
+#: ./start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -8127,35 +8140,35 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:226
+#: ./start-stop-daemon.8:217
 #, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:229
+#: ./start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:229
+#: ./start-stop-daemon.8:220
 #, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:232
+#: ./start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:232
+#: ./start-stop-daemon.8:223
 #, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+msgid "B<-m>, B<--make-pidfile>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:247
+#: ./start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with "
@@ -8167,47 +8180,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./start-stop-daemon.8:247
+#: ./start-stop-daemon.8:238
 #, no-wrap
-msgid "B<-v>|B<--verbose>"
+msgid "B<-v>, B<--verbose>"
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:250
+#: ./start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr ""
 
-# type: TP
-#: ./start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr ""
-
-# type: Plain text
-#: ./start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr ""
-
-# type: TP
-#: ./start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr ""
-
-# type: Plain text
-#: ./start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr ""
-
 # type: Plain text
-#: ./start-stop-daemon.8:260
+#: ./start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 msgstr ""
 
 # type: Plain text
-#: ./start-stop-daemon.8:262
+#: ./start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -8219,73 +8210,25 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
-# type: TH
-#: ./update-alternatives.8:8
-#, no-wrap
-msgid "2006-11-24"
-msgstr ""
-
 # type: Plain text
 #: ./update-alternatives.8:11
 msgid "update-alternatives - maintain symbolic links determining default commands"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#: ./update-alternatives.8:16
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:64
+#: ./update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:72
+#: ./update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -8296,7 +8239,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:94
+#: ./update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -8311,7 +8254,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:104
+#: ./update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -8322,7 +8265,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:116
+#: ./update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -8332,7 +8275,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:135
+#: ./update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the "
@@ -8345,7 +8288,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:143
+#: ./update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -8356,7 +8299,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:152
+#: ./update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -8366,7 +8309,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:159
+#: ./update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -8374,7 +8317,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:175
+#: ./update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
@@ -8386,14 +8329,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:179
+#: ./update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:190
+#: ./update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -8402,39 +8345,39 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ./update-alternatives.8:191
+#: ./update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:196
+#: ./update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:196
+#: ./update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:202
+#: ./update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:202
+#: ./update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:207
+#: ./update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -8442,87 +8385,87 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:207
+#: ./update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:211
+#: ./update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:211
+#: ./update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:216
+#: ./update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:216
+#: ./update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:223
+#: ./update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing "
 "B<update-alternatives>' state information."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:223
+#: ./update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:226
+#: ./update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:226
+#: ./update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:230
+#: ./update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:230
+#: ./update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:234
+#: ./update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master "
 "link."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:234
+#: ./update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:240
+#: ./update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -8530,134 +8473,20 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:240
+#: ./update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:245
+#: ./update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
 msgstr ""
 
-# type: Plain text
-#: ./update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:290
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-
-# type: TP
-#: ./update-alternatives.8:291
-#, no-wrap
-msgid "B<--verbose>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:304
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:307
-msgid "Give some usage information."
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr ""
-
-# type: TP
-#: ./update-alternatives.8:312
-#, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:316
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-
-# type: TP
-#: ./update-alternatives.8:316
-#, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr ""
-
-# type: Plain text
-#: ./update-alternatives.8:320
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr ""
-
 # type: TP
-#: ./update-alternatives.8:323
+#: ./update-alternatives.8:204
 #, no-wrap
 msgid ""
 "B<--install> I<genname symlink altern priority> [B<--slave> I<genname "
@@ -8665,7 +8494,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:338
+#: ./update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -8677,7 +8506,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:349
+#: ./update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -8689,26 +8518,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:349
+#: ./update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:358
+#: ./update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:358
+#: ./update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:378
+#: ./update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -8721,37 +8550,37 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:378
+#: ./update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:383
+#: ./update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:383
+#: ./update-alternatives.8:264
 #, no-wrap
 msgid "B<--all>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:386
+#: ./update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:386
+#: ./update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:393
+#: ./update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -8759,13 +8588,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:393
+#: ./update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:404
+#: ./update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -8775,24 +8604,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:404
+#: ./update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:407
+#: ./update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:407
+#: ./update-alternatives.8:288
 #, no-wrap
 msgid "B<--config> I<link>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:414
+#: ./update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -8800,57 +8629,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:416
+#: ./update-alternatives.8:303
+#, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+
+# type: TP
+#: ./update-alternatives.8:311
+#, no-wrap
+msgid "B<--verbose>"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+
+# type: TP
+#: ./update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:422
+#: ./update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 # type: TP
-#: ./update-alternatives.8:422
+#: ./update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:428
+#: ./update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the "
 "B<--admindir> option."
 msgstr ""
 
 # type: IP
-#: ./update-alternatives.8:430
+#: ./update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:432
+#: ./update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr ""
 
 # type: IP
-#: ./update-alternatives.8:432
+#: ./update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:435
+#: ./update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:445
+#: ./update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -8860,14 +8734,59 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:449
+#: ./update-alternatives.8:361
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:367
+msgid "B<update-alternatives --display vi>"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:374
+msgid "B<update-alternatives --config vi>"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:381
+msgid "B<update-alternatives --auto vi>"
+msgstr ""
+
+# type: Plain text
+#: ./update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:454
+#: ./update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -8875,7 +8794,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:459
+#: ./update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -8883,7 +8802,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:463
+#: ./update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -8891,13 +8810,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:465
+#: ./update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
 msgstr ""
 
 # type: Plain text
-#: ./update-alternatives.8:468
+#: ./update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
diff --git a/man/po/es.po b/man/po/es.po
index b93da6e8..3a7e8453 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -15,35 +15,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
-#: 822-date.1:3
+#: 822-date.1:2
 #, fuzzy, no-wrap
 msgid "822-date"
 msgstr "B<822-date>"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2
 #, no-wrap
-msgid "2006-02-28"
+msgid "2007-01-24"
 msgstr ""
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, fuzzy, no-wrap
 msgid "Debian Project"
 msgstr "Proyecto Debian"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, fuzzy, no-wrap
 msgid "dpkg utilities"
 msgstr ""
@@ -57,78 +61,98 @@ msgstr ""
 "herramientas dpkg"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, fuzzy, no-wrap
 msgid "NAME"
 msgstr "NOMBRE"
 
 # type: Plain text
-#: 822-date.1:6
+#: 822-date.1:5
 #, fuzzy
-msgid "822-date - Print date and time in RFC822 format"
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - Muestra la fecha y la hora en formato RFC822"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, fuzzy, no-wrap
 msgid "SYNOPSIS"
 msgstr "SINOPSIS"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 #, fuzzy
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, fuzzy, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
 #, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> muestra la fecha y la hora actual en el formato descrito en "
 "RFC822, usando un huso horario numérico compensado, como se recomienda en "
 "RFC1123\t"
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, fuzzy, no-wrap
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 #, fuzzy
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> no lleva ningún argumento u opción."
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, fuzzy, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -144,18 +168,19 @@ msgstr ""
 "ERRORES"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 #, fuzzy
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "Esta funcionalidad en realidad debería ser parte de B<date>(1),"
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -169,45 +194,28 @@ msgstr ""
 "VEA ADEMÁS"
 
 # type: Plain text
-#: 822-date.1:26
-#, fuzzy
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-
-# type: Plain text
-#: 822-date.1:29
-#, fuzzy
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"sección 5.2.14,"
-
-# type: Plain text
-#: 822-date.1:31
-#, fuzzy
-msgid "B<date>(1)."
-msgstr "B<date>(1)."
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: Plain text
-#: 822-date.1:35
-#, fuzzy
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> y este manual fueron escritos por Ian Jackson. Por la presente, "
-"fueron puestos en el dominio público por él."
 
 # type: TH
 #: cleanup-info.8:1
@@ -215,6 +223,15 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, no-wrap
+msgid "2007-03-06"
+msgstr ""
+
 # type: Plain text
 #: cleanup-info.8:4
 #, fuzzy
@@ -223,16 +240,13 @@ msgstr ""
 "cleanup-info - Limpia el desastre que un falso install-info pueda haber hecho"
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>directorioE<gt>>]"
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<update-alternatives> [I<opciones>] B<--auto> I<nombre>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 #, fuzzy
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
@@ -246,7 +260,7 @@ msgstr ""
 "forma inteligente las mayúsculas/minúsculas y dos puntos o espacios finales."
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 #, fuzzy
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
@@ -256,7 +270,7 @@ msgstr ""
 "blanco (solamente en la parte de las entradas)."
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 #, fuzzy
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
@@ -266,7 +280,7 @@ msgstr ""
 "cuenta).  Se preserva el orden de las entradas en una sección."
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 #, fuzzy
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
@@ -280,33 +294,19 @@ msgstr ""
 "respaldar este archivo previamente."
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, fuzzy, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-#, fuzzy
-msgid "Output the help screen and exit successfully."
-msgstr "Muestra la pantalla de ayuda y finaliza correctamente."
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--unsafe>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 #, fuzzy
 msgid "Set some additional possibly useful options."
 msgstr "Define algunas opciones adicionales posiblemente útiles."
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 #, fuzzy
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
@@ -314,24 +314,52 @@ msgstr ""
 "correcto!\""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, fuzzy, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+#, fuzzy
+msgid "Show the usage message and exit."
+msgstr "Muestra el modo de uso y termina."
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
 #, fuzzy
-msgid "Output version and exit successfully."
-msgstr "Muestra la versión y finaliza correctamente."
+msgid "Show the version and exit."
+msgstr "Muestra la versión y termina."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, fuzzy, no-wrap
 msgid "FILES"
 msgstr ""
@@ -341,13 +369,13 @@ msgstr ""
 "ARCHIVOS"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, fuzzy, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "I</usr/info/dir o E<lt>directorioE<gt>/dir>"
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 #, fuzzy
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
@@ -357,25 +385,25 @@ msgstr ""
 "con el sufijo \".lock\"."
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 #, fuzzy
 msgid "Probably many."
 msgstr "Probablemente muchos."
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 #, fuzzy
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -390,6 +418,13 @@ msgstr ""
 msgid "deb"
 msgstr ""
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr ""
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, fuzzy, no-wrap
@@ -1160,4796 +1195,4514 @@ msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr ""
 "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5), I<Debian Packaging Manual>."
 
+# type: TP
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "I</var/lib/dpkg/statoverride>"
+
 # type: TH
-#: dpkg.1:1
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
 #, no-wrap
-msgid "dpkg"
+msgid "2007-03-07"
 msgstr ""
 
-# type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+# type: Plain text
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
 msgstr ""
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, fuzzy, no-wrap
-msgid "dpkg suite"
-msgstr "herramientas dpkg"
+# type: TP
+#: deb-override.5:22
+#, fuzzy
+msgid "override"
+msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dpkg.1:4
+#: deb-override.5:29
 #, fuzzy
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - Gestor de paquetes Debian de medio nivel"
+msgid ""
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
+msgstr ""
+"Mientras que la mayoría de la información acerca de los paquetes se "
+"encuentre en el fichero de control, parte de esta información debe de ser "
+"rellenada por los encargados de planificar la distribución en vez de por los "
+"mantenedores, porque es información relacionada con el ordenamiento de los "
+"archivos para el lanzamiento de la distribución, más que dependencias reales "
+"o descripciones del paquete. Este tipo de información se encuentra en el "
+"fichero de override."
 
 # type: Plain text
-#: dpkg.1:8
+#: deb-override.5:33
 #, fuzzy
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<opciones>] I<acción>"
+msgid ""
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
+msgstr ""
+"El fichero override tiene un formato simple, está delimitado por espacios en "
+"blanco. Los comentarios van precedidos de B<#>)."
 
-# type: SH
-#: dpkg.1:9
-#, fuzzy, no-wrap
-msgid "WARNING"
-msgstr "AVISO"
+# type: Plain text
+#: deb-override.5:39
+#, fuzzy
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgstr "I<paquete> I<prioridad> I<sección> [I<información_del_mantenedor>]"
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:44
 #, fuzzy
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"El propósito de este manual es que los usuarios entiendan las opciones de "
-"llamada de B<dpkg> y los estados en los que puede estar un paquete con algo "
-"más de precisión que la dada por B<dpkg --help>."
+"I<paquete> El nombre del paquete.  Las entradas en el fichero de override de "
+"un paquete no encontrado en el directorio son descartadas."
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:53
 #, fuzzy
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"I<No> deberían usarlo los encargados de paquetes para comprender el proceso "
-"de instalación. Las descripciones de lo que hace este programa al instalar y "
-"desinstalar simplemente no son apropiadas."
+"I<prioridad> y I<sección> colocan el paquete en el árbol de directorios de "
+"la distribución; esta información no debe de encontrarse en el fichero de "
+"control. Si el paquete se encuentra en un subdirectorio de I<bindir>, se "
+"tendrá en cuenta la I<sección>."
 
 # type: Plain text
-#: dpkg.1:26
+#: deb-override.5:61
 #, fuzzy
 msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
-"B<dpkg> es una herramienta de nivel medio para instalar, construir, borrar y "
-"gestionar los paquetes de Debian GNU/Linux. Se llama con parámetros desde "
-"línea de órdenes, especificando una acción y cero o más opciones. La acción "
-"dice a B<dpkg> qué hacer y las opciones controlan de alguna manera su "
-"comportamiento."
+"I<información_del_mantenedor>, si está presente, puede ser el nombre del "
+"mantenedor para un fichero de override incondicional , o bien I<antiguo "
+"mantenedor> B<=E<gt>> I<nuevo mantenedor> para hacer una substitución."
 
 # type: Plain text
-#: dpkg.1:31
+#: deb-override.5:66
 #, fuzzy
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"También se puede usar B<dkpg> como interfaz a B<dpkg-deb>. Si aquél se "
-"encuentra alguna de las opciones de éste, se limita a llamarlo con esas "
-"mismas opciones. La lista de opciones de B<dpkg-deb> es:"
+"Los ficheros override que se usan para hacer las listas de paquetes "
+"oficiales, suelen encontrarse en el directorio I<índices> en cualquier "
+"réplica de Debian."
 
 # type: Plain text
-#: dpkg.1:40
-#, fuzzy, no-wrap
-msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<dpkg-buildpackage> [I<opciones>]"
+
+# type: TH
+#: deb-shlibs.5:16
+#, no-wrap
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, no-wrap
+msgid "2007-03-08"
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:42
+#: deb-shlibs.5:19
 #, fuzzy
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-msgstr "Lea B<dpkg-deb>(1) si desea más información sobre estas acciones."
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
+"Información acerca de redefinición de dependencias de bibliotecas "
+"compartidas para cada sistema."
 
-# type: SH
-#: dpkg.1:43
-#, fuzzy, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "INFORMACIÓN SOBRE PAQUETES"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:48
-#, fuzzy
+#: deb-shlibs.5:26
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"Hay bastante información útil sobre los paquetes disponibles accesible a "
-"través de B<dpkg>. Esta información se divide en tres clases: B<estados>, "
-"B<estados de selección> e B<indicadores>. Teóricamente, estos valores se "
-"cambiarán principalmente con B<dselect>."
-
-# type: SS
-#: dpkg.1:48
-#, fuzzy, no-wrap
-msgid "PACKAGE STATES"
-msgstr "ESTADOS DE LOS PAQUETES"
 
-# type: TP
-#: dpkg.1:49
-#, fuzzy, no-wrap
-msgid "B<installed>"
-msgstr "B<installed>"
+# type: Plain text
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:52
+#: deb-shlibs.5:30
 #, fuzzy
-msgid "The package is unpacked and configured OK."
-msgstr "Bien desempaquetado y configurado."
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-shlibdeps> I<opciones>"
 
 # type: TP
-#: dpkg.1:52
+#: deb-substvars.5:2
 #, fuzzy, no-wrap
-msgid "B<half-installed>"
-msgstr "B<half-installed>"
+msgid "deb-substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:56
-#, fuzzy
-msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
-"Se inició la instalación del paquete, pero no se completó por alguna razón."
 
 # type: TP
-#: dpkg.1:56
-#, fuzzy, no-wrap
-msgid "B<not-installed>"
-msgstr "B<not-installed>"
-
-# type: Plain text
-#: dpkg.1:59
+#: deb-substvars.5:9
 #, fuzzy
-msgid "The package is not installed on your system."
-msgstr "No está instalado en el sistema."
-
-# type: TP
-#: dpkg.1:59
-#, fuzzy, no-wrap
-msgid "B<unpacked>"
-msgstr "B<unpacked>"
+msgid "substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:62
+#: deb-substvars.5:20
 #, fuzzy
-msgid "The package is unpacked, but not configured."
-msgstr "Descomprimido, pero no configurado."
-
-# type: TP
-#: dpkg.1:62
-#, fuzzy, no-wrap
-msgid "B<half-configured>"
-msgstr "B<half-configured>"
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
+msgstr ""
+"Antes de que B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges> "
+"escriban su información de control (al fichero B<.dsc> de control en el caso "
+"de B<dpkg-source> y a la salida estándar en el de B<dpkg-gencontrol> y "
+"B<dpkg-genchanges>)  realizan algunas sustituciones de variables en el "
+"fichero de salida."
 
 # type: Plain text
-#: dpkg.1:66
+#: deb-substvars.5:27
 #, fuzzy
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
 msgstr ""
-"El paquete está descomprimido y la configuración se inició, pero no se "
-"terminó por alguna razón."
+"Una variable de sustitución tiene la forma B<${>I<nombre-de-variable>B<}>.  "
+"Los nombres de variable consisten en caracteres alfanuméricos, guiones y dos "
+"puntos (:), y comienzan siempre por un alfanumérico. La sustitución de "
+"variables se lleva a cabo repetidamente hasta que no queda ninguna; el texto "
+"completo del campo tras la sustitución es revisado de nuevo en busca de más "
+"sustituciones."
 
-# type: TP
-#: dpkg.1:66
-#, fuzzy, no-wrap
-msgid "B<config-files>"
-msgstr "B<config-files>"
+# type: Plain text
+#: deb-substvars.5:34
+#, fuzzy
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
+"Después de que todas las sustituciones hayan tenido lugar, cada aparición de "
+"la cadena B<${}> (que no es una sustitución legal) se reemplaza por un "
+"símbolo B<$>."
 
 # type: Plain text
-#: dpkg.1:69
+#: deb-substvars.5:47
 #, fuzzy
-msgid "Only the configuration files of the package exist on the system."
-msgstr "Sólo quedan los ficheros de configuración del paquete en el sistema."
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+"Las variables pueden establecerse usando la opción común B<-V>.  También "
+"pueden especificarse en el fichero B<debian/substvars> (u otro fichero "
+"especificado usando la opción B<-T>).  Este fichero consiste en líneas de la "
+"forma I<nombre = valor >.  Los caracteres en blanco al final de cada línea, "
+"las líneas vacías y las líneas que comiencen con el símbolo B<#> "
+"(comentarios) son ignorados."
 
-# type: SS
-#: dpkg.1:69
-#, fuzzy, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "ESTADOS DE SELECCIÓN DE LOS PAQUETES"
+# type: Plain text
+#: deb-substvars.5:49
+#, fuzzy
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
+"De manera adicional, las siguientes variables estándar están disponibles:"
 
 # type: TP
-#: dpkg.1:70
+#: deb-substvars.5:49
 #, fuzzy, no-wrap
-msgid "B<install>"
-msgstr "B<install>"
+msgid "B<Arch>"
+msgstr "B<Arch>"
 
 # type: Plain text
-#: dpkg.1:73
+#: deb-substvars.5:53
 #, fuzzy
-msgid "The package is selected for installation."
-msgstr "El paquete se ha seleccionado para instalarse."
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
+msgstr ""
+"La arquitectura de construcción actual (de B<dpkg --print-architecture>)."
 
 # type: TP
-#: dpkg.1:73
+#: deb-substvars.5:53
 #, fuzzy, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstall>"
+msgid "B<source:Version>"
+msgstr "B<Source-Version>"
 
 # type: Plain text
-#: dpkg.1:77
+#: deb-substvars.5:56
 #, fuzzy
-msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
-msgstr ""
-"El paquete se ha seleccionado para desinstalarse (es decir, que queremos "
-"borrarlo todo excepto los ficheros de configuración)."
+msgid "The source package version."
+msgstr "La versión del paquete fuente (del fichero de cambios)."
 
 # type: TP
-#: dpkg.1:77
+#: deb-substvars.5:56
 #, fuzzy, no-wrap
-msgid "B<purge>"
-msgstr "B<purge>"
+msgid "B<source:Upstream-Version>"
+msgstr "B<dpkg:UpstreamVersion>"
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:60
 #, fuzzy
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
-msgstr ""
-"El paquete se ha seleccionado para purgarse (es decir, que queremos borrarlo "
-"todo, incluso los ficheros de configuración)."
-
-# type: SS
-#: dpkg.1:81
-#, fuzzy, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "INDICADORES DE LOS PAQUETES"
+"The upstream source package version, including the Debian version epoch if "
+"any."
+msgstr "La versión de desarrollador principal de dpkg."
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:60
 #, fuzzy, no-wrap
-msgid "B<hold>"
-msgstr "B<hold>"
+msgid "B<binary:Version>"
+msgstr "B<dpkg:Version>"
 
 # type: Plain text
-#: dpkg.1:86
-#, fuzzy
+#: deb-substvars.5:64
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"Un paquete marcado como B<hold> no es modificado por B<dpkg>, a no ser que "
-"lo forcemos a hacerlo con la opción B<--force-hold>."
 
 # type: TP
-#: dpkg.1:86
+#: deb-substvars.5:64
 #, fuzzy, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<reinst-required>"
+msgid "B<Source-Version>"
+msgstr "B<Source-Version>"
 
 # type: Plain text
-#: dpkg.1:91
-#, fuzzy
+#: deb-substvars.5:69
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"Un paquete marcado como B<necesita-reinst> está roto y necesita "
-"reinstalarse. Estos paquetes no pueden borrarse, a no ser que se fuerce la "
-"acción con la opción B<--force-remove-reinstreq>."
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, fuzzy, no-wrap
-msgid "ACTIONS"
-msgstr "ACCIONES"
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:69
 #, fuzzy, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
+msgid "B<Installed-Size>"
+msgstr "B<Installed-Size>"
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:78
 #, fuzzy
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"Instala el paquete. Si se especifica la opción B<--recursive> o B<-R>, "
-"I<fichero_paquete> debe ser un directorio."
-
-# type: Plain text
-#: dpkg.1:99
-#, fuzzy
-msgid "Installation consists of the following steps:"
-msgstr "La instalación consiste en los siguientes pasos:"
+"El tamaño total de los ficheros del paquete instalado. Este valor se copia "
+"en el campo del fichero de control correspondiente; establecerlo modifica el "
+"valor de dicho campo. Si la variable no está establecida, B<dpkg-gencontrol> "
+"usará B<du -k debian/tmp> para hallar el valor predeterminado."
 
-# type: Plain text
-#: dpkg.1:102
-#, fuzzy
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Se extraen los ficheros de control del paquete."
+# type: TP
+#: deb-substvars.5:78
+#, fuzzy, no-wrap
+msgid "B<Extra-Size>"
+msgstr "B<Extra-Size>"
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:87
 #, fuzzy
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"B<2.> Si hay instalada otra versión del mismo paquete, se ejecuta el "
-"programa I<prerm> del antiguo paquete."
+"Espacio en disco adicional usado cuando se instala el paquete. Si esta "
+"variable está establecida, su valor se añade al de la variable B<Installed-"
+"Size> (tanto si se establece manualmente como si se usa el valor "
+"predeterminado)  antes de copiarse al campo B<Installed-Size> del fichero de "
+"control."
 
-# type: Plain text
-#: dpkg.1:109
-#, fuzzy
-msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> Se ejecuta el programa I<preinst>, si el paquete lo tiene."
+# type: TP
+#: deb-substvars.5:87
+#, fuzzy, no-wrap
+msgid "B<F:>I<fieldname>"
+msgstr "B<F:>I<nombrecampo>"
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:94
 #, fuzzy
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
-"B<4.> Se desempaquetan los nuevos ficheros, y al mismo tiempo se hace una "
-"copia de seguridad de los antiguos, para que, si algo va mal, se puedan "
-"restaurar."
+"El valor del campo de salida I<nombrecampo> (que debe darse siguiendo la "
+"convención de mayúsculas/minúsculas).  Establecer estas variables no tiene "
+"ningún efecto excepto en aquellos lugares donde se expandan explícitamente."
 
-# type: Plain text
-#: dpkg.1:120
-#, fuzzy
-msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
-msgstr ""
-"B<5.> Si había instalada otra versión del mismo paquete, se ejecuta el "
-"I<postrm> del paquete antiguo. Tenga en cuenta que este programa se ejecuta "
-"después del I<preinst> del nuevo paquete, ya que los nuevos ficheros se "
-"escriben a la vez que se borran los antiguos."
+# type: TP
+#: deb-substvars.5:94
+#, fuzzy, no-wrap
+msgid "B<Format>"
+msgstr "B<Format>"
 
 # type: Plain text
-#: dpkg.1:124
+#: deb-substvars.5:104
 #, fuzzy
 msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"B<6.> Se configura el paquete. Si quiere información detallada sobre el "
-"proceso, vea B<--configure>."
+"El formato del fichero B<.changes> generado por esta versión de los scripts "
+"de empaquetamiento de fuentes.  Si establece esta variable el contenido del "
+"campo B<Format> en el fichero B<.changes> cambiará igualmente."
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:104
 #, fuzzy, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<fichero_paquete> ..."
+msgid "B<Newline>, B<Space>, B<Tab>"
+msgstr "B<Newline>, B<Space>, B<Tab>"
 
 # type: Plain text
-#: dpkg.1:129
+#: deb-substvars.5:107
 #, fuzzy
-msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"Desempaqueta el fichero, pero no lo configura. Si se dan las opciones B<--"
-"recursive> o B<-R>, I<fichero_paquete> debe referirse a un directorio."
+"Estas variables contienen cada una el carácter cuyo nombre especifican en "
+"inglés. Nota del traductor: Newline = Terminación de línea, Space = Espacio, "
+"Tab = Tabulador."
 
 # type: TP
-#: dpkg.1:129
+#: deb-substvars.5:107
 #, fuzzy, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<paquete> ... | B<-a> | B<--pending>"
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr "B<shlibs:>I<campodedependencia>"
 
 # type: Plain text
-#: dpkg.1:134
+#: deb-substvars.5:111
 #, fuzzy
 msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"Vuelve a configurar un paquete que, al menos, esté desempaquetado. Si se dan "
-"las opciones B<-a> o B<--pending> en vez de I<paquete>, se configuran todos "
-"los paquetes no configurados."
+"Las variables con nombres de esta forma son generadas por B<dpkg-shlibdeps> "
+"- vea más arriba."
+
+# type: TP
+#: deb-substvars.5:111
+#, fuzzy, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg:UpstreamVersion>"
 
 # type: Plain text
-#: dpkg.1:136
+#: deb-substvars.5:114
 #, fuzzy
-msgid "Configuring consists of the following steps:"
-msgstr "La configuración consiste en los siguientes pasos:"
+msgid "The upstream version of dpkg."
+msgstr "La versión de desarrollador principal de dpkg."
+
+# type: TP
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg:Version>"
 
 # type: Plain text
-#: dpkg.1:141
+#: deb-substvars.5:117
 #, fuzzy
-msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
-msgstr ""
-"B<1.> Se desempaquetan los ficheros de configuración, y al mismo tiempo se "
-"hace una copia de seguridad de los antiguos, para que puedan restaurarse si "
-"algo va mal."
+msgid "The full version of dpkg."
+msgstr "La versión completa de dpkg."
 
 # type: Plain text
-#: dpkg.1:144
+#: deb-substvars.5:120
 #, fuzzy
-msgid "B<2.> Run I<postinst> script, if provided by the package."
-msgstr "B<2.> Se ejecuta el programa I<postinst>, si el paquete lo tiene."
+msgid ""
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
+msgstr ""
+"Si se hace referencia a una variable que no existe, se genera un aviso y se "
+"asume un valor vacío."
 
 # type: TP
-#: dpkg.1:144
+#: deb-substvars.5:122
 #, fuzzy, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paquete> ... | B<-a> | B<--pending>"
+msgid "B<debian/substvars>"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:155
+#: deb-substvars.5:125
 #, fuzzy
-msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
-msgstr ""
-"Borra un paquete instalado. Las opciones B<-r> y B<--remove> lo borran todo "
-"excepto los ficheros de configuración. Esto podría evitar tener que "
-"configurar de nuevo el paquete si se reinstala después (los ficheros de "
-"configuración son los listados en el fichero de control I<debian/"
-"conffiles>). Si se usan las opciones B<-a> y B<--pending> en vez de un "
-"paquete, todos los que están al menos desempaquetados, pero marcados para "
-"borrar o purgar en I</var/lib/dpkg/status>, se borran o purgan "
-"respectivamente."
+msgid "List of substitution variables and values."
+msgstr "Lista de variables de sustitución y sus valores."
 
 # type: Plain text
-#: dpkg.1:157
+#: deb-substvars.5:129 dpkg-source.1:267
 #, fuzzy
-msgid "Removing of a package consists of the following steps:"
-msgstr "Borrar un paquete consiste de los siguientes pasos:"
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
+msgstr ""
+"El punto en el cual se produce la sustitución de campos, comparado con "
+"ciertos parámetros de los campos de salida estándar, no está claro."
 
 # type: Plain text
-#: dpkg.1:160
+#: deb-substvars.5:136
 #, fuzzy
-msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> Ejecutar el programa I<prerm>."
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
 
 # type: Plain text
-#: dpkg.1:163
+#: deb-substvars.5:139
 #, fuzzy
-msgid "B<2.> Remove the installed files"
-msgstr "B<2.> Borrar los ficheros instalados."
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr ""
+"Las herramientas y esta página del manual fueron escritas por Ian Jackson."
+
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
+#, fuzzy, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
 
 # type: Plain text
-#: dpkg.1:166
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
 #, fuzzy
-msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> Ejecutar el programa I<postrm>."
-
-# type: TP
-#: dpkg.1:167
-#, fuzzy, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr "B<dpkg --update-avail> | B<--merge-avail> I<fichero-Packages>"
+msgid "Copyright (C) 1995-1996 Ian Jackson"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: dpkg.1:176
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
 #, fuzzy
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
-msgstr ""
-"Actualiza la lista de paquetes disponibles de dpkg y dselect.  Con la acción "
-"B<--merge-avail>, la información antigua se combina con la información de "
-"I<fichero-Packages>. El I<fichero-Packages> que viene con Debian GNU/Linux "
-"se llama simplemente I<Packages>. El programa B<dpkg> guarda la lista de "
-"paquetes disponibles en I</var/lib/dpkg/available>."
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: Plain text
-#: dpkg.1:179
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
 #, fuzzy
 msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Una orden más simple que permite obtener y actualizar el fichero "
-"I<available> de una tirada es B<dselect update>."
+"Esto es software libre; vea la versión 2 o posterior de la Licencia Pública "
+"General GNU para condiciones de copia.  NO hay ninguna garantía."
 
-# type: TP
-#: dpkg.1:179
-#, fuzzy, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<fichero_paquete> ..."
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "dpkg"
+msgstr ""
 
-# type: Plain text
-#: dpkg.1:185
-#, fuzzy
-msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
 msgstr ""
-"Actualiza la idea que tienen B<dpkg> y B<dselect> de qué paquetes están "
-"disponibles, con información del paquete I<fichero_paquete>. Si se usa B<--"
-"recursive> o B<-R>, I<fichero_paquete> debe ser un directorio."
 
-# type: TP
-#: dpkg.1:185
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, fuzzy, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
-msgstr "B<dpkg --forget-old-unavail>"
+msgid "dpkg suite"
+msgstr "herramientas dpkg"
 
 # type: Plain text
-#: dpkg.1:188
+#: dpkg.1:4
 #, fuzzy
-msgid "Forget about uninstalled unavailable packages."
-msgstr "Olvida los paquetes no instalados ni disponibles."
-
-# type: TP
-#: dpkg.1:188
-#, fuzzy, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr "B<dpkg --clear-avail>"
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - Gestor de paquetes Debian de medio nivel"
 
 # type: Plain text
-#: dpkg.1:191
+#: dpkg.1:8
 #, fuzzy
-msgid "Erase the existing information about what packages are available."
-msgstr "Borra la información sobre los paquetes disponibles."
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
-# type: TP
-#: dpkg.1:191
+# type: SH
+#: dpkg.1:9
 #, fuzzy, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+msgid "WARNING"
+msgstr "AVISO"
 
 # type: Plain text
-#: dpkg.1:196
+#: dpkg.1:13
 #, fuzzy
 msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
-"Busca paquetes que se hayan instalado sólo parcialmente. El programa B<dpkg> "
-"sugerirá qué hacer con ellos para hacerlos funcionar."
-
-# type: TP
-#: dpkg.1:196
-#, fuzzy, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<patrón>...]"
+"El propósito de este manual es que los usuarios entiendan las opciones de "
+"llamada de B<dpkg> y los estados en los que puede estar un paquete con algo "
+"más de precisión que la dada por B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:200
+#: dpkg.1:18
 #, fuzzy
 msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
-msgstr "Muestra la lista de selecciones de paquetes en la salida estándar."
-
-# type: TP
-#: dpkg.1:200
-#, fuzzy, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr "B<dpkg --set-selections>"
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
+msgstr ""
+"I<No> deberían usarlo los encargados de paquetes para comprender el proceso "
+"de instalación. Las descripciones de lo que hace este programa al instalar y "
+"desinstalar simplemente no son apropiadas."
 
 # type: Plain text
-#: dpkg.1:206
+#: dpkg.1:26
 #, fuzzy
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
 msgstr ""
-"Establece las selecciones a unas determinadas, leyendo de la entrada "
-"estándar."
-
-# type: TP
-#: dpkg.1:206
-#, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr "B<dpkg --set-selections>"
+"B<dpkg> es una herramienta de nivel medio para instalar, construir, borrar y "
+"gestionar los paquetes de Debian GNU/Linux. Se llama con parámetros desde "
+"línea de órdenes, especificando una acción y cero o más opciones. La acción "
+"dice a B<dpkg> qué hacer y las opciones controlan de alguna manera su "
+"comportamiento."
 
 # type: Plain text
-#: dpkg.1:211
+#: dpkg.1:31
+#, fuzzy
 msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
+"También se puede usar B<dkpg> como interfaz a B<dpkg-deb>. Si aquél se "
+"encuentra alguna de las opciones de éste, se limita a llamarlo con esas "
+"mismas opciones. La lista de opciones de B<dpkg-deb> es:"
 
-# type: TP
-#: dpkg.1:211
+# type: Plain text
+#: dpkg.1:40
 #, fuzzy, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr "B<dpkg --yet-to-unpack>"
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
+msgstr ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:215
+#: dpkg.1:42
 #, fuzzy
-msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
-msgstr ""
-"Busca los paquetes seleccionados para instalar, pero que por alguna razón "
-"todavía no se han instalado."
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr "Lea B<dpkg-deb>(1) si desea más información sobre estas acciones."
 
-# type: TP
-#: dpkg.1:216
+# type: SH
+#: dpkg.1:43
 #, fuzzy, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "INFORMACIÓN SOBRE PAQUETES"
 
 # type: Plain text
-#: dpkg.1:219
+#: dpkg.1:48
 #, fuzzy
 msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"Imprime la arquitectura de destino (por ejemplo, «i386»). Esta opción usa a "
-"B<gcc>."
+"Hay bastante información útil sobre los paquetes disponibles accesible a "
+"través de B<dpkg>. Esta información se divide en tres clases: B<estados>, "
+"B<estados de selección> e B<indicadores>. Teóricamente, estos valores se "
+"cambiarán principalmente con B<dselect>."
+
+# type: SS
+#: dpkg.1:48
+#, fuzzy, no-wrap
+msgid "PACKAGE STATES"
+msgstr "ESTADOS DE LOS PAQUETES"
 
 # type: TP
-#: dpkg.1:219
+#: dpkg.1:49
 #, fuzzy, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
-msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<installed>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:230
+#: dpkg.1:52
 #, fuzzy
-msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
-msgstr ""
-"Compara números de versión, donde I<op> es un operador binario. Devuelve "
-"éxito (cero) si la condición especificada se cumple, y fallo (resultado "
-"distinto de cero) si no. Hay dos grupos de operadores, que difieren en cómo "
-"se comportan cuando les falta alguno de los operandos. Los primeros tratan "
-"la falta de versión como la versión más antigua posible: B<lt le eq ne ge "
-"gt>.  Los otros tratan la falta de versión como la más moderna posible: B<lt-"
-"nl le-nl ge-nl gt-nl>. Éstos se dan sólo por compatibilidad con la sintaxis "
-"del fichero de control: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+msgid "The package is unpacked and configured OK."
+msgstr "Bien desempaquetado y configurado."
 
 # type: TP
-#: dpkg.1:230
+#: dpkg.1:52
 #, fuzzy, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "B<half-installed>"
+msgstr "B<half-installed>"
 
 # type: Plain text
-#: dpkg.1:235
+#: dpkg.1:56
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
+"The installation of the package has been started, but not completed for some "
+"reason."
 msgstr ""
-"Acepta una serie de órdenes en el fichero cuyo descriptor es "
-"B<E<lt>nE<gt>>.  Aviso: las opciones adicionales pasadas desde la línea de "
-"órdenes y mediante este descriptor de fichero no se desactivan en las "
-"subsiguientes llamadas efectuadas en la misma ejecución."
+"Se inició la instalación del paquete, pero no se completó por alguna razón."
 
 # type: TP
-#: dpkg.1:235
+#: dpkg.1:56
 #, fuzzy, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
+msgid "B<not-installed>"
+msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:238
+#: dpkg.1:59
 #, fuzzy
-msgid "Display a brief help message."
-msgstr "Muestra las instrucciones de uso."
+msgid "The package is not installed on your system."
+msgstr "No está instalado en el sistema."
 
 # type: TP
-#: dpkg.1:238
+#: dpkg.1:59
 #, fuzzy, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr "B<dpkg --force-help>"
+msgid "B<unpacked>"
+msgstr "B<unpacked>"
 
 # type: Plain text
-#: dpkg.1:241
+#: dpkg.1:62
 #, fuzzy
-msgid "Give help about the B<--force->I<thing> options."
-msgstr "Muestra la ayuda de las opciones B<--force->I<algo>."
+msgid "The package is unpacked, but not configured."
+msgstr "Descomprimido, pero no configurado."
 
 # type: TP
-#: dpkg.1:241
+#: dpkg.1:62
 #, fuzzy, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<half-configured>"
+msgstr "B<half-configured>"
 
 # type: Plain text
-#: dpkg.1:244
+#: dpkg.1:66
 #, fuzzy
-msgid "Give help about debugging options."
-msgstr "Muestra la ayuda de las opciones de depuración."
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
+msgstr ""
+"El paquete está descomprimido y la configuración se inició, pero no se "
+"terminó por alguna razón."
 
 # type: TP
-#: dpkg.1:244
+#: dpkg.1:66
 #, fuzzy, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<config-files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg.1:247
+#: dpkg.1:69
 #, fuzzy
-msgid "Display B<dpkg> licence."
-msgstr "Muestra la licencia e información sobre derechos de autor de B<dpkg>."
+msgid "Only the configuration files of the package exist on the system."
+msgstr "Sólo quedan los ficheros de configuración del paquete en el sistema."
+
+# type: SS
+#: dpkg.1:69
+#, fuzzy, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "ESTADOS DE SELECCIÓN DE LOS PAQUETES"
 
 # type: TP
-#: dpkg.1:247
+#: dpkg.1:70
 #, fuzzy, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
+msgid "B<install>"
+msgstr "B<install>"
 
 # type: Plain text
-#: dpkg.1:250
+#: dpkg.1:73
 #, fuzzy
-msgid "Display B<dpkg> version information."
-msgstr "Muestra la versión de B<dpkg>."
+msgid "The package is selected for installation."
+msgstr "El paquete se ha seleccionado para instalarse."
 
 # type: TP
-#: dpkg.1:250
+#: dpkg.1:73
 #, fuzzy, no-wrap
-msgid "B<dpkg-deb actions>"
-msgstr "B<dpkg-deb-actions>"
+msgid "B<deinstall>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:253
+#: dpkg.1:77
 #, fuzzy
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
-msgstr "Ver B<dpkg-dev>(1) para más información sobre las siguientes acciones."
-
-# type: Plain text
-#: dpkg.1:273
-#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
-"B<dpkg -b> | B<--build> I<directorio> [I<fichero>]\n"
-"    Construye un paquete Debian GNU/Linux.\n"
-"B<dpkg -c> | B<--contents> I<fichero>\n"
-"    Muestra el contenidos de un paquete Debian GNU/Linux.\n"
-"B<dpkg -e> | B<--control> I<fichero> [I<directorio>]\n"
-"    Extrae la información de control de un paquete.\n"
-"B<dpkg -x> | B<--extract> I<fichero directorio>\n"
-"    Extrae los ficheros contenidos en el paquete.\n"
-"B<dpkg -f> | B<--field>  I<fichero> [I<campo-control>] ...\n"
-"    Muestra el/los campo(s) de control de un paquete.\n"
-"B<dpkg --fsys-tarfile> I<fichero>\n"
-"    Muestra el fichero tar contenido en el paquete Debian.\n"
-"B<dpkg -I> | B<--info> I<fichero> [I<fichero-control>]\n"
-"    Muestra información sobre el paquete.\n"
-"B<dpkg -X> | B<--vextract> I<fichero> I<directorio>\n"
-"    Extrae y muestra los nombres de ficheros contenidos en un paquete.\n"
+"El paquete se ha seleccionado para desinstalarse (es decir, que queremos "
+"borrarlo todo excepto los ficheros de configuración)."
 
 # type: TP
-#: dpkg.1:275
+#: dpkg.1:77
 #, fuzzy, no-wrap
-msgid "B<dpkg-query actions>"
-msgstr "B<dpkg-query-actions>"
+msgid "B<purge>"
+msgstr "B<purge>"
 
 # type: Plain text
-#: dpkg.1:278
+#: dpkg.1:81
 #, fuzzy
-msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
-"Vea B<dpkg-query>(1) para más información sobre las siguientes acciones:"
+"El paquete se ha seleccionado para purgarse (es decir, que queremos borrarlo "
+"todo, incluso los ficheros de configuración)."
 
-# type: Plain text
-#: dpkg.1:291
+# type: SS
+#: dpkg.1:81
 #, fuzzy, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
-msgstr ""
-"B<dpkg -l> | B<--list> I<patrón-nombre-paquete> ...\n"
-"    Lista los paquetes cuyo nombre encaja en el patrón dado.\n"
-"B<dpkg -s> | B<--status> I<nombre-paquete> ...\n"
-"    Informa del estado del paquete especificado.\n"
-"B<dpkg -L> | B<--listfiles> I<paquete> ...\n"
-"    Lista los ficheros instalados en el sistema, que pertenecen a B<paquete>.\n"
-"B<dpkg -S> | B<--search> I<patrón-búsqueda-ficheros> ...\n"
-"    Busca un fichero en los paquetes instalados.\n"
-"B<dpkg -p> | B<--print-avail> I<paquete> ...\n"
-"    Imprime información sobre el I<paquete>, sacada de I</var/lib/dpkg/available>.\n"
-
-# type: Plain text
-#: dpkg.1:298
-#, fuzzy
-msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
-msgstr ""
-"Todas las opciones pueden especificarse tanto en línea de órdenes como en el "
-"fichero de configuración de B<dpkg>, I</etc/dpkg/dpkg.cfg>. Cada línea de "
-"este fichero es bien una opción (exactamente la misma que la de línea de "
-"órdenes, pero sin los guiones al principio) o bien un comentario (si empieza "
-"con B<#>)."
+msgid "PACKAGE FLAGS"
+msgstr "INDICADORES DE LOS PAQUETES"
 
 # type: TP
-#: dpkg.1:299
+#: dpkg.1:82
 #, fuzzy, no-wrap
-msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<número>"
+msgid "B<hold>"
+msgstr "B<hold>"
 
 # type: Plain text
-#: dpkg.1:302
+#: dpkg.1:86
 #, fuzzy
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
-"Cambiar después de cuántos errores abortará B<dpkg>. El valor por omisión es "
-"50."
+"Un paquete marcado como B<hold> no es modificado por B<dpkg>, a no ser que "
+"lo forcemos a hacerlo con la opción B<--force-hold>."
 
 # type: TP
-#: dpkg.1:302
+#: dpkg.1:86
 #, fuzzy, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr "B<-B>|B<--auto-deconfigure>"
+msgid "B<reinst-required>"
+msgstr "B<reinst-required>"
 
 # type: Plain text
-#: dpkg.1:308
+#: dpkg.1:91
 #, fuzzy
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
-"Cuando se borra un paquete, hay posibilidades de que otro dependa de él.  "
-"Especificar esta opción producirá la desconfiguración automática del paquete "
-"que dependía del borrado."
+"Un paquete marcado como B<necesita-reinst> está roto y necesita "
+"reinstalarse. Estos paquetes no pueden borrarse, a no ser que se fuerce la "
+"acción con la opción B<--force-remove-reinstreq>."
+
+# type: SH
+#: dpkg.1:92
+#, fuzzy, no-wrap
+msgid "ACTIONS"
+msgstr "ACCIONES"
 
 # type: TP
-#: dpkg.1:308
+#: dpkg.1:93
 #, fuzzy, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
 
 # type: Plain text
-#: dpkg.1:314
+#: dpkg.1:97
 #, fuzzy
 msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
-"Activar el modo de depuración. El parámetro I<octal> se forma uniendo los "
-"valores de la siguiente lista mediante la operación I<or> a nivel de bits "
-"(tenga en cuenta que estos valores podrían cambiar en futuras versiones).  "
-"B<-Dh> o B<--debug=help> muestran estos valores."
+"Instala el paquete. Si se especifica la opción B<--recursive> o B<-R>, "
+"I<fichero_paquete> debe ser un directorio."
 
 # type: Plain text
-#: dpkg.1:326
-#, fuzzy, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
-msgstr ""
-" número  descripción\n"
-"    1   Información de progreso generalmente útil\n"
-"    2   Invocación y estado de los scripts del paquete\n"
-"   10   Salida por cada fichero procesado\n"
-"  100   Mucha salida por cada fichero procesado\n"
-"   20   Salida por cada conffile\n"
-"  200   Mucha salida por cada conffile\n"
-"   40   Dependencias y conflictos\n"
-"  400   Mucha salida sobre dependencias y conflictos\n"
-" 1000   Parrafadas sobre el directorio dpkg/info\n"
-" 2000   Montañas de parrafadas (perjudica la salud)\n"
-
-# type: TP
-#: dpkg.1:326
-#, fuzzy, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-msgstr "B<--force->I<cosas> | B<--no-force->I<cosas> | B<--refuse->I<cosas>"
+#: dpkg.1:99
+#, fuzzy
+msgid "Installation consists of the following steps:"
+msgstr "La instalación consiste en los siguientes pasos:"
 
 # type: Plain text
-#: dpkg.1:333
+#: dpkg.1:102
 #, fuzzy
-msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
-msgstr ""
-"Fuerza o rehusa (B<no-force> y B<refuse> significan lo mismo) a hacer "
-"ciertas cosas. El parámetro I<cosas> es una lista de cosas especificadas "
-"abajo, separada por comas. La opción B<--force-help> muestra un mensaje que "
-"las describe. Las cosas marcadas con (*) se fuerzan por omisión."
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Se extraen los ficheros de control del paquete."
 
 # type: Plain text
-#: dpkg.1:337
+#: dpkg.1:106
 #, fuzzy
 msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
-"I<Aviso: Estas opciones están pensadas mayormente para que las usen "
-"expertos.  Usarlas sin total conocimiento de sus efectos podrían hacer que "
-"su sistema dejara de funcionar.>"
+"B<2.> Si hay instalada otra versión del mismo paquete, se ejecuta el "
+"programa I<prerm> del antiguo paquete."
 
 # type: Plain text
-#: dpkg.1:340
+#: dpkg.1:109
 #, fuzzy
-msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: Activa (o desactiva) todas las opciones de forzar."
+msgid "B<3.> Run I<preinst> script, if provided by the package."
+msgstr "B<3.> Se ejecuta el programa I<preinst>, si el paquete lo tiene."
 
 # type: Plain text
-#: dpkg.1:343
+#: dpkg.1:113
 #, fuzzy
 msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
-"B<downgrade>(*): Instala un paquete, incluso si hay una versión más nueva ya "
-"instalada."
+"B<4.> Se desempaquetan los nuevos ficheros, y al mismo tiempo se hace una "
+"copia de seguridad de los antiguos, para que, si algo va mal, se puedan "
+"restaurar."
 
 # type: Plain text
-#: dpkg.1:350
+#: dpkg.1:120
 #, fuzzy
 msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
-"I<Aviso: actualmente dpkg no comprueba de ninguna manera las dependencias al "
-"desactualizar y por lo tanto no avisará si se rompe alguna dependencia de "
-"otro paquete. Una situación así podría tener efectos laterales graves; "
-"desactualizar componentes esenciales del sistema incluso podría inutilizar "
-"su sistema completo. Úselo con cuidado.>"
+"B<5.> Si había instalada otra versión del mismo paquete, se ejecuta el "
+"I<postrm> del paquete antiguo. Tenga en cuenta que este programa se ejecuta "
+"después del I<preinst> del nuevo paquete, ya que los nuevos ficheros se "
+"escriben a la vez que se borran los antiguos."
 
 # type: Plain text
-#: dpkg.1:354
+#: dpkg.1:124
 #, fuzzy
 msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
-"B<configure-any>: Configura también todo lo desempaquetado y no configurado "
-"sobre lo que depende el paquete."
+"B<6.> Se configura el paquete. Si quiere información detallada sobre el "
+"proceso, vea B<--configure>."
 
-# type: Plain text
-#: dpkg.1:357
-#, fuzzy
-msgid "B<hold>: Process packages even when marked \"hold\"."
-msgstr ""
-"B<hold>: Procesa los paquetes incluso si están marcados como "
-"«hold» (mantener)."
+# type: TP
+#: dpkg.1:124
+#, fuzzy, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<fichero_paquete> ..."
 
 # type: Plain text
-#: dpkg.1:362
+#: dpkg.1:129
 #, fuzzy
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<remove-reinstreq>: Borra un paquete, incluso si está roto y marcado como "
-"de reinstalación requerida. Esto podría causar, por ejemplo, que algunas "
-"partes del paquete quedaran en el sistema, pero B<dpkg> se olvidara de ellas."
+"Desempaqueta el fichero, pero no lo configura. Si se dan las opciones B<--"
+"recursive> o B<-R>, I<fichero_paquete> debe referirse a un directorio."
+
+# type: TP
+#: dpkg.1:129
+#, fuzzy, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<paquete> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:134
 #, fuzzy
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
-"B<remove-essential>: Borra, incluso si el paquete se considera esencial. Los "
-"paquetes esenciales contienen sobre todo órdenes de Unix muy básicas. "
-"Borrarlos podría hacer que el sistema dejara de funcionar en absoluto, así "
-"que use esta opción con cuidado."
+"Vuelve a configurar un paquete que, al menos, esté desempaquetado. Si se dan "
+"las opciones B<-a> o B<--pending> en vez de I<paquete>, se configuran todos "
+"los paquetes no configurados."
 
 # type: Plain text
-#: dpkg.1:370
+#: dpkg.1:136
 #, fuzzy
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Convierte todos los problemas de dependencias en avisos."
+msgid "Configuring consists of the following steps:"
+msgstr "La configuración consiste en los siguientes pasos:"
 
 # type: Plain text
-#: dpkg.1:373
+#: dpkg.1:141
 #, fuzzy
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
-"B<depends-version>: No tiene en cuenta las versiones al comprobar "
-"dependencias."
+"B<1.> Se desempaquetan los ficheros de configuración, y al mismo tiempo se "
+"hace una copia de seguridad de los antiguos, para que puedan restaurarse si "
+"algo va mal."
 
 # type: Plain text
-#: dpkg.1:377
+#: dpkg.1:144
 #, fuzzy
-msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
-msgstr ""
-"B<conflicts>: Instala, incluso si está en conflicto con otro paquete. Esta "
-"opción es peligrosa, dado que generalmente sobreescribirá algunos ficheros."
+msgid "B<2.> Run I<postinst> script, if provided by the package."
+msgstr "B<2.> Se ejecuta el programa I<postinst>, si el paquete lo tiene."
 
-# type: Plain text
-#: dpkg.1:382
-#, fuzzy
-msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
-msgstr ""
-"B<confmiss>: Siempre instala un fichero de configuración perdido. Es "
-"peligroso porque no guarda los cambios (el borrado) hechos al fichero."
+# type: TP
+#: dpkg.1:144
+#, fuzzy, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paquete> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:387
+#: dpkg.1:155
 #, fuzzy
 msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
-"B<confnew>: Si se ha modificado un fichero de configuración, instalar "
-"siempre la nueva versión sin preguntar, a menos que se especifique también "
-"la opción --force-confdef, en cuyo caso se toma la acción por omisión."
+"Borra un paquete instalado. Las opciones B<-r> y B<--remove> lo borran todo "
+"excepto los ficheros de configuración. Esto podría evitar tener que "
+"configurar de nuevo el paquete si se reinstala después (los ficheros de "
+"configuración son los listados en el fichero de control I<debian/"
+"conffiles>). Si se usan las opciones B<-a> y B<--pending> en vez de un "
+"paquete, todos los que están al menos desempaquetados, pero marcados para "
+"borrar o purgar en I</var/lib/dpkg/status>, se borran o purgan "
+"respectivamente."
 
 # type: Plain text
-#: dpkg.1:392
+#: dpkg.1:157
 #, fuzzy
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
-msgstr ""
-"B<confold>: Si se ha modificado un fichero de configuración, mantener "
-"siempre la versión existente sin preguntar, a menos que también se "
-"especifique la opción --force-confdef, en cuyo caso se toma la acción por "
-"omisión."
+msgid "Removing of a package consists of the following steps:"
+msgstr "Borrar un paquete consiste de los siguientes pasos:"
 
 # type: Plain text
-#: dpkg.1:398
+#: dpkg.1:160
 #, fuzzy
-msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
-msgstr ""
-"B<confdef>: Si se ha modificado un fichero de configuración, elegir siempre "
-"la opción por omisión. Si no la hay, parará y preguntará al usuario a no ser "
-"que se usen también las opciones B<--force-confnew> o B<--force-confold>, en "
-"cuyo caso se usará esta opción para tomar la decisión final."
+msgid "B<1.> Run I<prerm> script"
+msgstr "B<1.> Ejecutar el programa I<prerm>."
 
 # type: Plain text
-#: dpkg.1:401
+#: dpkg.1:163
 #, fuzzy
-msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr "B<overwrite>: Sobreescribe un fichero de un paquete con otro fichero."
+msgid "B<2.> Remove the installed files"
+msgstr "B<2.> Borrar los ficheros instalados."
 
 # type: Plain text
-#: dpkg.1:404
+#: dpkg.1:166
 #, fuzzy
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
-msgstr ""
-"B<overwrite-dir>: Sobreescribe un directorio de un paquete con otro fichero."
+msgid "B<3.> Run I<postrm> script"
+msgstr "B<3.> Ejecutar el programa I<postrm>."
+
+# type: TP
+#: dpkg.1:167
+#, fuzzy, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg --update-avail> | B<--merge-avail> I<fichero-Packages>"
 
 # type: Plain text
-#: dpkg.1:407
+#: dpkg.1:176
 #, fuzzy
 msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"B<overwrite-diverted>: Sobreescribe una versión desviada de un fichero con "
-"una no desviada."
+"Actualiza la lista de paquetes disponibles de dpkg y dselect.  Con la acción "
+"B<--merge-avail>, la información antigua se combina con la información de "
+"I<fichero-Packages>. El I<fichero-Packages> que viene con Debian GNU/Linux "
+"se llama simplemente I<Packages>. El programa B<dpkg> guarda la lista de "
+"paquetes disponibles en I</var/lib/dpkg/available>."
 
 # type: Plain text
-#: dpkg.1:410
+#: dpkg.1:179
 #, fuzzy
-msgid "B<architecture>: Process even packages with the wrong architecture."
+msgid ""
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
-"B<architecture>: Procesar incluso si los paquetes no son de la arquitectura "
-"adecuada."
+"Una orden más simple que permite obtener y actualizar el fichero "
+"I<available> de una tirada es B<dselect update>."
+
+# type: TP
+#: dpkg.1:179
+#, fuzzy, no-wrap
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgstr "B<dpkg -A> | B<--record-avail> I<fichero_paquete> ..."
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:185
 #, fuzzy
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<bad-path>: B<PATH> no contiene algunos programas importantes, así que es "
-"bastante posible que haya problemas."
+"Actualiza la idea que tienen B<dpkg> y B<dselect> de qué paquetes están "
+"disponibles, con información del paquete I<fichero_paquete>. Si se usa B<--"
+"recursive> o B<-R>, I<fichero_paquete> debe ser un directorio."
+
+# type: TP
+#: dpkg.1:185
+#, fuzzy, no-wrap
+msgid "B<dpkg --forget-old-unavail>"
+msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
-#: dpkg.1:416
+#: dpkg.1:188
 #, fuzzy
-msgid "B<not-root>: Try to (de)install things even when not root."
-msgstr "B<not-root>: Intentar la (des)instalación incluso si no se es root."
+msgid "Forget about uninstalled unavailable packages."
+msgstr "Olvida los paquetes no instalados ni disponibles."
+
+# type: TP
+#: dpkg.1:188
+#, fuzzy, no-wrap
+msgid "B<dpkg --clear-avail>"
+msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
-#: dpkg.1:419
+#: dpkg.1:191
 #, fuzzy
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
-msgstr ""
-"B<bad-verify>: Instala un paquete incluso si falla la comprobación de "
-"autenticidad."
+msgid "Erase the existing information about what packages are available."
+msgstr "Borra la información sobre los paquetes disponibles."
 
 # type: TP
-#: dpkg.1:420
+#: dpkg.1:191
 #, fuzzy, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
-msgstr "B<--ignore-depends>=I<paquete>,..."
+msgid "B<dpkg -C> | B<--audit>"
+msgstr "B<dpkg -C> | B<--audit>"
 
 # type: Plain text
-#: dpkg.1:424
+#: dpkg.1:196
 #, fuzzy
 msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
-"Ignora la comprobación de dependencias para los paquetes especificados "
-"(realmente, se hacen las comprobaciones, pero se imprimen avisos en vez de "
-"abortar el proceso)."
+"Busca paquetes que se hayan instalado sólo parcialmente. El programa B<dpkg> "
+"sugerirá qué hacer con ellos para hacerlos funcionar."
 
 # type: TP
-#: dpkg.1:424
+#: dpkg.1:196
 #, fuzzy, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
-#: dpkg.1:428
+#: dpkg.1:200
 #, fuzzy
 msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"elige el formato de paquetes nuevo o antiguo. Es una opción de B<dpkg-deb>"
-"(1)."
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
+msgstr "Muestra la lista de selecciones de paquetes en la salida estándar."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:200
 #, fuzzy, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg --set-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:206
 #, fuzzy
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
 msgstr ""
-"No lee ni comprueba el contenido del fichero de control mientras se "
-"construye el paquete. Es una opción de B<dpkg-deb>(1)."
+"Establece las selecciones a unas determinadas, leyendo de la entrada "
+"estándar."
 
 # type: TP
-#: dpkg.1:432
+#: dpkg.1:206
 #, fuzzy, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<dpkg --clear-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:437
-#, fuzzy
+#: dpkg.1:211
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
-"Hace todo lo que se supone que debe hacer, pero no realiza ningún cambio. Se "
-"utiliza para ver qué ocurriría con las opciones elegidas sin llegar a "
-"cambiar nada."
+
+# type: TP
+#: dpkg.1:211
+#, fuzzy, no-wrap
+msgid "B<dpkg --yet-to-unpack>"
+msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
-#: dpkg.1:442
+#: dpkg.1:215
 #, fuzzy
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
-"Asegúrese de dar la opción B<--no-act> antes del parámetro de acción, o "
-"podría acabar con resultados no deseados. P.ej.: B<dpkg --purge foo --no-"
-"act> primero purgará el paquete foo y luego intentará purgar el paquete --no-"
-"act, ¡aunque probablemente usted esperara que no hiciera nada!)."
+"Busca los paquetes seleccionados para instalar, pero que por alguna razón "
+"todavía no se han instalado."
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:216
 #, fuzzy, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr "B<-R> | B<--recursive>"
+msgid "B<dpkg --print-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg.1:448
+#: dpkg.1:219
 #, fuzzy
 msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
-"Actúa recursivamente sobre todos los ficheros que coincidan con el patrón "
-"B<*.deb> que se encuentren en el directorio especificado y todos sus "
-"subdirectorios. Puede usarse con las opciones B<-i>, B<-A>, B<--install>, "
-"B<--unpack> y B<--avail>."
+"Imprime la arquitectura de destino (por ejemplo, «i386»). Esta opción usa a "
+"B<gcc>."
 
 # type: TP
-#: dpkg.1:448
+#: dpkg.1:219
 #, fuzzy, no-wrap
-msgid "B<-G>"
-msgstr "B<-G>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
-#: dpkg.1:452
+#: dpkg.1:230
 #, fuzzy
 msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
-"No instala un paquete del que hay ya instalada una versión más nueva. Es lo "
-"mismo que B<--refuse-downgrade>."
+"Compara números de versión, donde I<op> es un operador binario. Devuelve "
+"éxito (cero) si la condición especificada se cumple, y fallo (resultado "
+"distinto de cero) si no. Hay dos grupos de operadores, que difieren en cómo "
+"se comportan cuando les falta alguno de los operandos. Los primeros tratan "
+"la falta de versión como la versión más antigua posible: B<lt le eq ne ge "
+"gt>.  Los otros tratan la falta de versión como la más moderna posible: B<lt-"
+"nl le-nl ge-nl gt-nl>. Éstos se dan sólo por compatibilidad con la sintaxis "
+"del fichero de control: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:230
 #, fuzzy, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg.1:463
+#: dpkg.1:235
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
-"Cambia los directorios por omisión. El valor predeterminado para el "
-"directorio B<admindir> es I</var/lib/dpkg> y contiene muchos ficheros con "
-"información sobre el estado de los paquetes instalados y desinstalados, "
-"etc.  El valor por omisión de B<instdir> es I</> y se refiere al directorio "
-"donde se instalarán los paquetes. También es el directorio pasado a B<chroot>"
-"(2) antes de ejecutar los programas de instalación de I<paquete>, lo que "
-"significa que éstos verán B<instdir> como directorio raíz. Cambiar B<root> "
-"cambia a su vez B<instdir> a I<dir> y B<admindir> a I<dir>B</var/lib/dpkg>."
+"Acepta una serie de órdenes en el fichero cuyo descriptor es "
+"B<E<lt>nE<gt>>.  Aviso: las opciones adicionales pasadas desde la línea de "
+"órdenes y mediante este descriptor de fichero no se desactivan en las "
+"subsiguientes llamadas efectuadas en la misma ejecución."
 
 # type: TP
-#: dpkg.1:463
+#: dpkg.1:235
 #, fuzzy, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+msgid "B<dpkg --help>"
+msgstr "B<dpkg --help>"
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:238
 #, fuzzy
-msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
-msgstr ""
-"Procesa sólo los paquetes que se han elegido para la instalación. La marca "
-"en sí la hacen B<dselect> o B<dpkg>, cuando se usa para gestionar paquetes. "
-"Por ejemplo, si se borra uno, se marcará como elegido para desinstalar."
+msgid "Display a brief help message."
+msgstr "Muestra las instrucciones de uso."
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:238
 #, fuzzy, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --force-help>"
+msgstr "B<dpkg --force-help>"
 
 # type: Plain text
-#: dpkg.1:473
+#: dpkg.1:241
 #, fuzzy
-msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
-msgstr ""
-"Evita la instalación de un paquete si es la misma versión que ya hay "
-"instalada."
+msgid "Give help about the B<--force->I<thing> options."
+msgstr "Muestra la ayuda de las opciones B<--force->I<algo>."
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:241
 #, fuzzy, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg -Dh >|B< --debug=help>"
+msgstr "B<dpkg -Dh >|B< --debug=help>"
 
 # type: Plain text
-#: dpkg.1:480
+#: dpkg.1:244
 #, fuzzy
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-"Envía el estado del paquete al descriptor de fichero I<E<lt>nE<gt>>. Puede "
-"usarse varias veces. Las actualizaciones de estado tienen la forma «status: "
-"E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>»."
+msgid "Give help about debugging options."
+msgstr "Muestra la ayuda de las opciones de depuración."
 
 # type: TP
-#: dpkg.1:480
+#: dpkg.1:244
 #, fuzzy, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--log=>I<filename>"
-
-# type: Plain text
-#: dpkg.1:492
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
-msgstr ""
-
-# type: TP
-#: dpkg.1:492
-#, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--no-debsig>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
-msgstr ""
+#: dpkg.1:247
+#, fuzzy
+msgid "Display B<dpkg> licence."
+msgstr "Muestra la licencia e información sobre derechos de autor de B<dpkg>."
 
 # type: TP
-#: dpkg.1:497 dpkg.cfg.5:14
-#, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+#: dpkg.1:247
+#, fuzzy, no-wrap
+msgid "B<dpkg --version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:500
+#: dpkg.1:250
 #, fuzzy
-msgid "Configuration file with default options."
-msgstr "Fichero de configuración con las opciones por omisión."
+msgid "Display B<dpkg> version information."
+msgstr "Muestra la versión de B<dpkg>."
 
 # type: TP
-#: dpkg.1:500
-#, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</var/log/dpkg.log>"
+#: dpkg.1:250
+#, fuzzy, no-wrap
+msgid "B<dpkg-deb actions>"
+msgstr "B<dpkg-deb-actions>"
 
 # type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
-msgstr ""
+#: dpkg.1:253
+#, fuzzy
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
+msgstr "Ver B<dpkg-dev>(1) para más información sobre las siguientes acciones."
 
 # type: Plain text
-#: dpkg.1:507
-#, fuzzy
+#: dpkg.1:273
+#, fuzzy, no-wrap
 msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
-"Los otros ficheros listados abajo están en sus directorios por omisión. "
-"Véase la opción B<--admindir> para ver cómo cambiar la ruta de estos "
-"ficheros."
+"B<dpkg -b> | B<--build> I<directorio> [I<fichero>]\n"
+"    Construye un paquete Debian GNU/Linux.\n"
+"B<dpkg -c> | B<--contents> I<fichero>\n"
+"    Muestra el contenidos de un paquete Debian GNU/Linux.\n"
+"B<dpkg -e> | B<--control> I<fichero> [I<directorio>]\n"
+"    Extrae la información de control de un paquete.\n"
+"B<dpkg -x> | B<--extract> I<fichero directorio>\n"
+"    Extrae los ficheros contenidos en el paquete.\n"
+"B<dpkg -f> | B<--field>  I<fichero> [I<campo-control>] ...\n"
+"    Muestra el/los campo(s) de control de un paquete.\n"
+"B<dpkg --fsys-tarfile> I<fichero>\n"
+"    Muestra el fichero tar contenido en el paquete Debian.\n"
+"B<dpkg -I> | B<--info> I<fichero> [I<fichero-control>]\n"
+"    Muestra información sobre el paquete.\n"
+"B<dpkg -X> | B<--vextract> I<fichero> I<directorio>\n"
+"    Extrae y muestra los nombres de ficheros contenidos en un paquete.\n"
 
 # type: TP
-#: dpkg.1:507
-#, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr "I</var/lib/dpkg/available>"
+#: dpkg.1:275
+#, fuzzy, no-wrap
+msgid "B<dpkg-query actions>"
+msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg.1:510
+#: dpkg.1:278
 #, fuzzy
-msgid "List of available packages."
-msgstr "Lista de paquetes disponibles."
-
-# type: TP
-#: dpkg.1:510
-#, no-wrap
-msgid "I</var/lib/dpkg/status>"
-msgstr "I</var/lib/dpkg/status>"
+msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgstr ""
+"Vea B<dpkg-query>(1) para más información sobre las siguientes acciones:"
 
 # type: Plain text
-#: dpkg.1:516
-#, fuzzy
+#: dpkg.1:291
+#, fuzzy, no-wrap
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
 msgstr ""
-"Estado de los paquetes disponibles. Este fichero contiene información sobre "
-"si un paquete está marcado para borrar o no, si está instalado o no, etc. "
-"Véase el apartado B<INFORMACIÓN SOBRE PAQUETES> para más información."
+"B<dpkg -l> | B<--list> I<patrón-nombre-paquete> ...\n"
+"    Lista los paquetes cuyo nombre encaja en el patrón dado.\n"
+"B<dpkg -s> | B<--status> I<nombre-paquete> ...\n"
+"    Informa del estado del paquete especificado.\n"
+"B<dpkg -L> | B<--listfiles> I<paquete> ...\n"
+"    Lista los ficheros instalados en el sistema, que pertenecen a B<paquete>.\n"
+"B<dpkg -S> | B<--search> I<patrón-búsqueda-ficheros> ...\n"
+"    Busca un fichero en los paquetes instalados.\n"
+"B<dpkg -p> | B<--print-avail> I<paquete> ...\n"
+"    Imprime información sobre el I<paquete>, sacada de I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: dpkg.1:519
+#: dpkg.1:298
 #, fuzzy
 msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
-"Los siguientes ficheros son componentes de un paquete binario. Véase B<deb>"
-"(5) para más información sobre éstos:"
-
-# type: TP
-#: dpkg.1:519
-#, no-wrap
-msgid "I<control>"
-msgstr "I<control>"
-
-# type: TP
-#: dpkg.1:521
-#, no-wrap
-msgid "I<conffiles>"
-msgstr "I<conffiles>"
-
-# type: TP
-#: dpkg.1:523
-#, no-wrap
-msgid "I<preinst>"
-msgstr "I<preinst>"
-
-# type: TP
-#: dpkg.1:525
-#, no-wrap
-msgid "I<postinst>"
-msgstr "I<postinst>"
-
-# type: TP
-#: dpkg.1:527
-#, no-wrap
-msgid "I<prerm>"
-msgstr "I<prerm>"
+"Todas las opciones pueden especificarse tanto en línea de órdenes como en el "
+"fichero de configuración de B<dpkg>, I</etc/dpkg/dpkg.cfg>. Cada línea de "
+"este fichero es bien una opción (exactamente la misma que la de línea de "
+"órdenes, pero sin los guiones al principio) o bien un comentario (si empieza "
+"con B<#>)."
 
 # type: TP
-#: dpkg.1:529
-#, no-wrap
-msgid "I<postrm>"
-msgstr "I<postrm>"
-
-# type: SH
-#: dpkg.1:532
+#: dpkg.1:299
 #, fuzzy, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr "VARIABLES DE ENTORNO"
-
-# type: TP
-#: dpkg.1:533
-#, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr "B<DPKG_NO_TSTP>"
+msgid "B<--abort-after=>I<number>"
+msgstr "B<--abort-after=>I<número>"
 
 # type: Plain text
-#: dpkg.1:537
+#: dpkg.1:302
 #, fuzzy
-msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
-"Defina esta variable si prefiere que B<dpkg> arranque en un intérprete "
-"diferente en vez de suspenderse a sí mismo cuando vuelve temporalmente al "
-"intérprete de órdenes."
-
-# type: TP
-#: dpkg.1:537
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
-
-# type: Plain text
-#: dpkg.1:540
-#, fuzzy
-msgid "The program B<dpkg> will execute when starting a new shell."
-msgstr "El programa que ejecutará B<dpkg> cuando arranque el nuevo intérprete."
+"Cambiar después de cuántos errores abortará B<dpkg>. El valor por omisión es "
+"50."
 
 # type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:302
 #, fuzzy, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<-B>|B<--auto-deconfigure>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:308
 #, fuzzy
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
 msgstr ""
-"Especifica el número de columnas que puede usar B<dpkg> para mostrar la "
-"información. Por ahora sólo la usa la opción -l."
+"Cuando se borra un paquete, hay posibilidades de que otro dependa de él.  "
+"Especificar esta opción producirá la desconfiguración automática del paquete "
+"que dependía del borrado."
 
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
+# type: TP
+#: dpkg.1:308
 #, fuzzy, no-wrap
-msgid "EXAMPLES"
-msgstr "EJEMPLOS"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: dpkg.1:547
+#: dpkg.1:314
 #, fuzzy
-msgid "To list packages related to the editor B<vi>(1):"
-msgstr "Para listar los paquetes con «vi» en su nombre:"
+msgid ""
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
+msgstr ""
+"Activar el modo de depuración. El parámetro I<octal> se forma uniendo los "
+"valores de la siguiente lista mediante la operación I<or> a nivel de bits "
+"(tenga en cuenta que estos valores podrían cambiar en futuras versiones).  "
+"B<-Dh> o B<--debug=help> muestran estos valores."
 
 # type: Plain text
-#: dpkg.1:549
+#: dpkg.1:326
 #, fuzzy, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr "B< dpkg -l '*vi*'>"
-
-# type: Plain text
-#: dpkg.1:552
-#, fuzzy
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+msgid ""
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
 msgstr ""
-"Para ver las entradas en I</var/lib/dpkg/available> de varios paquetes:"
+" número  descripción\n"
+"    1   Información de progreso generalmente útil\n"
+"    2   Invocación y estado de los scripts del paquete\n"
+"   10   Salida por cada fichero procesado\n"
+"  100   Mucha salida por cada fichero procesado\n"
+"   20   Salida por cada conffile\n"
+"  200   Mucha salida por cada conffile\n"
+"   40   Dependencias y conflictos\n"
+"  400   Mucha salida sobre dependencias y conflictos\n"
+" 1000   Parrafadas sobre el directorio dpkg/info\n"
+" 2000   Montañas de parrafadas (perjudica la salud)\n"
 
-# type: Plain text
-#: dpkg.1:554
+# type: TP
+#: dpkg.1:326
 #, fuzzy, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
-msgstr "B< dpkg --print-avail elvis vim | less>"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgstr "B<--force->I<cosas> | B<--no-force->I<cosas> | B<--refuse->I<cosas>"
 
 # type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
+#: dpkg.1:333
+#, fuzzy
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
+"Fuerza o rehusa (B<no-force> y B<refuse> significan lo mismo) a hacer "
+"ciertas cosas. El parámetro I<cosas> es una lista de cosas especificadas "
+"abajo, separada por comas. La opción B<--force-help> muestra un mensaje que "
+"las describe. Las cosas marcadas con (*) se fuerzan por omisión."
 
 # type: Plain text
-#: dpkg.1:559
-#, fuzzy, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
-msgstr "B< less /var/lib/dpkg/available>"
+#: dpkg.1:337
+#, fuzzy
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Aviso: Estas opciones están pensadas mayormente para que las usen "
+"expertos.  Usarlas sin total conocimiento de sus efectos podrían hacer que "
+"su sistema dejara de funcionar.>"
 
 # type: Plain text
-#: dpkg.1:562
+#: dpkg.1:340
 #, fuzzy
-msgid "To remove an installed elvis package:"
-msgstr "Para borrar un paquete instalado llamado «elvis»:"
+msgid "B<all>: Turns on (or off) all force options."
+msgstr "B<all>: Activa (o desactiva) todas las opciones de forzar."
 
 # type: Plain text
-#: dpkg.1:564
-#, fuzzy, no-wrap
-msgid "     B<dpkg -r elvis>\n"
-msgstr "B< dpkg -r elvis>"
+#: dpkg.1:343
+#, fuzzy
+msgid ""
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
+msgstr ""
+"B<downgrade>(*): Instala un paquete, incluso si hay una versión más nueva ya "
+"instalada."
 
 # type: Plain text
-#: dpkg.1:569
+#: dpkg.1:350
 #, fuzzy
 msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
 msgstr ""
-"Para instalar un paquete, primero hay que encontrarlo en la colección de "
-"paquetes que queramos. El fichero «available» muestra que el paquete «vim» "
-"está en el apartado «editors»:"
+"I<Aviso: actualmente dpkg no comprueba de ninguna manera las dependencias al "
+"desactualizar y por lo tanto no avisará si se rompe alguna dependencia de "
+"otro paquete. Una situación así podría tener efectos laterales graves; "
+"desactualizar componentes esenciales del sistema incluso podría inutilizar "
+"su sistema completo. Úselo con cuidado.>"
 
 # type: Plain text
-#: dpkg.1:572
-#, fuzzy, no-wrap
+#: dpkg.1:354
+#, fuzzy
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
-msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
+msgstr ""
+"B<configure-any>: Configura también todo lo desempaquetado y no configurado "
+"sobre lo que depende el paquete."
 
 # type: Plain text
-#: dpkg.1:575
+#: dpkg.1:357
 #, fuzzy
-msgid "To make a local copy of the package selection states:"
-msgstr "Para hacer una copia local de los estados de la selección de paquetes:"
+msgid "B<hold>: Process packages even when marked \"hold\"."
+msgstr ""
+"B<hold>: Procesa los paquetes incluso si están marcados como "
+"«hold» (mantener)."
 
 # type: Plain text
-#: dpkg.1:577
-#, fuzzy, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "B< dpkg --get-selections E<gt>mis_selecciones>"
+#: dpkg.1:362
+#, fuzzy
+msgid ""
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
+msgstr ""
+"B<remove-reinstreq>: Borra un paquete, incluso si está roto y marcado como "
+"de reinstalación requerida. Esto podría causar, por ejemplo, que algunas "
+"partes del paquete quedaran en el sistema, pero B<dpkg> se olvidara de ellas."
 
 # type: Plain text
-#: dpkg.1:581
+#: dpkg.1:367
 #, fuzzy
 msgid ""
-"You might transfer this file to another computer, and install it there with:"
-msgstr "Se podría copiar este fichero a otra máquina e instalarlo allí con:"
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
+msgstr ""
+"B<remove-essential>: Borra, incluso si el paquete se considera esencial. Los "
+"paquetes esenciales contienen sobre todo órdenes de Unix muy básicas. "
+"Borrarlos podría hacer que el sistema dejara de funcionar en absoluto, así "
+"que use esta opción con cuidado."
 
 # type: Plain text
-#: dpkg.1:584
-#, fuzzy, no-wrap
-msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
-msgstr "B< dpkg --set-selections E<lt>mis_selecciones>"
+#: dpkg.1:370
+#, fuzzy
+msgid "B<depends>: Turn all dependency problems into warnings."
+msgstr "B<depends>: Convierte todos los problemas de dependencias en avisos."
 
 # type: Plain text
-#: dpkg.1:590
+#: dpkg.1:373
 #, fuzzy
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
-"Tenga en cuenta que esto no instalará ni borrará nada, simplemente "
-"modificará el estado de selección de los paquetes escogidos. Necesitará otra "
-"aplicación para conseguir los paquetes e instalarlos. Por ejemplo, ejecute "
-"B<dselect> y elija «Instalar»."
+"B<depends-version>: No tiene en cuenta las versiones al comprobar "
+"dependencias."
 
 # type: Plain text
-#: dpkg.1:593
+#: dpkg.1:377
 #, fuzzy
 msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
 msgstr ""
-"Por lo general, encontrará que B<dselect>(8) es una forma más cómoda de "
-"modificar los estados de selección de los paquetes."
-
-# type: SH
-#: dpkg.1:595
-#, fuzzy, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
-msgstr "FUNCIONALIDAD ADICIONAL"
+"B<conflicts>: Instala, incluso si está en conflicto con otro paquete. Esta "
+"opción es peligrosa, dado que generalmente sobreescribirá algunos ficheros."
 
 # type: Plain text
-#: dpkg.1:598
+#: dpkg.1:382
 #, fuzzy
 msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
 msgstr ""
-"Se puede ganar funcionalidad adicional instalando alguno de los siguientes "
-"paquetes: I<apt>, I<aptitude> and I<debsums>."
+"B<confmiss>: Siempre instala un fichero de configuración perdido. Es "
+"peligroso porque no guarda los cambios (el borrado) hechos al fichero."
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:387
+#, fuzzy
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"B<confnew>: Si se ha modificado un fichero de configuración, instalar "
+"siempre la nueva versión sin preguntar, a menos que se especifique también "
+"la opción --force-confdef, en cuyo caso se toma la acción por omisión."
 
 # type: Plain text
-#: dpkg.1:611
+#: dpkg.1:392
 #, fuzzy
-msgid "B<--no-act> usually gives less information than might be helpful."
+msgid ""
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
-"Normalmente, la opción B<--no-act> da menos información de la que necesita."
-
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
-#, fuzzy, no-wrap
-msgid "AUTHORS"
-msgstr "AUTORES"
+"B<confold>: Si se ha modificado un fichero de configuración, mantener "
+"siempre la versión existente sin preguntar, a menos que también se "
+"especifique la opción --force-confdef, en cuyo caso se toma la acción por "
+"omisión."
 
 # type: Plain text
-#: dpkg.1:616
-#, fuzzy, no-wrap
+#: dpkg.1:398
+#, fuzzy
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
 msgstr ""
-"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
-"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
-"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
+"B<confdef>: Si se ha modificado un fichero de configuración, elegir siempre "
+"la opción por omisión. Si no la hay, parará y preguntará al usuario a no ser "
+"que se usen también las opciones B<--force-confnew> o B<--force-confold>, en "
+"cuyo caso se usará esta opción para tomar la decisión final."
 
-# type: TP
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-architecture"
-msgstr "B<dpkg --print-architecture>"
+# type: Plain text
+#: dpkg.1:401
+#, fuzzy
+msgid "B<overwrite>: Overwrite one package's file with another's file."
+msgstr "B<overwrite>: Sobreescribe un fichero de un paquete con otro fichero."
 
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, no-wrap
-msgid "2006-06-17"
+# type: Plain text
+#: dpkg.1:404
+#, fuzzy
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
+"B<overwrite-dir>: Sobreescribe un directorio de un paquete con otro fichero."
 
 # type: Plain text
-#: dpkg-architecture.1:4
+#: dpkg.1:407
+#, fuzzy
 msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
+"B<overwrite-diverted>: Sobreescribe una versión desviada de un fichero con "
+"una no desviada."
 
 # type: Plain text
-#: dpkg-architecture.1:9
+#: dpkg.1:410
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
-msgstr "B<dpkg> [I<opciones>] I<acción>"
+msgid "B<architecture>: Process even packages with the wrong architecture."
+msgstr ""
+"B<architecture>: Procesar incluso si los paquetes no son de la arquitectura "
+"adecuada."
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:413
+#, fuzzy
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
+"B<bad-path>: B<PATH> no contiene algunos programas importantes, así que es "
+"bastante posible que haya problemas."
 
 # type: Plain text
-#: dpkg-architecture.1:17
-msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
-msgstr ""
+#: dpkg.1:416
+#, fuzzy
+msgid "B<not-root>: Try to (de)install things even when not root."
+msgstr "B<not-root>: Intentar la (des)instalación incluso si no se es root."
 
 # type: Plain text
-#: dpkg-architecture.1:26
-msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+#: dpkg.1:419
+#, fuzzy
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
+"B<bad-verify>: Instala un paquete incluso si falla la comprobación de "
+"autenticidad."
 
 # type: TP
-#: dpkg-architecture.1:28
+#: dpkg.1:420
 #, fuzzy, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<-a>I<arquitectura>"
+msgid "B<--ignore-depends>=I<package>,..."
+msgstr "B<--ignore-depends>=I<paquete>,..."
 
 # type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: dpkg.1:424
+#, fuzzy
+msgid ""
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
+"Ignora la comprobación de dependencias para los paquetes especificados "
+"(realmente, se hacen las comprobaciones, pero se imprimen avisos en vez de "
+"abortar el proceso)."
 
 # type: TP
-#: dpkg-architecture.1:31
+#: dpkg.1:424
 #, fuzzy, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr "B<-p>I<paquete>"
+msgid "B<--new> | B<--old>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
+#: dpkg.1:428
+#, fuzzy
+msgid ""
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
+"elige el formato de paquetes nuevo o antiguo. Es una opción de B<dpkg-deb>"
+"(1)."
 
 # type: TP
-#: dpkg-architecture.1:34
+#: dpkg.1:428 dpkg-deb.1:211
 #, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "I<-B>"
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:432
+#, fuzzy
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
-msgstr ""
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
+msgstr ""
+"No lee ni comprueba el contenido del fichero de control mientras se "
+"construye el paquete. Es una opción de B<dpkg-deb>(1)."
 
 # type: TP
-#: dpkg-architecture.1:43
+#: dpkg.1:432
 #, fuzzy, no-wrap
-msgid "B<-l>"
-msgstr "I<-B>"
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg.1:437
+#, fuzzy
 msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
+msgstr ""
+"Hace todo lo que se supone que debe hacer, pero no realiza ningún cambio. Se "
+"utiliza para ver qué ocurriría con las opciones elegidas sin llegar a "
+"cambiar nada."
+
+# type: Plain text
+#: dpkg.1:442
+#, fuzzy
+msgid ""
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
 msgstr ""
+"Asegúrese de dar la opción B<--no-act> antes del parámetro de acción, o "
+"podría acabar con resultados no deseados. P.ej.: B<dpkg --purge foo --no-"
+"act> primero purgará el paquete foo y luego intentará purgar el paquete --no-"
+"act, ¡aunque probablemente usted esperara que no hiciera nada!)."
 
 # type: TP
-#: dpkg-architecture.1:47
+#: dpkg.1:442
 #, fuzzy, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr "B<-a>I<arquitectura>"
+msgid "B<-R> | B<--recursive>"
+msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg.1:448
+#, fuzzy
 msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
+"Actúa recursivamente sobre todos los ficheros que coincidan con el patrón "
+"B<*.deb> que se encuentren en el directorio especificado y todos sus "
+"subdirectorios. Puede usarse con las opciones B<-i>, B<-A>, B<--install>, "
+"B<--unpack> y B<--avail>."
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg.1:448
 #, fuzzy, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
-msgstr "B<-a>I<arquitectura>"
+msgid "B<-G>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg.1:452
+#, fuzzy
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
+"No instala un paquete del que hay ya instalada una versión más nueva. Es lo "
+"mismo que B<--refuse-downgrade>."
 
 # type: TP
-#: dpkg-architecture.1:59
+#: dpkg.1:452
 #, fuzzy, no-wrap
-msgid "B<-q>I<variable-name>"
-msgstr "B<-n>I<nombrefichero>"
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
+#: dpkg.1:463
+#, fuzzy
+msgid ""
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
+"Cambia los directorios por omisión. El valor predeterminado para el "
+"directorio B<admindir> es I</var/lib/dpkg> y contiene muchos ficheros con "
+"información sobre el estado de los paquetes instalados y desinstalados, "
+"etc.  El valor por omisión de B<instdir> es I</> y se refiere al directorio "
+"donde se instalarán los paquetes. También es el directorio pasado a B<chroot>"
+"(2) antes de ejecutar los programas de instalación de I<paquete>, lo que "
+"significa que éstos verán B<instdir> como directorio raíz. Cambiar B<root> "
+"cambia a su vez B<instdir> a I<dir> y B<admindir> a I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: dpkg-architecture.1:62
+#: dpkg.1:463
 #, fuzzy, no-wrap
-msgid "B<-s>"
-msgstr "I<-B>"
+msgid "B<-O> | B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:469
+#, fuzzy
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
+"Procesa sólo los paquetes que se han elegido para la instalación. La marca "
+"en sí la hacen B<dselect> o B<dpkg>, cuando se usa para gestionar paquetes. "
+"Por ejemplo, si se borra uno, se marcará como elegido para desinstalar."
 
 # type: TP
-#: dpkg-architecture.1:66
+#: dpkg.1:469
 #, fuzzy, no-wrap
-msgid "B<-u>"
-msgstr "I<-B>"
+msgid "B<-E> | B<--skip-same-version>"
+msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
+#: dpkg.1:473
+#, fuzzy
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
 msgstr ""
+"Evita la instalación de un paquete si es la misma versión que ya hay "
+"instalada."
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg.1:473
 #, fuzzy, no-wrap
-msgid "B<-c>I< command>"
-msgstr "B<-p>I<orden-para-firmar>"
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg.1:480
+#, fuzzy
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
+"Envía el estado del paquete al descriptor de fichero I<E<lt>nE<gt>>. Puede "
+"usarse varias veces. Las actualizaciones de estado tienen la forma «status: "
+"E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>»."
 
 # type: TP
-#: dpkg-architecture.1:73
+#: dpkg.1:480
 #, fuzzy, no-wrap
-msgid "B<-L>"
-msgstr "I<-B>"
+msgid "B<--log=>I<filename>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
+#: dpkg.1:492
+msgid ""
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
-msgstr ""
+# type: TP
+#: dpkg.1:492
+#, no-wrap
+msgid "B<--no-debsig>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:83
-#, fuzzy, no-wrap
-msgid "TERMS"
-msgstr "NOTAS"
-
-# type: IP
-#: dpkg-architecture.1:84
+# type: TP
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
-msgid "build machine"
-msgstr ""
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:86
+#: dpkg.1:500
 #, fuzzy
-msgid "The machine the package is built on."
-msgstr "La versión del paquete fuente (del fichero de cambios)."
+msgid "Configuration file with default options."
+msgstr "Fichero de configuración con las opciones por omisión."
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:500
 #, no-wrap
-msgid "host machine"
-msgstr ""
+msgid "I</var/log/dpkg.log>"
+msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
-# type: TH
-#: dpkg-architecture.1:88
-#, fuzzy, no-wrap
-msgid "Debian architecture"
-msgstr "Proyecto Debian"
-
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:507
+#, fuzzy
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
+"Los otros ficheros listados abajo están en sus directorios por omisión. "
+"Véase la opción B<--admindir> para ver cómo cambiar la ruta de estos "
+"ficheros."
 
-# type: IP
-#: dpkg-architecture.1:91
+# type: TP
+#: dpkg.1:507
 #, no-wrap
-msgid "architecture wildcard"
-msgstr ""
+msgid "I</var/lib/dpkg/available>"
+msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:95
-msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
-msgstr ""
+#: dpkg.1:510
+#, fuzzy
+msgid "List of available packages."
+msgstr "Lista de paquetes disponibles."
 
-# type: IP
-#: dpkg-architecture.1:95
+# type: TP
+#: dpkg.1:510
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr ""
+msgid "I</var/lib/dpkg/status>"
+msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-architecture.1:99
+#: dpkg.1:516
+#, fuzzy
 msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
 msgstr ""
+"Estado de los paquetes disponibles. Este fichero contiene información sobre "
+"si un paquete está marcado para borrar o no, si está instalado o no, etc. "
+"Véase el apartado B<INFORMACIÓN SOBRE PAQUETES> para más información."
 
 # type: Plain text
-#: dpkg-architecture.1:103
+#: dpkg.1:519
+#, fuzzy
 msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
+"Los siguientes ficheros son componentes de un paquete binario. Véase B<deb>"
+"(5) para más información sobre éstos:"
 
-# type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
-msgstr ""
+# type: TP
+#: dpkg.1:519
+#, no-wrap
+msgid "I<control>"
+msgstr "I<control>"
 
-# type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr ""
+# type: TP
+#: dpkg.1:521
+#, no-wrap
+msgid "I<conffiles>"
+msgstr "I<conffiles>"
 
-# type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr ""
+# type: TP
+#: dpkg.1:523
+#, no-wrap
+msgid "I<preinst>"
+msgstr "I<preinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:117
-msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
-msgstr ""
+# type: TP
+#: dpkg.1:525
+#, no-wrap
+msgid "I<postinst>"
+msgstr "I<postinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
-msgstr ""
+# type: TP
+#: dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
+msgstr "I<prerm>"
 
-# type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
+# type: TP
+#: dpkg.1:529
+#, no-wrap
+msgid "I<postrm>"
+msgstr "I<postrm>"
 
 # type: SH
-#: dpkg-architecture.1:122
+#: dpkg.1:532
 #, fuzzy, no-wrap
-msgid "VARIABLES"
-msgstr "SUSTITUCIÓN DE VARIABLES"
-
-# type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr ""
+msgid "ENVIRONMENT VARIABLES"
+msgstr "VARIABLES DE ENTORNO"
 
-# type: IP
-#: dpkg-architecture.1:124
+# type: TP
+#: dpkg.1:533
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
-msgstr ""
+msgid "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
+#: dpkg.1:537
+#, fuzzy
+msgid ""
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
+"Defina esta variable si prefiere que B<dpkg> arranque en un intérprete "
+"diferente en vez de suspenderse a sí mismo cuando vuelve temporalmente al "
+"intérprete de órdenes."
 
-# type: IP
-#: dpkg-architecture.1:126
+# type: TP
+#: dpkg.1:537
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
-msgstr ""
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 # type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr ""
+#: dpkg.1:540
+#, fuzzy
+msgid "The program B<dpkg> will execute when starting a new shell."
+msgstr "El programa que ejecutará B<dpkg> cuando arranque el nuevo intérprete."
 
-# type: IP
-#: dpkg-architecture.1:128
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
-msgstr ""
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
+#, fuzzy, no-wrap
+msgid "B<COLUMNS>"
+msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
+#: dpkg.1:544
+#, fuzzy
+msgid ""
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
+"Especifica el número de columnas que puede usar B<dpkg> para mostrar la "
+"información. Por ahora sólo la usa la opción -l."
 
-# type: IP
-#: dpkg-architecture.1:130
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
+#, fuzzy, no-wrap
+msgid "EXAMPLES"
+msgstr "EJEMPLOS"
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:132
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr ""
+#: dpkg.1:547
+#, fuzzy
+msgid "To list packages related to the editor B<vi>(1):"
+msgstr "Para listar los paquetes con «vi» en su nombre:"
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
-msgstr ""
+#: dpkg.1:549
+#, fuzzy, no-wrap
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:136
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
+#: dpkg.1:552
+#, fuzzy
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
+"Para ver las entradas en I</var/lib/dpkg/available> de varios paquetes:"
 
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:138
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr ""
+#: dpkg.1:554
+#, fuzzy, no-wrap
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:140
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:142
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
-msgstr ""
+#: dpkg.1:559
+#, fuzzy, no-wrap
+msgid "     B<less /var/lib/dpkg/available>\n"
+msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:144
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
-msgstr ""
+#: dpkg.1:562
+#, fuzzy
+msgid "To remove an installed elvis package:"
+msgstr "Para borrar un paquete instalado llamado «elvis»:"
 
 # type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:146
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr ""
+#: dpkg.1:564
+#, fuzzy, no-wrap
+msgid "     B<dpkg -r elvis>\n"
+msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
-
-# type: SH
-#: dpkg-architecture.1:149
-#, no-wrap
-msgid "DEBIAN/RULES"
+#: dpkg.1:569
+#, fuzzy
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
+"Para instalar un paquete, primero hay que encontrarlo en la colección de "
+"paquetes que queramos. El fichero «available» muestra que el paquete «vim» "
+"está en el apartado «editors»:"
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg.1:572
+#, fuzzy, no-wrap
 msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
-msgstr ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
+msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
-msgstr ""
+#: dpkg.1:575
+#, fuzzy
+msgid "To make a local copy of the package selection states:"
+msgstr "Para hacer una copia local de los estados de la selección de paquetes:"
 
 # type: Plain text
-#: dpkg-architecture.1:164
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
-msgstr ""
+#: dpkg.1:577
+#, fuzzy, no-wrap
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "B< dpkg --get-selections E<gt>mis_selecciones>"
 
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
+#: dpkg.1:581
+#, fuzzy
 msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
-msgstr ""
+"You might transfer this file to another computer, and install it there with:"
+msgstr "Se podría copiar este fichero a otra máquina e instalarlo allí con:"
 
 # type: Plain text
-#: dpkg-architecture.1:173
-#, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-msgstr ""
+#: dpkg.1:584
+#, fuzzy, no-wrap
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
+msgstr "B< dpkg --set-selections E<lt>mis_selecciones>"
 
 # type: Plain text
-#: dpkg-architecture.1:183
-#, no-wrap
+#: dpkg.1:590
+#, fuzzy
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
+"Tenga en cuenta que esto no instalará ni borrará nada, simplemente "
+"modificará el estado de selección de los paquetes escogidos. Necesitará otra "
+"aplicación para conseguir los paquetes e instalarlos. Por ejemplo, ejecute "
+"B<dselect> y elija «Instalar»."
 
 # type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
+#: dpkg.1:593
+#, fuzzy
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
+"Por lo general, encontrará que B<dselect>(8) es una forma más cómoda de "
+"modificar los estados de selección de los paquetes."
 
-# type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
-msgstr ""
+# type: SH
+#: dpkg.1:595
+#, fuzzy, no-wrap
+msgid "ADDITIONAL FUNCTIONALITY"
+msgstr "FUNCIONALIDAD ADICIONAL"
 
 # type: Plain text
-#: dpkg-architecture.1:193
-#, no-wrap
+#: dpkg.1:598
+#, fuzzy
 msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
+"Se puede ganar funcionalidad adicional instalando alguno de los siguientes "
+"paquetes: I<apt>, I<aptitude> and I<debsums>."
 
 # type: Plain text
-#: dpkg-architecture.1:197
+#: dpkg.1:608
 msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: dpkg-architecture.1:202
-msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+#: dpkg.1:611
+#, fuzzy
+msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
+"Normalmente, la opción B<--no-act> da menos información de la que necesita."
 
 # type: SH
-#: dpkg-architecture.1:203
-#, no-wrap
-msgid "BACKWARD COMPATIBILITY"
-msgstr ""
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
+#, fuzzy, no-wrap
+msgid "AUTHORS"
+msgstr "AUTORES"
 
 # type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg.1:616
+#, fuzzy, no-wrap
 msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
 msgstr ""
+"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
+"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
+"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
 
-# type: Plain text
-#: dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-architecture"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:218
-#, no-wrap
+#: dpkg-architecture.1:4
 msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+"dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
-msgstr ""
+#: dpkg-architecture.1:9
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+#: dpkg-architecture.1:14
+msgid ""
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:238
+#: dpkg-architecture.1:17
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:248
-#, no-wrap
+#: dpkg-architecture.1:26
 msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:253
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgid "COMMANDS"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:28
+#, fuzzy, no-wrap
+msgid "B<-l>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-architecture.1:264
+#: dpkg-architecture.1:32
 msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:32
+#, fuzzy, no-wrap
+msgid "B<-e>I<debian-architecture>"
+msgstr "B<-a>I<arquitectura>"
+
 # type: Plain text
-#: dpkg-architecture.1:267
+#: dpkg-architecture.1:38
 msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:271
-#, fuzzy
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<dpkg-buildpackage> [I<opciones>]"
+# type: TP
+#: dpkg-architecture.1:38
+#, fuzzy, no-wrap
+msgid "B<-i>I<architecture-wildcard>"
+msgstr "B<-a>I<arquitectura>"
 
 # type: Plain text
-#: dpkg-architecture.1:276
+#: dpkg-architecture.1:44
 msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
-#, no-wrap
-msgid "dpkg.cfg"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:44
+#, fuzzy, no-wrap
+msgid "B<-q>I<variable-name>"
+msgstr "B<-n>I<nombrefichero>"
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:47
+#, fuzzy, no-wrap
+msgid "B<-s>"
+msgstr "I<-B>"
+
 # type: Plain text
-#: dpkg.cfg.5:11
+#: dpkg-architecture.1:51
 msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
 # type: TP
-#: dpkg.cfg.5:16
-#, fuzzy
-msgid "I<~/.dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+#: dpkg-architecture.1:51
+#, fuzzy, no-wrap
+msgid "B<-u>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg.cfg.5:20
-#, fuzzy
-msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
-"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
-"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
-"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
-
-# type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
-msgstr "B<dpkg>(1)."
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:1
+# type: TP
+#: dpkg-architecture.1:54
 #, fuzzy, no-wrap
-msgid "dpkg-checkbuilddeps"
-msgstr "B<dpkg-checkbuilddeps> -B [I<fichero-control>]"
-
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
-#, no-wrap
-msgid "2006-05-23"
-msgstr ""
+msgid "B<-c>I< command>"
+msgstr "B<-p>I<orden-para-firmar>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-#, fuzzy
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+#: dpkg-architecture.1:58
+msgid ""
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
-"dpkg-checkbuilddeps - comprueba las dependencias y conflictos de compilación."
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-#, fuzzy
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> -B [I<fichero-control>]"
+# type: TP
+#: dpkg-architecture.1:58
+#, fuzzy, no-wrap
+msgid "B<-L>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
-#, fuzzy
-msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
 msgstr ""
-"Este programa comprueba que los paquetes instalados en el sistema satisfacen "
-"las dependencias y conflictos de construcción especificados en el fichero de "
-"control del paquete. Si alguna de estas condiciones no se cumple avisa y "
-"termina devolviendo un código de error distinto de cero."
+
+# type: TP
+#: dpkg-architecture.1:69
+#, fuzzy, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<-a>I<arquitectura>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-#, fuzzy
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
 msgstr ""
-"Por omisión se lee B<debian/control>, pero puede especificarse un fichero de "
-"control alternativo en la línea de órdenes."
 
 # type: TP
-#: dpkg-checkbuilddeps.1:17
+#: dpkg-architecture.1:72
 #, fuzzy, no-wrap
-msgid "B<-B>"
-msgstr "I<-B>"
+msgid "B<-t>I<gnu-system-type>"
+msgstr "B<-p>I<paquete>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
-#, fuzzy
-msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
 msgstr ""
-"Ignora las líneas Build-Depends-Indep. Usar cuando se construyen paquetes "
-"independientes de la arquitectura."
 
 # type: TP
-#: dpkg-checkbuilddeps.1:21
-#, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-#, fuzzy
-msgid "Copyright 2001 Joey Hess"
-msgstr "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:82
+msgid ""
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
+msgstr ""
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: SH
+#: dpkg-architecture.1:83
 #, fuzzy, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:joeyh@debian.org"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:29
-#, fuzzy
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>joeyh@debian.orgE<gt>"
+msgid "TERMS"
+msgstr "NOTAS"
 
-# type: TH
-#: dpkg-deb.1:1
+# type: IP
+#: dpkg-architecture.1:84
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
-
-# type: Plain text
-#: dpkg-deb.1:4
-#, fuzzy
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr "dpkg-deb - Herramienta de manipulación de archivos de Debian (.deb)"
+msgid "build machine"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:8
+#: dpkg-architecture.1:86
 #, fuzzy
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<R directorio [ archivo | directorio ]>"
+msgid "The machine the package is built on."
+msgstr "La versión del paquete fuente (del fichero de cambios)."
 
-# type: Plain text
-#: dpkg-deb.1:12
-#, fuzzy
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<R archivo [ archivo-de-control ..]>"
+# type: IP
+#: dpkg-architecture.1:86
+#, no-wrap
+msgid "host machine"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:16
-#, fuzzy
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archivo>"
+# type: TH
+#: dpkg-architecture.1:88
+#, fuzzy, no-wrap
+msgid "Debian architecture"
+msgstr "Proyecto Debian"
 
 # type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#: dpkg-architecture.1:91
+msgid ""
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+# type: IP
+#: dpkg-architecture.1:91
+#, no-wrap
+msgid "architecture wildcard"
 msgstr ""
-"B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archivo directorio>"
-
-# type: Plain text
-#: dpkg-deb.1:33
-#, fuzzy
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb --control> I<archivo directorio>"
-
-# type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<archivo>"
 
 # type: Plain text
-#: dpkg-deb.1:39
-#, fuzzy
+#: dpkg-architecture.1:95
 msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgstr ""
-"B<dpkg-deb> empaqueta, desempaqueta, y provee información sobre los archivos "
-"de Debian."
 
-# type: Plain text
-#: dpkg-deb.1:43
-#, fuzzy
-msgid "Use B<dpkg> to install and remove packages from your system."
-msgstr "Use B<dpkg> para instalar y eliminar paquetes de su sistema."
+# type: IP
+#: dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:53
-#, fuzzy
+#: dpkg-architecture.1:99
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
-"También puede usar B<dpkg-deb> llamando a B<dpkg> con cualquiera de las "
-"opciones que desee darle B<dpkg-deb>. B<dpkg> le mostrará lo que necesite y "
-"B<dpkg-deb> lo ejecutará por usted."
 
 # type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
+#: dpkg-architecture.1:100
 #, fuzzy, no-wrap
-msgid "ACTION OPTIONS"
+msgid "VARIABLES"
+msgstr "SUSTITUCIÓN DE VARIABLES"
+
+# type: Plain text
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
-"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
-"OPCIONES DE ACCIÓN\n"
-"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
-"OPCIONES DE USO"
 
-# type: TP
-#: dpkg-deb.1:54
+# type: IP
+#: dpkg-architecture.1:102
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr "B<--build>, B<-b>"
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
-#, fuzzy
-msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
 msgstr ""
-"Crea un archivo de Debian desde el sistema de archivos localizado en el "
-"I<directorio>. I<El>directorio debe tener un subdirectorio B<DEBIAN> el cual "
-"contiene los archivos de información de control.  Este directorio I<no> "
-"aparecerá en el paquete binario, pero, en lugar de esto, los archivos que "
-"tenga serán puestos en el área de información del paquete binario."
 
-# type: Plain text
-#: dpkg-deb.1:72
-#, fuzzy
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+# type: IP
+#: dpkg-architecture.1:104
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
-"Usted puede especificar el nivel de compresión usado con la opción B<-z#.> "
-"B<dpkg-deb> pasará ésta a gzip."
 
 # type: Plain text
-#: dpkg-deb.1:84
-#, fuzzy
-msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
-"A menos que usted especifique B<--nocheck>, B<dpkg-deb> leerá B<DEBIAN/"
-"control> y lo revisará. Comprobará posibles errores de sintaxis y otros "
-"problemas, y mostrará el nombre del paquete binario que se está creando.  "
-"B<dpkg-deb> también comprobará los permisos de los programas del "
-"desarrollador así como de los otros archivos que se encuentren en el "
-"directorio B<DEBIAN>."
 
-# type: Plain text
-#: dpkg-deb.1:91
-#, fuzzy
-msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+# type: IP
+#: dpkg-architecture.1:106
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
-"Si no se especifica algún I<archivo> , entonces B<dpkg-deb> creará el "
-"paquete en el fichero I<directorio>B<.deb>."
 
 # type: Plain text
-#: dpkg-deb.1:93
-#, fuzzy
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr "Si el archivo a ser creado ya existe entonces será sobreescrito."
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:109
-#, fuzzy
-msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+# type: IP
+#: dpkg-architecture.1:108
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
-"Si el segundo argumento es un directorio entonces B<dpkg-deb> escribirá al "
-"archivo I<paquete>B<_>I<versión>B<_>I<arquitectura>B<.deb>, o "
-"I<paquete>B<_>I<versión>B<.deb> si el campo B<Arquitecture> no está presente "
-"en el fichero de control del paquete.  Cuando se especifica un directorio de "
-"destino en lugar de un fichero, la opción B<--nocheck> no debería utilizarse "
-"(dado que B<dpkg-deb> necesita leer y analizar el archivo de control del "
-"paquete para determinar qué nombre de archivo usar)."
-
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, fuzzy, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: dpkg-deb.1:112
-#, fuzzy
-msgid "Provides information about a binary package archive."
-msgstr "Ofrece información acerca del paquete binario."
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:117
-#, fuzzy
-msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
-"Si se especifica I<archivo(s)-de-control> entonces imprimirá un resumen de "
-"los contenidos del paquete así como del archivo de control."
 
 # type: Plain text
-#: dpkg-deb.1:125
-#, fuzzy
-msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
-"Si se especifica algún I<archivo-de-control> B<dpkg-deb> imprimirá éstos en "
-"el orden que fueron especificados.  Si cualquiera de los componentes no "
-"estuviesen presentes, mostrará un mensaje de error a la salida de error "
-"estándar sobre cada uno de ellos y abortará con estado 2."
 
-# type: TP
-#: dpkg-deb.1:125
+# type: IP
+#: dpkg-architecture.1:114
 #, no-wrap
-msgid "B<--show>, B<-W>"
+msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:132
-#, fuzzy
-msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
-msgstr "Ofrece información acerca del paquete binario."
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:132
+# type: IP
+#: dpkg-architecture.1:116
 #, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--field>, B<-f>"
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:135
-#, fuzzy
-msgid "Extracts control file information from a binary package archive."
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
-"Extrae información del fichero de control del fichero de un paquete binario."
 
 # type: Plain text
-#: dpkg-deb.1:139
-#, fuzzy
-msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:120
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
-"Si no se especifica ningún B<control-file-field>s entonces mostrará todo el "
-"fichero de control."
 
 # type: Plain text
-#: dpkg-deb.1:148
-#, fuzzy
-msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
-"Si se especifica algún B<dpkg-deb> mostrará sus contenidos, en el orden en "
-"el cual aparecen en el fichero de control. Si se especifica más de un "
-"B<campo-del-fichero-de-control> , entonces B<dpkg-deb> precederá cada uno "
-"con el nombre del campo (más dos puntos y espacio)."
 
 # type: Plain text
-#: dpkg-deb.1:150
-#, fuzzy
-msgid "No errors are reported for fields requested but not found."
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
-"No se informa de ningún error para los campos que se hayan solicitados pero "
-"que no se encuentren."
 
-# type: TP
-#: dpkg-deb.1:150
+# type: IP
+#: dpkg-architecture.1:124
 #, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--contents>, B<-c>"
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:156
-#, fuzzy
-msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
-"Lista los contenidos de la parte del archivo que contiene los archivos del "
-"sistema de ficheros. Se imprime en el formato generado por B<tar> cuando se "
-"selecciona listado extendido."
 
-# type: TP
-#: dpkg-deb.1:156
+# type: SH
+#: dpkg-architecture.1:127
 #, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+msgid "DEBIAN/RULES"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:160
-#, fuzzy
+#: dpkg-architecture.1:135
 msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
-"Descomprime el árbol del sistema de ficheros desde el archivo del paquete en "
-"del directorio especificado."
 
 # type: Plain text
-#: dpkg-deb.1:165
-#, fuzzy
-msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
 msgstr ""
-"B<--vextract> (B<-X>)  Muestra una lista de los archivos extraídos mientras "
-"que con la opción B<--extract> (B<-x>)  no mostrará nada a menos que ocurra "
-"un error."
 
 # type: Plain text
-#: dpkg-deb.1:171
-#, fuzzy
+#: dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
-"Nota, ¡ I<no> obtendrá una instalación correcta si extrae un paquete en el "
-"directorio raíz! Use B<dpkg> para instalar paquetes."
 
 # type: Plain text
-#: dpkg-deb.1:174
-#, fuzzy
-msgid "I<directory> (but not its parents) will be created if necessary."
+#: dpkg-architecture.1:145
+msgid "please use the following:"
 msgstr ""
-"El I<directorio> (pero no los directorios previos) será creado si fuera "
-"necesario."
-
-# type: TP
-#: dpkg-deb.1:174
-#, fuzzy, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr "B<--fsys-archivotar>"
 
 # type: Plain text
-#: dpkg-deb.1:182
-#, fuzzy
+#: dpkg-architecture.1:149
+#, no-wrap
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
-"Descomprime el árbol del sistema de archivos de un paquete binarios y lo "
-"envía hacia la salida estándar en formato B<tar>.  Si se utiliza junto con "
-"B<tar>(1)  se puede utilizar para descomprimir un fichero concreto de un "
-"paquete."
 
-# type: TP
-#: dpkg-deb.1:182
+# type: Plain text
+#: dpkg-architecture.1:151
 #, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "B<--control>, B<-e>"
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:186
-#, fuzzy
+#: dpkg-architecture.1:161
+#, no-wrap
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"Descomprime los ficheros de información de control de un paquete dentro del "
-"directorio especificado."
 
 # type: Plain text
-#: dpkg-deb.1:190
-#, fuzzy
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+#: dpkg-architecture.1:164
+msgid "please use:"
 msgstr ""
-"Si no se especifica ningún directorio se usará el subdirectorio B<DEBIAN> en "
-"el directorio actual."
 
 # type: Plain text
-#: dpkg-deb.1:193
-#, fuzzy
-msgid ""
-"The target directory (but not its parents) will be created if necessary."
+#: dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
-"El directorio de destino (pero no los directorios previos) será creado si "
-"fuera necesario."
-
-# type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, fuzzy, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
 
 # type: Plain text
-#: dpkg-deb.1:198
-#, fuzzy
+#: dpkg-architecture.1:171
+#, no-wrap
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"Muestra la información de cómo usar B<dpkg-deb>'s , con un resumen de sus "
-"opciones y usos."
 
 # type: Plain text
-#: dpkg-deb.1:203
-#, fuzzy
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Muestra el numero de versión de B<dpkg-deb>'s"
-
-# type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
-#, fuzzy, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+#: dpkg-architecture.1:175
+msgid ""
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:210
-#, fuzzy
+#: dpkg-architecture.1:180
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
-"Muestra la información de licencia y garantía de B<dpkg-deb>'s (El uso de la "
-"palabra americana B<--license> produce el mismo mensaje)"
 
 # type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
-#, fuzzy, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "OTRAS OPCIONES"
-
-# type: TP
-#: dpkg-deb.1:211
+#: dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--showformat=>I<format>"
+msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
+#: dpkg-architecture.1:187
 msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-architecture.1:192
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
-msgstr ""
-
-# type: TP
-#: dpkg-deb.1:227
+#: dpkg-architecture.1:196
 #, no-wrap
-msgid "B<--new>"
-msgstr "B<--new>"
+msgid ""
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:232
-#, fuzzy
+#: dpkg-architecture.1:210
+#, no-wrap
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
-"Asegura que B<dpkg-deb> construye un `nuevo' formato de archivo. Éste es el "
-"comportamiento por defecto."
 
-# type: TP
-#: dpkg-deb.1:232
-#, no-wrap
-msgid "B<--old>"
-msgstr "B<--old>"
+# type: Plain text
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:240
-#, fuzzy
+#: dpkg-architecture.1:216
 msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
-"Fuerza B<dpkg-deb> a construir un `antiguo' formato de archivo.  Este "
-"formato antiguo de archivo es más dificil de analizar por herramientas que "
-"no formen parte de Debian, por lo que ahora es obsoleto. Sólo se usa cuando "
-"se construyen paquetes que serán analizados por versiones de dpkg previas a "
-"la version 0.93.76 (septiembre 1995), la cual se distribuyó sólo para i386 "
-"en formato a.out"
 
 # type: Plain text
-#: dpkg-deb.1:246
-#, fuzzy
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
-"Impide las comprobaciones habituales de B<dpkg-deb --build>'s sobre los "
-"contenidos del archivo. Puede construir cualquier archivo que desee, no "
-"importa lo mal que esté."
 
-# type: TP
-#: dpkg-deb.1:246
+# type: Plain text
+#: dpkg-architecture.1:231
 #, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--debug>, B<-D>"
+msgid ""
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:249
-#, fuzzy
-msgid "Enables debugging output. This is not very interesting."
-msgstr "Habilita los mensajes de depuración. No son muy interesantes."
+#: dpkg-architecture.1:235
+msgid ""
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:254
-#, fuzzy
+#: dpkg-architecture.1:242
 msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
-"B<dpkg-deb -I> I<B package1 .deb> I<B package2 .deb> no hace lo que debe "
-"hacer."
 
 # type: Plain text
-#: dpkg-deb.1:258
-#, fuzzy
+#: dpkg-architecture.1:245
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
-"No existe ningún tipo de autentificación en los arhivos B<.deb> de hecho, no "
-"hay ni siquiera una código de comprobación directo."
 
 # type: Plain text
-#: dpkg-deb.1:265
-#, fuzzy
+#: dpkg-architecture.1:249
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
-"¡No use B<dpkg-deb> para instalar software! Debe usar B<dpkg> para "
-"asegurarse de que todos los archivos se instalan en el sitio correcto, que "
-"los guiones del paquete se ejecutan y que los contenidos de éste se "
-"registran."
 
 # type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:278
-#, fuzzy
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:256
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
-"B<dpkg-deb> y esta página de manual, fué escrita por Ian Jackson. Son "
-"Copyright (c) 1995-1996 suyos, y se distribuyen bajo la Licencia Publica de "
-"GNU.  No se ofrece NINGUNA garantía.  Consulte B</usr/share/doc/dpkg/"
-"copyright> y B</usr/share/common-licenses/GPL> para más información"
 
-# type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "dpkg-divert"
+# type: Plain text
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:4
-#, fuzzy
-msgid "dpkg-divert - override a package's version of a file"
-msgstr "dpkg-divert - redefine la versión de paquete de un archivo"
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:10
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [opciones] [--add] I<E<lt>ficheroE<gt>>"
+#: dpkg-architecture.1:263
+msgid ""
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:15
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [opciones] --remove I<E<lt>ficheroE<gt>>"
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:20
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr "B<dpkg-divert> [opciones] --list I<E<lt>patrón-globalE<gt>>"
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:25
+#: dpkg-architecture.1:271
 #, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [opciones] --truename I<E<lt>ficheroE<gt>>"
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<dpkg-buildpackage> [I<opciones>]"
 
 # type: Plain text
-#: dpkg-divert.8:36
-#, fuzzy
+#: dpkg-architecture.1:276
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+msgstr ""
+
+# type: TH
+#: dpkg.cfg.5:1
+#, no-wrap
+msgid "dpkg.cfg"
 msgstr ""
-"La `redirección' de archivos es una forma de forzar a dpkg para no instalar "
-"un archivo en su ubicación, sino en una ubicación `redirigida'. Las "
-"redirecciones se pueden usar a través de los scripts en los paquetes Debian "
-"para mover un archivo cuando causa conflicto. Los administradores de sistema "
-"pueden usarlo también para redefinir algún archivo de configuración de "
-"paquete, o cuando algunos archivos (que no están marcados como 'conffiles') "
-"deben ser preservados por dpkg, si se instala una nueva versión del paquete "
-"que contiene estos archivos."
 
 # type: Plain text
-#: dpkg-divert.8:44
-#, fuzzy
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
+msgstr ""
+
+# type: Plain text
+#: dpkg.cfg.5:11
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
-"B<dpkg-divert> es la herramienta usada para definir y actualizar la lista de "
-"'redirecciones'.  Funciona en tres modos básicos - añadir, eliminar y listar "
-"redireciones.  Las opciones son --add, --remove, y --list, respectivamente. "
-"Adicionalmente, puede imprimir el nombre real de un archivo redirigido. "
-"Pueden especificarse otras opciones (listadas a continuación)."
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
-#, fuzzy, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>directorioE<gt>>"
+#: dpkg.cfg.5:16
+#, fuzzy
+msgid "I<~/.dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-divert.8:48
+#: dpkg.cfg.5:20
 #, fuzzy
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
-"Define el directorio de datos de dpkg a E<lt>directorioE<gt> (por omisión: /"
-"var/lib/dpkg)."
+"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
+"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
+"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
 
-# type: TP
-#: dpkg-divert.8:48
+# type: Plain text
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
+msgstr "B<dpkg>(1)."
+
+# type: TH
+#: dpkg-buildpackage.1:1
 #, fuzzy, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "I<--divert E<lt>redirigir-aE<gt>>"
+msgid "dpkg-buildpackage"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:4
+#, fuzzy
+msgid "dpkg-buildpackage - build source packages"
+msgstr "dpkg-scanpackages - Crea ficheros Packages."
+
+# type: Plain text
+#: dpkg-buildpackage.1:8
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg-buildpackage> [I<opciones>]"
+
+# type: Plain text
+#: dpkg-buildpackage.1:13
 #, fuzzy
 msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"E<lt>paqueteE<gt> es el nombre de un paquete cuya copia de E<lt>ficheroE<gt> "
-"no se redigirá."
+"B<dpkg-buildpackage> es un script de control que puede ser usado para "
+"automatizar la construcción de un paquete."
 
 # type: TP
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:15
 #, fuzzy, no-wrap
-msgid "B<--local>"
-msgstr "I<--local>"
+msgid "B<-b>"
+msgstr "B<-b>"
 
 # type: Plain text
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:19
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
 #, fuzzy, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "I<--package E<lt>paqueteE<gt>>"
+msgid "B<-B>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:63
-#, fuzzy
+#: dpkg-buildpackage.1:23
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
-"E<lt>paqueteE<gt> es el nombre de un paquete cuya copia de E<lt>ficheroE<gt> "
-"no se redigirá."
 
 # type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
-#, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:66
+#: dpkg-buildpackage.1:26
 #, fuzzy
-msgid "Quiet mode, i.e. no verbose output."
-msgstr "Modo silencioso, esto es: sin información detallada."
-
-# type: TP
-#: dpkg-divert.8:66
-#, fuzzy, no-wrap
-msgid "B<--rename>"
-msgstr "I<--rename>"
+msgid "Specifies a source-only build, no binary packages need to be made."
+msgstr "Separa un paquete binario de Debian en varias partes."
 
 # type: Plain text
-#: dpkg-divert.8:70
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 #, fuzzy
 msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"Mueve el archivo a un lado (o atrás). dpkg-divert abortará la operación en "
-"caso de que el archivo destino ya exista."
+"Estas opciones controlan si el fichero de fuentes original se incluye en la "
+"subida generada por B<dpkg-buildpackage> y B<dpkg-genchanges> en caso de que "
+"se produzca alguna fuente (por ejemplo, si no se han usado B<-b> o B<-B>)."
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
-#, no-wrap
-msgid "B<--test>"
-msgstr "B<--test>"
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:73
+#: dpkg-buildpackage.1:40
 #, fuzzy
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+msgid ""
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
-"Modo de prueba, esto es: no realiza ningún cambio, solo muestra su ejecución."
+"Por omisión, o si se especifica B<-si>, el fichero de fuentes original se "
+"incluirá si el número de versión acaba en B<-0> o B<-1>, por ejemplo, si la "
+"parte del número de versión que corresponde a la revisión de Debian es B<0> "
+"o B<1>."
 
-# type: Plain text
-#: dpkg-divert.8:76
-#, fuzzy
-msgid "Output short usage instructions, and exit successfully."
-msgstr ""
-"Imprime la versión e instrucciones de uso breves, y finaliza normalmente."
+# type: TP
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:79
+#: dpkg-buildpackage.1:43
 #, fuzzy
-msgid "Output program name and version and exit successfully."
-msgstr "Imprime el nombre del programa y su versión, y finaliza correctamente."
+msgid "Forces the inclusion of the original source."
+msgstr "B<-su> desempaqueta el archivo de fuentes original."
 
-# type: SH
-#: dpkg-divert.8:80
+# type: TP
+#: dpkg-buildpackage.1:43
 #, fuzzy, no-wrap
-msgid "NOTES"
-msgstr "NOTAS"
+msgid "B<-sd>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg-buildpackage.1:46
 #, fuzzy
-msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
-"Cuando se añade, por omisión se usa --local y --divert E<lt>originalE<gt>."
-"distrib.  Cuando se elimina, --package o --local y --divert deben coincidir "
-"si se especifican."
+"B<-sa> fuerza la inclusión de la fuente original; B<-sd> fuerza su exclusión "
+"e incluye sólo el diff."
 
-# type: Plain text
-#: dpkg-divert.8:86
-#, fuzzy
-msgid "Directories can't be diverted with B<dpkg-divert>."
-msgstr "Los directorios no pueden ser redirigidos con dpkg-divert."
+# type: TP
+#: dpkg-buildpackage.1:46
+#, fuzzy, no-wrap
+msgid "B<-a>I<architecture>"
+msgstr "B<-a>I<arquitectura>"
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg-buildpackage.1:51
 #, fuzzy
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
-msgstr ""
-"Debe de tenerse cuidado cuando se redireccionen bibliotecas compartidas, "
-"ldconfig (8) crea un enlace simbólico basado en el campo DT_SONAME empotrado "
-"en la biblioteca. Ya que ldconfig no hace caso de las redirecciones (sólo "
-"dpkg lo hace), si una biblioteca redirigida tiene el mismo SONAME que la que "
-"no está redirigida, es posible que el enlace simbólico acabe apuntando a la "
-"biblioteca redirigida."
-
-# type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
-msgstr ""
-
-# type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
+"Especifica la arquitectura de Debian para la cual construimos el paquete. La "
+"arquitectura de la máquina en la que construimos el paquete es detectada "
+"automáticamente y es también la arquitectura de destino por omisión para la "
+"máquina."
 
-# type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<-v>I<versión>"
 
 # type: Plain text
-#: dpkg-divert.8:107
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
+#, fuzzy
 msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
+"En B<dpkg-buildpackage>, B<dpkg-genchanges> y B<dpkg-parsechangelog> provoca "
+"que se use la información de los cambios de todas las versiones "
+"estrictamente posteriores a I<versión .>"
 
-# type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, fuzzy, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B<-C>I<descripcióndecambios>"
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+#, fuzzy
+msgid ""
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
+"Lee la descripción de los cambios del fichero I<descripcióndecambios> en vez "
+"de usar la información contenida en el fichero de cambios (changelog)  del "
+"árbol de fuentes. Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/diversions>"
+msgid "B<-m>I<maintaineraddress>"
+msgstr "B<-m>I<direcciónresponsable>"
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, fuzzy
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
-"Archivo que contiene la lista actual de redirecciones del sistema. Esta "
-"ubicado en el directorio de administración de dpkg, así como otros archivos "
-"importantes para dpkg, como `status' o `available'."
+"Utiliza I<direcciónresponsable> como el nombre y dirección de correo del "
+"responsable de este paquete, en lugar de usar la información de control del "
+"árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
+
+# type: TP
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, fuzzy, no-wrap
+msgid "B<-e>I<maintaineraddress>"
+msgstr "B<-e>I<direcciónresponsable>"
 
 # type: Plain text
-#: dpkg-divert.8:123
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 #, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
-"Nota: dpkg-divert preserva la copia antigua de este archivo, colocando la "
-"extensión \"-old\", antes de reemplazarlo con uno nuevo."
+"Utiliza I<direcciónresponsable> como el nombre y dirección de correo del "
+"responsable de esta subida, en lugar de usar la información de cambios del "
+"árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
+
+# type: TP
+#: dpkg-buildpackage.1:72
+#, fuzzy, no-wrap
+msgid "B<-D>"
+msgstr "B<-D>"
 
 # type: Plain text
-#: dpkg-divert.8:128
+#: dpkg-buildpackage.1:75
 #, fuzzy
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr "Copyright (C) 1995 Ian Jackson."
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
+msgstr ""
+"Verifica las dependencias y los conflictos; aborta el proceso si alguna no "
+"es satisfecha."
 
-# type: TH
-#: dpkg-name.1:6
-#, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-name"
+# type: TP
+#: dpkg-buildpackage.1:75
+#, fuzzy, no-wrap
+msgid "B<-d>"
+msgstr "B<-d>"
 
 # type: Plain text
-#: dpkg-name.1:9
+#: dpkg-buildpackage.1:78
 #, fuzzy
-msgid "dpkg-name - rename Debian packages to full package names"
-msgstr "dpkg-name - Renombra paquetes Debian a nombres de paquetes completos."
+msgid "Do not check build dependencies and conflicts."
+msgstr "No revisa dependencias ni conflictos."
 
-# type: Plain text
-#: dpkg-name.1:22
-#, fuzzy
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
-msgstr ""
-"B<dpkg-name> [-a|--no-architecture] [-o|--overwrite] [-s|--subdir "
-"[directorio]] [-c|--create-dir] [-h|--help] [-v|--version] [-l|--license] [-"
-"k|--symlink] [-[--] [archivos]"
+# type: TP
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
+#, fuzzy, no-wrap
+msgid "B<-W>"
+msgstr "B<-W>"
 
 # type: Plain text
-#: dpkg-name.1:33
+#: dpkg-buildpackage.1:84
 #, fuzzy
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Esta pagina de manual trata sobre B<dpkg-name> , un programa hecho en sh que "
-"ofrece una manera fácil de renombrar paquetes B<Debian> a nombres de "
-"paquetes completos. Un nombre de paquete completo consiste de "
-"E<lt>paqueteE<gt>_E<lt>versiónE<gt>_E<lt>arquitecturaE<gt>.deb tal y como "
-"está especificado en el fichero de control del paquete. La parte de "
-"E<lt>versiónE<gt> del archivo consiste en la principal versión de "
-"información opcionalmente seguido de un guión y la versión de revisión."
+"Esta opción convierte determinados errores en avisos. Sólo la usa B<dpkg-"
+"source>, pero B<dpkg-buildpackage> la reconoce y la pasa a B<dpkg-source>."
 
 # type: TP
-#: dpkg-name.1:34
-#, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<-a, --no-architecture>"
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
+#, fuzzy, no-wrap
+msgid "B<-E>"
+msgstr "B<-E>"
 
 # type: Plain text
-#: dpkg-name.1:37
+#: dpkg-buildpackage.1:92
 #, fuzzy
-msgid "The destination filename will not have the architecture information."
-msgstr "El archivo destino no incluye información sobre la arquitectura."
+msgid ""
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+msgstr ""
+"Esta opción convierte determinados errores en avisos. Sólo la usa B<dpkg-"
+"source>, pero B<dpkg-buildpackage> la reconoce y la pasa a B<dpkg-source>."
 
 # type: TP
-#: dpkg-name.1:37
-#, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<-k, --symlink>"
+#: dpkg-buildpackage.1:92
+#, fuzzy, no-wrap
+msgid "B<-nc>"
+msgstr "B<-nc>"
 
 # type: Plain text
-#: dpkg-name.1:40
+#: dpkg-buildpackage.1:95
 #, fuzzy
-msgid "Create a symlink, instead of moving."
-msgstr "Crea un enlace simbólico en vez de mover el archivo."
+msgid "Do not clean the source tree (implies B<-b>)."
+msgstr "No limpia las fuentes (implica -b)."
 
 # type: TP
-#: dpkg-name.1:40
-#, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<-o, --overwrite>"
+#: dpkg-buildpackage.1:95
+#, fuzzy, no-wrap
+msgid "B<-tc>"
+msgstr "B<-tc>"
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-buildpackage.1:101
 #, fuzzy
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
-"Los archivos existentes se sobreescriben si poseen el mismo nombre que el "
-"archivo de destino."
+"Limpia el árbol de fuentes (usando I<orden-para-obtener-root> B<debian/rules "
+"clean>)  después de que el paquete se haya creado."
 
 # type: TP
-#: dpkg-name.1:44
-#, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<-s, --subdir> [I<directorio>]"
+#: dpkg-buildpackage.1:101
+#, fuzzy, no-wrap
+msgid "B<-r>I<gain-root-command>"
+msgstr "B<-r>I<orden-para-obtener-root>"
 
 # type: Plain text
-#: dpkg-name.1:56
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
 #, fuzzy
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
-msgstr ""
-"Se moverán los archivos dentro del subdirectorio especificado. Si existe el "
-"directorio dado como argumento, los archivos se moverán dentro del "
-"directorio especificado, sino el nombre del directorio de destino se "
-"extraerá del archivo de control del paquete. El directorio de destino será "
-"`unstable/binary-E<lt>arquitecturaE<gt>/E<lt>secciónE<gt>'. Si la sección es "
-"`non-free', `contrib' o si no se encuentra ninguna sección en el archivo de "
-"control, el directorio de destino será `E<lt>secciónE<gt>/binary-"
-"E<lt>arquitecturaE<gt>'. El campo de sección no es necesario, por lo que "
-"muchos paquetes encontrarán su camino hacia el área `no-section' (`sin-"
-"sección'). Use esta opción con cuidado, es algo delicado."
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
+msgstr ""
+"Cuando B<dpkg-buildpackage> necesite ejecutar parte del proceso de "
+"construcción como root, añade el prefijo I<orden-para-obtener-root> a la "
+"orden que ejecute en caso de especificarse alguna.  I<orden-para-obtener-"
+"root> debe ser el nombre de un programa que esté en el B<PATH> y tomará como "
+"argumentos el nombre del proceso a ejecutar, así como los argumentos que "
+"éste toma.  I<orden-para-obtener-root> no debe contener espacios ni tampoco "
+"caracteres especiales del intérprete de órdenes."
 
 # type: TP
-#: dpkg-name.1:56
-#, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr "B<-c, --create-dir>"
+#: dpkg-buildpackage.1:127
+#, fuzzy, no-wrap
+msgid "B<-p>I<sign-command>"
+msgstr "B<-p>I<orden-para-firmar>"
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-buildpackage.1:152
 #, fuzzy
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
-"Esta opción puede usarse junto con la opción -s. Si no se encuentra ningún "
-"directorio de destino se crea automáticamente.  B<Use esta opción con "
-"cuidado.>"
+"Cuando B<dpkg-buildpackage> necesite ejecutar GPG o PGP para firmar el "
+"fichero fuente de control (B<.dsc>)  o un fichero B<.changes,> ejecutará "
+"I<orden-para-firmar> (buscando en su B<PATH> si es necesario) en lugar de "
+"B<pgp>.  I<orden-para-firmar> recibirá todos los argumentos que obtendría "
+"B<pgp>.  Si I<orden-para-firmar> toma los argumentos en formato GPG en vez "
+"de PGP, debe usar la opción B<-sgpg> I<orden-para-firmar> no debe contener "
+"espacios ni tampoco caracteres especiales del intérprete de órdenes."
 
 # type: TP
-#: dpkg-name.1:61
-#, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<-h, --help>"
+#: dpkg-buildpackage.1:152
+#, fuzzy, no-wrap
+msgid "B<-k>I<key-id>"
+msgstr "B<-k>I<llave-id>"
 
 # type: Plain text
-#: dpkg-name.1:64
+#: dpkg-buildpackage.1:155
 #, fuzzy
-msgid "Print a usage message and exit successfully."
-msgstr "Muestra las opciones de uso del programa y sale con éxito."
+msgid "Specify a key-ID to use when signing packages."
+msgstr "Especifica una llave-ID que se usa cuando se firman los paquetes."
 
 # type: TP
-#: dpkg-name.1:64
-#, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<-v, --version>"
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
+#: dpkg-buildpackage.1:158
 #, fuzzy
-msgid "Print version information and exit successfully."
-msgstr ""
-"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
-"Muestra en pantalla la versión correspondiente y termina el programa.\n"
-"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
-"Muestra la información de versión del programa y sale con éxito."
+msgid "Do not sign the source package."
+msgstr "No firma el paquete ni el fichero .changes, respectivamente."
 
 # type: TP
-#: dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<-l, --license>"
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "I<-B>"
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-buildpackage.1:161
 #, fuzzy
-msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
-msgstr ""
-"Muestra la información de copyright y una referencia a la licencia GNU."
+msgid "Do not sign the .changes file."
+msgstr "No firma el paquete ni el fichero .changes, respectivamente."
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
 #, fuzzy, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
-msgstr "B<dpkg-name bar-foo.deb>"
+msgid "B<-i>[I<regexp>]"
+msgstr "B<-i[E<lt>regexpE<gt>]>"
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-buildpackage.1:165
 #, fuzzy
-msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
-msgstr ""
-"El archivo `bar-foo.deb' se renombrará a bar-foo_1.0-2_i386.deb o algo "
-"similar (dependiendo de cual sea la información en la sección de control de "
-"`bar-foo.deb')."
+msgid "Passed unchanged to B<dpkg-source>."
+msgstr "Se pasa sin cambios a B<dpkg-source>."
 
 # type: TP
-#: dpkg-name.1:77
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
 #, fuzzy, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
-msgstr "B<find /root/debian/ -name '*.deb' | xargs -n 1 dpkg-name -a>"
+msgid "B<-I>I<filename>"
+msgstr "B<-n>I<nombrefichero>"
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-buildpackage.1:170
 #, fuzzy
-msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
-"dpkg-name renombrará todos los archivos con extensión `deb' dentro del "
-"directorio /root/debian y sus subdirectorios, si fuera necesario, a nombres "
-"sin información de arquitectura."
+"Se pasa sin cambios a B<dpkg-source>.  Puede repetirse en varias ocasiones."
 
 # type: TP
-#: dpkg-name.1:82
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, fuzzy, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
-msgstr "B<find -name '*.deb' | xargs -n 1 dpkg-name -a -o -s -c>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir> I<directorio>"
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
 #, fuzzy
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
 msgstr ""
-"B<No haga esto.> Sus archivos se corromperán debido a que una gran cantidad "
-"de paquetes no incluyen una sección de información.  B<No haga esto.>"
+"Cambia el directorio con la base de datos de dpkg donde también se guarda la "
+"información relativa a statoverride. Por omisión es /var/lib/dpkg."
 
 # type: TP
-#: dpkg-name.1:88
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
 #, fuzzy, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgid "B<-h>, B<--help>"
+msgstr "B<-us>, B<-uc>"
 
 # type: Plain text
-#: dpkg-name.1:91
+#: dpkg-buildpackage.1:185
 #, fuzzy
-msgid "This can be used when building new packages."
-msgstr "Esto se puede utilizar cuando se construyen nuevos paquetes."
+msgid ""
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
+msgstr ""
+"Debería ser posible especificar espacios y caracteres especiales del "
+"intérprete de órdenes en los argumentos iniciales de I<orden-para-obtener-"
+"root> y I<orden-para-firmar>."
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-buildpackage.1:192
 #, fuzzy
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
-msgstr ""
-"Algunos paquetes no siguen la misma estructura de "
-"E<lt>paqueteE<gt>_E<lt>versiónE<gt>_E<lt>arquitecturaE<gt>.deb. Los paquetes "
-"que renombre dpkg-name seguirán esta estructura. Generalmente esto no tendrá "
-"ningún impacto sobre cómo los paquetes se instalarán por dselect/dpkg, pero "
-"otras herramientas de instalación podrían depender de esta estructura."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
 
 # type: Plain text
-#: dpkg-name.1:107
-msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+#: dpkg-checkbuilddeps.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-checkbuilddeps"
+msgstr "B<dpkg-checkbuilddeps> -B [I<fichero-control>]"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:4
+#, fuzzy
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"dpkg-checkbuilddeps - comprueba las dependencias y conflictos de compilación."
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
-#, fuzzy, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
+# type: Plain text
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> -B [I<fichero-control>]"
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-checkbuilddeps.1:14
 #, fuzzy
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
-"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
-"condiciones de copia.  B<No> hay garantía alguna."
-
-# type: TH
-#: dpkg-query.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-deb"
+"Este programa comprueba que los paquetes instalados en el sistema satisfacen "
+"las dependencias y conflictos de construcción especificados en el fichero de "
+"control del paquete. Si alguna de estas condiciones no se cumple avisa y "
+"termina devolviendo un código de error distinto de cero."
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
+#: dpkg-checkbuilddeps.1:17
+#, fuzzy
+msgid ""
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
+"Por omisión se lee B<debian/control>, pero puede especificarse un fichero de "
+"control alternativo en la línea de órdenes."
 
-# type: TP
-#: dpkg-query.1:9
+# type: Plain text
+#: dpkg-checkbuilddeps.1:27
 #, fuzzy
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<patrón>...]"
+msgid ""
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
+msgstr ""
+"Ignora las líneas Build-Depends-Indep. Usar cuando se construyen paquetes "
+"independientes de la arquitectura."
 
 # type: TP
-#: dpkg-query.1:13
-#, fuzzy
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<patrón>...]"
+#: dpkg-checkbuilddeps.1:27
+#, no-wrap
+msgid "B<-h>"
+msgstr "B<-h>"
 
 # type: Plain text
-#: dpkg-query.1:17
+#: dpkg-checkbuilddeps.1:33
 #, fuzzy
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
+msgid "Copyright 2001 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
 
-# type: Plain text
-#: dpkg-query.1:21
-#, fuzzy
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
+# type: UR
+#: dpkg-checkbuilddeps.1:33
+#, fuzzy, no-wrap
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
-#: dpkg-query.1:25
+#: dpkg-checkbuilddeps.1:35
 #, fuzzy
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>joeyh@debian.orgE<gt>"
 
 # type: TP
-#: dpkg-query.1:29
+#: dpkg-distaddfile.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-distaddfile"
+msgstr "I</var/lib/dpkg/statoverride>"
+
+# type: Plain text
+#: dpkg-distaddfile.1:4
 #, fuzzy
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<fichero_paquete> ..."
+msgid "dpkg-distaddfile - add entries to debian/files"
+msgstr ""
+"B<dpkg-distaddfile> añade una entrada para un fichero dado a B<debian/files>."
 
-# type: TP
-#: dpkg-query.1:32
+# type: Plain text
+#: dpkg-distaddfile.1:8
 #, fuzzy
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg-distaddfile> [I<opciones>]I< fichero sección prioridad>"
 
-# type: TP
-#: dpkg-query.1:35
+# type: Plain text
+#: dpkg-distaddfile.1:13
 #, fuzzy
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg --version>"
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+msgstr ""
+"B<dpkg-distaddfile> añade una entrada para un fichero dado a B<debian/files>."
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-distaddfile.1:18
+#, fuzzy
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
 msgstr ""
+"B<dpkg-distaddfile> no acepta argumentos que no sean opciones comunes. Toma "
+"3 argumentos que no sean opciones: el nombre de fichero, la sección y la "
+"prioridad para el fichero B<.changes.>"
 
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
+# type: Plain text
+#: dpkg-distaddfile.1:26
+#, fuzzy
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
+"El nombre del fichero debe ser especificado relativo al directorio donde "
+"B<dpkg-genchanges> espera encontrar los archivos, habitualmente B<..>, en "
+"lugar de ser relativo al directorio donde se ejecuta B<dpkg-distaddfile.>"
 
 # type: TP
-#: dpkg-query.1:41
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<patrón>...]"
-
-# type: Plain text
-#: dpkg-query.1:50
-msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
-msgstr ""
-
-# type: Plain text
-#: dpkg-query.1:54
-#, fuzzy, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "B< dpkg -l '*vi*'>"
+msgid "B<-f>I<fileslistfile>"
+msgstr "B<-f>I<ficherolistaficheros>"
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
+#, fuzzy
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
+"Lee o escribe la lista de ficheros para subir aquí, en lugar de usar "
+"B<debian/files>.  Esta opción es aceptada por B<dpkg-gencontrol>, B<dpkg-"
+"genchanges> y B<dpkg-distaddfile>."
 
 # type: TP
-#: dpkg-query.1:60
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<patrón>...]"
+msgid "B<debian/files>"
+msgstr "B<debian/files>"
 
 # type: Plain text
-#: dpkg-query.1:67
+#: dpkg-distaddfile.1:46
 msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:67
-#, fuzzy, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<-a>|B<--startas> I<pathname>"
+# type: TH
+#: dpkg-deb.1:1
+#, no-wrap
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
 
-# type: Plain text
-#: dpkg-query.1:71
-msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+# type: TH
+#: dpkg-deb.1:1
+#, no-wrap
+msgid "2007-03-13"
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:71
-#, fuzzy, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
+# type: Plain text
+#: dpkg-deb.1:4
+#, fuzzy
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr "dpkg-deb - Herramienta de manipulación de archivos de Debian (.deb)"
+
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:13
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
+"B<dpkg-deb> empaqueta, desempaqueta, y provee información sobre los archivos "
+"de Debian."
 
-# type: TP
-#: dpkg-query.1:76
-#, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:17
+#, fuzzy
+msgid "Use B<dpkg> to install and remove packages from your system."
+msgstr "Use B<dpkg> para instalar y eliminar paquetes de su sistema."
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:27
+#, fuzzy
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
+"También puede usar B<dpkg-deb> llamando a B<dpkg> con cualquiera de las "
+"opciones que desee darle B<dpkg-deb>. B<dpkg> le mostrará lo que necesite y "
+"B<dpkg-deb> lo ejecutará por usted."
 
-# type: TP
-#: dpkg-query.1:82
+# type: Plain text
+#: dpkg-deb.1:29
 #, fuzzy, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<-n>|B<--name> I<nombre-proceso>"
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<R directorio [ archivo | directorio ]>"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-deb.1:41
+#, fuzzy
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
-
-# type: TP
-#: dpkg-query.1:86
-#, fuzzy, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence | --license>"
+"Crea un archivo de Debian desde el sistema de archivos localizado en el "
+"I<directorio>. I<El>directorio debe tener un subdirectorio B<DEBIAN> el cual "
+"contiene los archivos de información de control.  Este directorio I<no> "
+"aparecerá en el paquete binario, pero, en lugar de esto, los archivos que "
+"tenga serán puestos en el área de información del paquete binario."
 
 # type: Plain text
-#: dpkg-query.1:89
+#: dpkg-deb.1:53
 #, fuzzy
-msgid "Display licence and copyright information."
-msgstr "Muestra la versión de B<dpkg>."
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
+msgstr ""
+"A menos que usted especifique B<--nocheck>, B<dpkg-deb> leerá B<DEBIAN/"
+"control> y lo revisará. Comprobará posibles errores de sintaxis y otros "
+"problemas, y mostrará el nombre del paquete binario que se está creando.  "
+"B<dpkg-deb> también comprobará los permisos de los programas del "
+"desarrollador así como de los otros archivos que se encuentren en el "
+"directorio B<DEBIAN>."
 
 # type: Plain text
-#: dpkg-query.1:92
+#: dpkg-deb.1:60
 #, fuzzy
-msgid "Display version information."
-msgstr "Muestra la versión de B<dpkg>."
+msgid ""
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
+msgstr ""
+"Si no se especifica algún I<archivo> , entonces B<dpkg-deb> creará el "
+"paquete en el fichero I<directorio>B<.deb>."
 
-# type: TP
-#: dpkg-query.1:94
-#, fuzzy, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir> I<directorio>"
+# type: Plain text
+#: dpkg-deb.1:62
+#, fuzzy
+msgid "If the archive to be created already exists it will be overwritten."
+msgstr "Si el archivo a ser creado ya existe entonces será sobreescrito."
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:78
 #, fuzzy
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
-"Cambia el directorio con la base de datos de dpkg donde también se guarda la "
-"información relativa a statoverride. Por omisión es /var/lib/dpkg."
+"Si el segundo argumento es un directorio entonces B<dpkg-deb> escribirá al "
+"archivo I<paquete>B<_>I<versión>B<_>I<arquitectura>B<.deb>, o "
+"I<paquete>B<_>I<versión>B<.deb> si el campo B<Arquitecture> no está presente "
+"en el fichero de control del paquete.  Cuando se especifica un directorio de "
+"destino en lugar de un fichero, la opción B<--nocheck> no debería utilizarse "
+"(dado que B<dpkg-deb> necesita leer y analizar el archivo de control del "
+"paquete para determinar qué nombre de archivo usar)."
 
-# type: TP
-#: dpkg-query.1:98
+# type: Plain text
+#: dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<-r>|B<--chroot> I<directorio-raíz>"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<R archivo [ archivo-de-control ..]>"
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
-msgstr ""
+#: dpkg-deb.1:81
+#, fuzzy
+msgid "Provides information about a binary package archive."
+msgstr "Ofrece información acerca del paquete binario."
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:86
+#, fuzzy
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
+"Si se especifica I<archivo(s)-de-control> entonces imprimirá un resumen de "
+"los contenidos del paquete así como del archivo de control."
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:94
+#, fuzzy
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
+"Si se especifica algún I<archivo-de-control> B<dpkg-deb> imprimirá éstos en "
+"el orden que fueron especificados.  Si cualquiera de los componentes no "
+"estuviesen presentes, mostrará un mensaje de error a la salida de error "
+"estándar sobre cada uno de ellos y abortará con estado 2."
 
 # type: Plain text
-#: dpkg-query.1:122
-msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
-msgstr ""
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archivo>"
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
+#: dpkg-deb.1:101
+#, fuzzy
 msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
-msgstr ""
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
+msgstr "Ofrece información acerca del paquete binario."
 
 # type: Plain text
-#: dpkg-query.1:161
-msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
-msgstr ""
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
 
 # type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+#: dpkg-deb.1:104
+#, fuzzy
+msgid "Extracts control file information from a binary package archive."
 msgstr ""
-
-# type: SH
-#: dpkg-query.1:167
-#, fuzzy, no-wrap
-msgid "ENVIRONMENT"
-msgstr "VARIABLES DE ENTORNO"
+"Extrae información del fichero de control del fichero de un paquete binario."
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-deb.1:108
+#, fuzzy
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
+"Si no se especifica ningún B<control-file-field>s entonces mostrará todo el "
+"fichero de control."
 
 # type: Plain text
-#: dpkg-query.1:175
+#: dpkg-deb.1:117
 #, fuzzy
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, fuzzy, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:wakkerma@debian.org"
+msgid ""
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
+msgstr ""
+"Si se especifica algún B<dpkg-deb> mostrará sus contenidos, en el orden en "
+"el cual aparecen en el fichero de control. Si se especifica más de un "
+"B<campo-del-fichero-de-control> , entonces B<dpkg-deb> precederá cada uno "
+"con el nombre del campo (más dos puntos y espacio)."
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
+#: dpkg-deb.1:119
 #, fuzzy
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
-msgstr "dpkg-scanpackages"
-
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#, no-wrap
-msgid "2006-05-10"
+msgid "No errors are reported for fields requested but not found."
 msgstr ""
+"No se informa de ningún error para los campos que se hayan solicitados pero "
+"que no se encuentren."
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-#, fuzzy
-msgid "dpkg-scanpackages - create Packages files"
-msgstr "dpkg-scanpackages - Crea ficheros Packages."
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archivo>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
+#: dpkg-deb.1:125
 #, fuzzy
 msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>arquitE<gt>> ] I<bindir> "
-"I<fichero-override> [I<path_prefijo>] B<E<gt>> I<Packages>"
+"Lista los contenidos de la parte del archivo que contiene los archivos del "
+"sistema de ficheros. Se imprime en el formato generado por B<tar> cuando se "
+"selecciona listado extendido."
 
 # type: Plain text
-#: dpkg-scanpackages.1:43
-#, fuzzy
-msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
-msgstr ""
-"B<dpkg-scanpackages> busca paquetes binarios de Debian en un árbol de "
-"directorios y crea un fichero Packages usado por B<dselect>(8), etc, para "
-"mostrar al usuario los paquetes disponibles para su instalación. Estos "
-"ficheros Packages son idénticos a los que se encuentran en los archivos de "
-"Debian en Internet o en los CD-ROMs.  B<dpkg-scanpackages> se puede usar "
-"para crear un directorio local con paquetes para instalar en una ó varias "
-"máquinas."
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb --control> I<archivo directorio>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
+#: dpkg-deb.1:129
+#, fuzzy
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
+"Descomprime el árbol del sistema de ficheros desde el archivo del paquete en "
+"del directorio especificado."
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
+#: dpkg-deb.1:135
 #, fuzzy
 msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
-"I<bindir> es el nombre del árbol de directorios que contiene los binarios "
-"que se desea procesar (por ejemplo, B<contrib/binary-i386>).  Es mejor hacer "
-"que este directorio sea relativo al directorio principal del repositorio de "
-"Debian, porque todo fichero listado en el nuevo Packages empezará por esta "
-"cadena de caracteres."
+"Nota, ¡ I<no> obtendrá una instalación correcta si extrae un paquete en el "
+"directorio raíz! Use B<dpkg> para instalar paquetes."
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-deb.1:138
 #, fuzzy
-msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+msgid "I<directory> (but not its parents) will be created if necessary."
 msgstr ""
-"I<fichero-override> es el nombre del fichero que contiene información acerca "
-"de como los paquetes se instalan en la distribución, vea más abajo."
+"El I<directorio> (pero no los directorios previos) será creado si fuera "
+"necesario."
+
+# type: Plain text
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb --control> I<archivo directorio>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-deb.1:143
 #, fuzzy
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
-"I<path_prefijo> es un parámetro opcional que se antepondrá en el campo del "
-"nombre de los archivos."
+"B<--vextract> (B<-X>)  Muestra una lista de los archivos extraídos mientras "
+"que con la opción B<--extract> (B<-x>)  no mostrará nada a menos que ocurra "
+"un error."
 
 # type: Plain text
-#: dpkg-scanpackages.1:71
-#, fuzzy
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr ""
-"Si se especifica la opción I<-u> , se buscan ficheros *.udeb en vez de *.deb."
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<archivo>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-deb.1:151
 #, fuzzy
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
-"Cuando se especifica -aI<E<lt>arquitE<gt>>, en vez de buscar todo tipo de "
-"debs, se usa un patrón basado en *_all.deb y *_arch.deb."
+"Descomprime el árbol del sistema de archivos de un paquete binarios y lo "
+"envía hacia la salida estándar en formato B<tar>.  Si se utiliza junto con "
+"B<tar>(1)  se puede utilizar para descomprimir un fichero concreto de un "
+"paquete."
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
-msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
-msgstr ""
-
-# type: SH
-#: dpkg-scanpackages.1:81
+#: dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr "EL FICHERO OVERRIDE"
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb --control> I<archivo directorio>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-deb.1:155
 #, fuzzy
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
-"Mientras que la mayoría de la información acerca de los paquetes se "
-"encuentre en el fichero de control, parte de esta información debe de ser "
-"rellenada por los encargados de planificar la distribución en vez de por los "
-"mantenedores, porque es información relacionada con el ordenamiento de los "
-"archivos para el lanzamiento de la distribución, más que dependencias reales "
-"o descripciones del paquete. Este tipo de información se encuentra en el "
-"fichero de override."
+"Descomprime los ficheros de información de control de un paquete dentro del "
+"directorio especificado."
 
 # type: Plain text
-#: dpkg-scanpackages.1:91
+#: dpkg-deb.1:159
 #, fuzzy
 msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
-"El fichero override tiene un formato simple, está delimitado por espacios en "
-"blanco. Los comentarios van precedidos de B<#>)."
-
-# type: Plain text
-#: dpkg-scanpackages.1:97
-#, fuzzy
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
-msgstr "I<paquete> I<prioridad> I<sección> [I<información_del_mantenedor>]"
+"Si no se especifica ningún directorio se usará el subdirectorio B<DEBIAN> en "
+"el directorio actual."
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-deb.1:162
 #, fuzzy
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"I<paquete> El nombre del paquete.  Las entradas en el fichero de override de "
-"un paquete no encontrado en el directorio son descartadas."
+"El directorio de destino (pero no los directorios previos) será creado si "
+"fuera necesario."
+
+# type: TP
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
+#, fuzzy, no-wrap
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence | --license>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
-#, fuzzy
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
-"I<prioridad> y I<sección> colocan el paquete en el árbol de directorios de "
-"la distribución; esta información no debe de encontrarse en el fichero de "
-"control. Si el paquete se encuentra en un subdirectorio de I<bindir>, se "
-"tendrá en cuenta la I<sección>."
 
-# type: Plain text
-#: dpkg-scanpackages.1:119
-#, fuzzy
-msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+# type: TP
+#: dpkg-deb.1:173
+#, no-wrap
+msgid "B<--showformat=>I<format>"
 msgstr ""
-"I<información_del_mantenedor>, si está presente, puede ser el nombre del "
-"mantenedor para un fichero de override incondicional , o bien I<antiguo "
-"mantenedor> B<=E<gt>> I<nuevo mantenedor> para hacer una substitución."
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
-#, fuzzy
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
-"Los ficheros override que se usan para hacer las listas de paquetes "
-"oficiales, suelen encontrarse en el directorio I<índices> en cualquier "
-"réplica de Debian."
-
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
-#, fuzzy, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNÓSTICOS"
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
-#, fuzzy
+#: dpkg-deb.1:187
 msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
-"B<dpkg-scanpackages> devuelve los errores auto-explicativos comunes.  Además "
-"avisa acerca de paquetes que están en el subdirectorio equivocado, "
-"duplicados, tienen un campo de nombre en su fichero de control, no aparecen "
-"en el fichero de override, o contienen alguna sustitución de mantenedor que "
-"no ha tenido efecto."
 
 # type: Plain text
-#: dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr ""
 
-# type: TH
-#: dpkg-scansources.1:1
+# type: TP
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "dpkg-scansources"
+msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:4
-#, fuzzy
+#: dpkg-deb.1:193
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
-"dpkg-scansources - Busca ficheros '.dsc' y construye los índices 'Sources'"
+
+# type: TP
+#: dpkg-deb.1:193
+#, fuzzy, no-wrap
+msgid "B<-Z>I<compress_type>"
+msgstr "B<-p>I<paquete>"
 
 # type: Plain text
-#: dpkg-scansources.1:13
-#, fuzzy
+#: dpkg-deb.1:198
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
-"\\&B<dpkg-scansources> [switch]... I<bindir> [I<fichero-override> [I<path-"
-"prefijo>]] E<gt> Sources"
+
+# type: TP
+#: dpkg-deb.1:198
+#, no-wrap
+msgid "B<--new>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-deb.1:203
 #, fuzzy
 msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
-"<dpkg-scansources> busca ficheros I<.dsc> en un árbol de directorios "
-"I<bindir> dado.  Estos son usados para crear un índice de Sources de Debian, "
-"que es mostrado por la salida estándar."
+"Asegura que B<dpkg-deb> construye un `nuevo' formato de archivo. Éste es el "
+"comportamiento por defecto."
 
-# type: Plain text
-#: dpkg-scansources.1:29
-#, fuzzy
-msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
-msgstr ""
-"Si se proporciona un I<fichero-override>, este se usará para fijar "
-"prioridades en el índice resultante y sobreescribir el campo del mantenedor "
-"dado en los ficheros \\&I<.dsc>. Lea dpkg-scanpackages para saber más acerca "
-"del formato de este fichero. \\s-1NB:\\s0 El fichero de override está "
-"indexado por paquetes binarios, no por fuentes, esto crea un pequeño "
-"problema. La implementación actual usa la prioridad más alta de los paquetes "
-"binarios producidos por un fichero I<.dsc> como la prioridad del paquete con "
-"las fuentes, y la entrada de override del primer paquete listado el fichero "
-"I<.dsc> para modificar la información sobre el mantenedor. Esto puede "
-"cambiar en un futuro."
+# type: TP
+#: dpkg-deb.1:203
+#, no-wrap
+msgid "B<--old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-deb.1:211
 #, fuzzy
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
-"Si se proporciona I<path-prefijo>, se antepondrá al campo del directorio en "
-"el índice de Sources generado. Normalmente se usará para hacer que el campo "
-"de directorio contenga el path desde el directorio padre del archivo Debian."
+"Fuerza B<dpkg-deb> a construir un `antiguo' formato de archivo.  Este "
+"formato antiguo de archivo es más dificil de analizar por herramientas que "
+"no formen parte de Debian, por lo que ahora es obsoleto. Sólo se usa cuando "
+"se construyen paquetes que serán analizados por versiones de dpkg previas a "
+"la version 0.93.76 (septiembre 1995), la cual se distribuyó sólo para i386 "
+"en formato a.out"
 
 # type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-deb.1:217
+#, fuzzy
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
+"Impide las comprobaciones habituales de B<dpkg-deb --build>'s sobre los "
+"contenidos del archivo. Puede construir cualquier archivo que desee, no "
+"importa lo mal que esté."
 
 # type: IP
-#: dpkg-scansources.1:45 install-info.8:272
+#: dpkg-deb.1:217
 #, fuzzy, no-wrap
-msgid "B<--debug>"
+msgid "B<-D>, B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-scansources.1:47
-#, fuzzy
-msgid "Turn debugging on."
-msgstr "Activa la depuración."
-
-# type: Plain text
-#: dpkg-scansources.1:49
+#: dpkg-deb.1:220
 #, fuzzy
-msgid "Show the usage message and die."
-msgstr "Muestra el modo de uso y termina."
-
-# type: IP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-n>, B<--no-sort>"
+msgid "Enables debugging output. This is not very interesting."
+msgstr "Habilita los mensajes de depuración. No son muy interesantes."
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-deb.1:226
 #, fuzzy
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
-"No ordenar el índice de fuentes. Normalmente se ordena por el nombre de los "
-"paquetes fuente."
-
-# type: IP
-#: dpkg-scansources.1:52
-#, fuzzy, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-s>, B<--source-override> I<fichero>"
+"B<dpkg-deb -I> I<B package1 .deb> I<B package2 .deb> no hace lo que debe "
+"hacer."
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-deb.1:230
 #, fuzzy
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
-"Usar I<fichero> como el fichero de override de las fuentes. Por omisión es "
-"el mismo que se especificó para el fichero de override con un I<.src> "
-"añadido."
+"No existe ningún tipo de autentificación en los arhivos B<.deb> de hecho, no "
+"hay ni siquiera una código de comprobación directo."
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-deb.1:237
 #, fuzzy
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
-"El fichero de override de las fuentes está en un formato distinto del "
-"fichero de override de los paquetes binarios. Contiene solamente dos campos "
-"separados por espacios en blanco, el primer campo es el nombre del paquete "
-"fuente y el segundo es la sección. Las líneas en blanco y de comentarios se "
-"descartan. Si un paquete aparece en ambos ficheros, el campo sección del "
-"fichero override de las fuentes tiene preferencia."
-
-# type: Plain text
-#: dpkg-scansources.1:63
-#, fuzzy
-msgid "Print the version number and exit."
-msgstr "Muestra la versión y termina."
+"¡No use B<dpkg-deb> para instalar software! Debe usar B<dpkg> para "
+"asegurarse de que todos los archivos se instalan en el sitio correcto, que "
+"los guiones del paquete se ejecutan y que los contenidos de éste se "
+"registran."
 
 # type: Plain text
-#: dpkg-scansources.1:66
-#, fuzzy
-msgid "B<dpkg-scanpackages>(1)."
-msgstr "\\&I<dpkg-scanpackages>\\|(1)"
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-scansources.1:68
+#: dpkg-deb.1:252
 #, fuzzy
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
-msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+msgid ""
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
+msgstr ""
+"B<dpkg-deb> y esta página de manual, fué escrita por Ian Jackson. Son "
+"Copyright (c) 1995-1996 suyos, y se distribuyen bajo la Licencia Publica de "
+"GNU.  No se ofrece NINGUNA garantía.  Consulte B</usr/share/doc/dpkg/"
+"copyright> y B</usr/share/common-licenses/GPL> para más información"
 
 # type: TH
-#: dpkg-source.1:2
+#: dpkg-divert.8:1
 #, no-wrap
-msgid "dpkg-source"
+msgid "dpkg-divert"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-divert.8:4
 #, fuzzy
-msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
-msgstr ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Herramientas para los "
-"paquetes fuente de Debian."
+msgid "dpkg-divert - override a package's version of a file"
+msgstr "dpkg-divert - redefine la versión de paquete de un archivo"
 
 # type: Plain text
-#: dpkg-source.1:12
+#: dpkg-divert.8:9
 #, fuzzy
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
-msgstr "B<dpkg-source> B<-x >I<fichero>B<.dsc>"
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-source.1:15
-#, fuzzy
+#: dpkg-divert.8:13
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
-"B<dpkg-source -b> [I<opciones>] I<directorio> [I<directorio-origen>|'']"
 
 # type: Plain text
-#: dpkg-source.1:18
+#: dpkg-divert.8:23
 #, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg-gencontrol> [I<opciones>]"
+msgid ""
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
+msgstr ""
+"La `redirección' de archivos es una forma de forzar a dpkg para no instalar "
+"un archivo en su ubicación, sino en una ubicación `redirigida'. Las "
+"redirecciones se pueden usar a través de los scripts en los paquetes Debian "
+"para mover un archivo cuando causa conflicto. Los administradores de sistema "
+"pueden usarlo también para redefinir algún archivo de configuración de "
+"paquete, o cuando algunos archivos (que no están marcados como 'conffiles') "
+"deben ser preservados por dpkg, si se instala una nueva versión del paquete "
+"que contiene estos archivos."
 
-# type: Plain text
-#: dpkg-source.1:21
-#, fuzzy
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-shlibdeps> I<opciones>"
+# type: TP
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<-n>I<nombrefichero>"
 
 # type: Plain text
-#: dpkg-source.1:24
-#, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg-genchanges> [I<opciones>]"
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:27
-#, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg-buildpackage> [I<opciones>]"
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "I<--remove E<lt>ficheroE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:30
-#, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg-distaddfile> [I<opciones>]I< fichero sección prioridad>"
+#: dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:33
-#, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg-parsechangelog> [I<opciones>]"
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "I<--list [E<lt>patrón-globalE<gt>]>"
 
 # type: Plain text
-#: dpkg-source.1:36
-#, fuzzy
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
-msgstr "B<dpkg-source> empaqueta y desempaqueta ficheros fuente de Debian."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
+msgstr ""
+
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "I<--rename>"
 
 # type: Plain text
-#: dpkg-source.1:42
-#, fuzzy
-msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
-"B<dpkg-gencontrol> lee información desde un árbol de fuentes Debian "
-"desempaquetado y genera un fichero de control (por omisión ubicado en debian/"
-"tmp/DEBIAN/control); también añade una entrada para el paquete binario en "
-"B<debian/files.>"
+
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir> I<directorio>"
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-divert.8:42
 #, fuzzy
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
-"B<dpkg-shlibdeps> calcula las dependencias de bibliotecas compartidas de los "
-"ejecutables suministrados sus argumentos. Las dependencias se añaden al "
-"fichero de variables de sustitución B<debian/substvars> como nombres "
-"variables B<shlibs:>I<campodependencia> donde I<campodependencia> es un "
-"nombre de campo de dependencia. Cualquier otra variable que empiece con "
-"I<shlibs:> se elimina del fichero.  B<dpkg-shlibdeps> leerá la información "
-"de las dependencias de bibliotecas compartidas de B<debian/shlibs.local,> B</"
-"etc/dpkg/shlibs.override,> el área B<shlibs> del fichero de control del "
-"paquete que contiene el fichero que B<objdump> informa como satisfactorio "
-"para la dependencia de la biblioteca, o bien B</etc/dpkg/shlibs.default>.  "
-"Se usará el primero de ellos. Véase el I<manual de empaquetamiento de "
-"Debian> para más detalles sobre el formato de los ficheros de dependencias "
-"de bibliotecas compartidas."
+"Define el directorio de datos de dpkg a E<lt>directorioE<gt> (por omisión: /"
+"var/lib/dpkg)."
 
-# type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
-msgstr ""
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "I<--divert E<lt>redirigir-aE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-divert.8:46
 #, fuzzy
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
-"B<dpkg-genchanges> lee información desde un árbol de fuentes Debian "
-"desempaquetado y construido, así como de los ficheros que ha generado y crea "
-"un archivo de control de subida de Debian (fichero B<.changes> )."
-
+"E<lt>paqueteE<gt> es el nombre de un paquete cuya copia de E<lt>ficheroE<gt> "
+"no se redigirá."
+
+# type: TP
+#: dpkg-divert.8:46
+#, fuzzy, no-wrap
+msgid "B<--local>"
+msgstr "I<--local>"
+
 # type: Plain text
-#: dpkg-source.1:80
-#, fuzzy
+#: dpkg-divert.8:52
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
-"B<dpkg-buildpackage> es un script de control que puede ser usado para "
-"automatizar la construcción de un paquete."
+
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "I<--package E<lt>paqueteE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:84
+#: dpkg-divert.8:57
 #, fuzzy
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+msgid ""
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
-"B<dpkg-distaddfile> añade una entrada para un fichero dado a B<debian/files>."
+"E<lt>paqueteE<gt> es el nombre de un paquete cuya copia de E<lt>ficheroE<gt> "
+"no se redigirá."
+
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
+
+# type: Plain text
+#: dpkg-divert.8:60
+#, fuzzy
+msgid "Quiet mode, i.e. no verbose output."
+msgstr "Modo silencioso, esto es: sin información detallada."
+
+# type: TP
+#: dpkg-divert.8:60
+#, fuzzy, no-wrap
+msgid "B<--rename>"
+msgstr "I<--rename>"
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-divert.8:64
 #, fuzzy
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
-"B<dpkg-parsechangelog> lee y procesa el registro de cambios de un árbol de "
-"fuentes Debian desempaquetado y muestra la información ahí contenida en la "
-"salida estándar en un formato legible por la máquina."
+"Mueve el archivo a un lado (o atrás). dpkg-divert abortará la operación en "
+"caso de que el archivo destino ya exista."
+
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, no-wrap
+msgid "B<--test>"
+msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-divert.8:67
 #, fuzzy
-msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
-"Ninguna de estas órdenes permite combinar múltiples opciones en una sola.  "
-"Tampoco permiten que el valor de una opción se especifique como argumento "
-"aparte."
+"Modo de prueba, esto es: no realiza ningún cambio, solo muestra su ejecución."
 
 # type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
+#: dpkg-divert.8:74
 #, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "OPCIONES COMUNES"
+msgid "NOTES"
+msgstr "NOTAS"
 
 # type: Plain text
-#: dpkg-source.1:96
+#: dpkg-divert.8:78
 #, fuzzy
 msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
-"Muchos de estos programas comparten opciones; éstas se describen aquí, junto "
-"con los programas que las aceptan."
+"Cuando se añade, por omisión se usa --local y --divert E<lt>originalE<gt>."
+"distrib.  Cuando se elimina, --package o --local y --divert deben coincidir "
+"si se especifican."
 
-# type: TP
-#: dpkg-source.1:96
-#, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-us>, B<-uc>"
+# type: Plain text
+#: dpkg-divert.8:80
+#, fuzzy
+msgid "Directories can't be diverted with B<dpkg-divert>."
+msgstr "Los directorios no pueden ser redirigidos con dpkg-divert."
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-divert.8:86
 #, fuzzy
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
-"Muestra la versión y el modo de uso del programa, incluyendo un resumen de "
-"las opciones disponibles. Esta opción es aceptada por todas las herramientas "
-"para los paquetes fuente de Debian."
+"Debe de tenerse cuidado cuando se redireccionen bibliotecas compartidas, "
+"ldconfig (8) crea un enlace simbólico basado en el campo DT_SONAME empotrado "
+"en la biblioteca. Ya que ldconfig no hace caso de las redirecciones (sólo "
+"dpkg lo hace), si una biblioteca redirigida tiene el mismo SONAME que la que "
+"no está redirigida, es posible que el enlace simbólico acabe apuntando a la "
+"biblioteca redirigida."
 
 # type: Plain text
-#: dpkg-source.1:106
-#, fuzzy
+#: dpkg-divert.8:91
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
-"Muestra la versión y el modo de uso del programa, incluyendo un resumen de "
-"las opciones disponibles. Esta opción es aceptada por todas las herramientas "
-"para los paquetes fuente de Debian."
 
-# type: TP
-#: dpkg-source.1:106
-#, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<-v>I<versión>"
+# type: Plain text
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:114
-#, fuzzy
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
+msgstr ""
+
+# type: Plain text
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
+msgstr ""
+
+# type: Plain text
+#: dpkg-divert.8:101
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
-"En B<dpkg-buildpackage>, B<dpkg-genchanges> y B<dpkg-parsechangelog> provoca "
-"que se use la información de los cambios de todas las versiones "
-"estrictamente posteriores a I<versión .>"
 
 # type: Plain text
-#: dpkg-source.1:119
-#, fuzzy
+#: dpkg-divert.8:103
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
+msgstr ""
+
+# type: Plain text
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
-"En B<dpkg-gencontrol> establece la versión del paquete binario que se "
-"generará."
 
 # type: TP
-#: dpkg-source.1:119
+#: dpkg-divert.8:109
 #, fuzzy, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B<-C>I<descripcióndecambios>"
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-divert.8:114
 #, fuzzy
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
-"Lee la descripción de los cambios del fichero I<descripcióndecambios> en vez "
-"de usar la información contenida en el fichero de cambios (changelog)  del "
-"árbol de fuentes. Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
-
-# type: TP
-#: dpkg-source.1:126
-#, fuzzy, no-wrap
-msgid "B<-m>I<maintaineraddress>"
-msgstr "B<-m>I<direcciónresponsable>"
+"Archivo que contiene la lista actual de redirecciones del sistema. Esta "
+"ubicado en el directorio de administración de dpkg, así como otros archivos "
+"importantes para dpkg, como `status' o `available'."
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-divert.8:117
 #, fuzzy
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
-"Utiliza I<direcciónresponsable> como el nombre y dirección de correo del "
-"responsable de este paquete, en lugar de usar la información de control del "
-"árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
+"Nota: dpkg-divert preserva la copia antigua de este archivo, colocando la "
+"extensión \"-old\", antes de reemplazarlo con uno nuevo."
 
-# type: TP
-#: dpkg-source.1:134
+# type: Plain text
+#: dpkg-divert.8:123
+#, fuzzy
+msgid "Copyright (C) 1995 Ian Jackson."
+msgstr "Copyright (C) 1995 Ian Jackson."
+
+# type: TH
+#: dpkg-genchanges.1:1
 #, fuzzy, no-wrap
-msgid "B<-e>I<maintaineraddress>"
-msgstr "B<-e>I<direcciónresponsable>"
+msgid "dpkg-genchanges"
+msgstr "dpkg-scanpackages"
+
+# type: Plain text
+#: dpkg-genchanges.1:4
+#, fuzzy
+msgid "dpkg-genchanges - generate Debian .changes files"
+msgstr "dpkg-scanpackages - Crea ficheros Packages."
+
+# type: Plain text
+#: dpkg-genchanges.1:8
+#, fuzzy
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg-genchanges> [I<opciones>]"
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:16
 #, fuzzy
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
-"Utiliza I<direcciónresponsable> como el nombre y dirección de correo del "
-"responsable de esta subida, en lugar de usar la información de cambios del "
-"árbol de fuentes.  Aceptada por B<dpkg-buildpackage> y B<dpkg-genchanges>."
+"B<dpkg-genchanges> lee información desde un árbol de fuentes Debian "
+"desempaquetado y construido, así como de los ficheros que ha generado y crea "
+"un archivo de control de subida de Debian (fichero B<.changes> )."
+
+# type: Plain text
+#: dpkg-genchanges.1:23
+#, fuzzy
+msgid ""
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
+msgstr ""
+"En B<dpkg-buildpackage>, B<dpkg-genchanges> y B<dpkg-parsechangelog> provoca "
+"que se use la información de los cambios de todas las versiones "
+"estrictamente posteriores a I<versión .>"
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, fuzzy, no-wrap
 msgid "B<-si>, B<-sa>, B<-sd>"
 msgstr "B<-si>, B<-sa>, B<-sd>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-genchanges.1:49
 #, fuzzy
 msgid ""
 "These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 "Estas opciones controlan si el fichero de fuentes original se incluye en la "
 "subida generada por B<dpkg-buildpackage> y B<dpkg-genchanges> en caso de que "
 "se produzca alguna fuente (por ejemplo, si no se han usado B<-b> o B<-B>)."
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 #, fuzzy
 msgid ""
 "By default, or if B<-si> is specified, the original source will be included "
@@ -5962,7 +5715,7 @@ msgstr ""
 "o B<1>."
 
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 #, fuzzy
 msgid ""
 "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
@@ -5972,17 +5725,16 @@ msgstr ""
 "e incluye sólo el diff."
 
 # type: TP
-#: dpkg-source.1:163
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
 #, fuzzy, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nombre>B<=>I<valor>"
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 #, fuzzy
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 "Establece una variable de sustitución de salida. Aceptada por B<dpkg-"
@@ -5990,65 +5742,49 @@ msgstr ""
 "exposición sobre la sustitución de salida."
 
 # type: TP
-#: dpkg-source.1:169
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<-T>I<fichvarsust>"
 
 # type: Plain text
-#: dpkg-source.1:179
-#, fuzzy
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
-"Lee (o, para B<dpkg-shlibdeps>, escribe) las variables de sustitución en "
-"I<fichvarsust> ; por omisión, éste es B<debian/substvars>.  Esta opción es "
-"aceptada por B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> y B<dpkg-"
-"genchanges>."
 
 # type: TP
-#: dpkg-source.1:179
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 #, fuzzy, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<campo>B<=>I<valor>"
 
 # type: Plain text
-#: dpkg-source.1:184
-#, fuzzy
-msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
-"Sobreescribe o añade un campo del fichero de control de salida.  Esta opción "
-"es aceptada por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges>."
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
 #, fuzzy, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<campo>"
 
 # type: Plain text
-#: dpkg-source.1:189
-#, fuzzy
-msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
-"Elimina un campo del fichero de control de salida.  Esta opción es aceptada "
-"por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges>."
 
 # type: TP
-#: dpkg-source.1:189
+#: dpkg-genchanges.1:78
 #, fuzzy, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
+msgid "B<-b>, B<-B>, B<-S>"
 msgstr "B<-b>|B<-B>|B<-S>"
 
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-genchanges.1:101
 #, fuzzy
 msgid ""
 "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
@@ -6071,84 +5807,67 @@ msgstr ""
 "changes> para todos aquellos ficheros generados por los objetivos B<binary-"
 "*> del paquete en construcción."
 
-# type: Plain text
-#: dpkg-source.1:217
-#, fuzzy
-msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
-msgstr ""
-"B<-b> le dice a B<dpkg-source> que construya un paquete fuente (en vez de "
-"extraer uno) - vea más abajo."
-
 # type: TP
-#: dpkg-source.1:217
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
 #, fuzzy, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr "B<-c>I<ficherocontrol>"
 
 # type: Plain text
-#: dpkg-source.1:224
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 #, fuzzy
 msgid ""
 "Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"is B<debian/control>."
 msgstr ""
 "Especifica el fichero de control del paquete fuente principal del que leer "
 "la información. Por omisión es B<debian/control>.  Esta opción es aceptada "
 "por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges>."
 
 # type: TP
-#: dpkg-source.1:224
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
 #, fuzzy, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr "B<-l>I<ficherocambios>"
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 #, fuzzy
 msgid ""
 "Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"B<debian/changelog>."
 msgstr ""
 "Especifica el fichero de cambios del que leer la información. Por omisión es "
 "B<debian/changelog>.  Esta opción es aceptada por B<dpkg-source>, B<dpkg-"
 "gencontrol> y B<dpkg-genchanges>."
 
-# type: TP
-#: dpkg-source.1:231
-#, fuzzy, no-wrap
-msgid "B<-f>I<fileslistfile>"
-msgstr "B<-f>I<ficherolistaficheros>"
-
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-genchanges.1:115
 #, fuzzy
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 "Lee o escribe la lista de ficheros para subir aquí, en lugar de usar "
 "B<debian/files>.  Esta opción es aceptada por B<dpkg-gencontrol>, B<dpkg-"
 "genchanges> y B<dpkg-distaddfile>."
 
 # type: TP
-#: dpkg-source.1:237
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
 #, fuzzy, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr "B<-F>I<formatocambios>"
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 #, fuzzy
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
 "special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"the debian standard format."
 msgstr ""
 "Especifica el formato del fichero de cambios. Por omisión el formato se lee "
 "de una línea especial cerca del final del fichero de cambios (vea el manual "
@@ -6158,5269 +5877,6083 @@ msgstr ""
 "genchanges>."
 
 # type: TP
-#: dpkg-source.1:244
+#: dpkg-genchanges.1:120
 #, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<-W>"
+msgid "B<-u>I<uploadfilesdir>"
+msgstr "B<-u>I<directoriosubidaficheros>"
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-genchanges.1:131
 #, fuzzy
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
-"Esta opción convierte determinados errores en avisos. Sólo la usa B<dpkg-"
-"source>, pero B<dpkg-buildpackage> la reconoce y la pasa a B<dpkg-source>."
+"Busca archivos para subir en I<directoriosubidaficheros> en lugar de en B<.."
+"> (B<dpkg-genchanges> necesita encontrar estos ficheros para poder incluir "
+"sus tamaños y sumas de verificación en el fichero B<.changes>)."
 
 # type: TP
-#: dpkg-source.1:251
+#: dpkg-genchanges.1:131
 #, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<-E>"
+msgid "B<-q>"
+msgstr "B<-q>"
 
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-genchanges.1:139
 #, fuzzy
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
-"Esta opción niega una opción B<-W> establecida previamente. Actualmente sólo "
-"es aceptada por B<dpkg-buildpackage> y B<dpkg-source>."
-
-# type: SH
-#: dpkg-source.1:257
-#, fuzzy, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "OPCIONES DE DPKG-SOURCE"
+"Habitualmente B<dpkg-genchanges> producirá mensajes informativos en la "
+"salida de error estándar, por ejemplo acerca de cuántos de los ficheros "
+"fuente de los paquetes se están subiendo.  B<-q> suprime dichos mensajes."
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-genchanges.1:155
 #, fuzzy
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
-"Cuando se usan las opciones comunes B<-c> y B<-l> con rutas relativas, éstas "
-"se interpretan empezando en el directorio superior del árbol de fuentes."
-
-# type: TP
-#: dpkg-source.1:262
+"La lista de ficheros generados que forman parte de la subida al servidor en "
+"preparación.  B<dpkg-gencontrol> añade aquí los supuestos nombres de fichero "
+"de paquetes binarios cuyos ficheros de control genera; B<dpkg-distaddfile> "
+"puede utilizarse para añadir ficheros adicionales.  B<dpkg-genchanges> lee "
+"los datos de aquí cuando produce un fichero B<.changes>."
+
+# type: Plain text
+#: dpkg-gencontrol.1:1
 #, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<-x>"
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
+
+# type: Plain text
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:8
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg-gencontrol> [I<opciones>]"
 
 # type: Plain text
-#: dpkg-source.1:272
+#: dpkg-gencontrol.1:15
 #, fuzzy
 msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
-"Extrae un paquete fuente. Se debe suministrar un argumento que no sea una "
-"opción, el nombre del fichero de control de fuente de Debian (B<.dsc>)."
+"B<dpkg-gencontrol> lee información desde un árbol de fuentes Debian "
+"desempaquetado y genera un fichero de control (por omisión ubicado en debian/"
+"tmp/DEBIAN/control); también añade una entrada para el paquete binario en "
+"B<debian/files.>"
 
 # type: Plain text
-#: dpkg-source.1:280
+#: dpkg-gencontrol.1:20
 #, fuzzy
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
-"Ninguna opción es útil con B<dpkg-source -x>.  B<dpkg-source> lee los "
-"nombres de los demás ficheros que componen el paquete fuente del fichero de "
-"control; se asume que están en el mismo directorio que el B<.dsc>."
+"En B<dpkg-gencontrol> establece la versión del paquete binario que se "
+"generará."
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-gencontrol.1:24
 #, fuzzy
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
-"Los permisos y propietarios de los ficheros del paquete extraído serán los "
-"mismos que se esperarían si los ficheros hubiesen sido simplemente creados - "
-"0777 para directorios y ejecutables y 0666 para el resto de ficheros, ambos "
-"modificados según el umask del extractor; si el directorio superior tiene "
-"activado el bit setgid, los directorios extraídos lo tendrán también, y "
-"todos los ficheros y directorios heredarán su grupo de permisos."
+"Establece una variable de sustitución de salida. Aceptada por B<dpkg-"
+"source>, B<dpkg-gencontrol> y B<dpkg-genchanges>.  Más abajo encontrará una "
+"exposición sobre la sustitución de salida."
 
 # type: TP
-#: dpkg-source.1:288
+#: dpkg-gencontrol.1:55
 #, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<-b>"
+msgid "B<-p>I<package>"
+msgstr "B<-p>I<paquete>"
 
 # type: Plain text
-#: dpkg-source.1:303
+#: dpkg-gencontrol.1:62
 #, fuzzy
 msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
-"Construye: empaqueta un árbol de fuentes. Se deben proporcionar uno o dos "
-"argumentos que no sean opciones. El primero se tomará como el nombre del "
-"directorio que contiene el árbol de fuentes descomprimido. Si hay un segundo "
-"argumento, debe ser el nombre del directorio de fuentes o del fichero tar "
-"original o la cadena vacía si el paquete es específico de Debian y por tanto "
-"carece de diffs \"debianizantes\". Si no se proporciona un segundo "
-"argumento, entonces B<dpkg-source> buscará el archivo tar original "
-"I<paquete>B<_>I<versióndeldesarrolladorppal>B<.orig.tar.gz> o el directorio "
-"de fuentes original I<directorio>B<.orig> o la cadena vacía (sin fuentes "
-"originales y por tanto sin diff), en función de los argumentos."
+"Genera información para el paquete binario I<paquete>.  Si el archivo de "
+"control de la fuente lista sólo un paquetes binario, esta opción puede ser "
+"omitida; de otra manera, es esencial seleccionar el paquete binario del cual "
+"se desea generar información."
 
 # type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+#: dpkg-gencontrol.1:62
 #, fuzzy, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr "B<-i[E<lt>regexpE<gt>]>"
+msgid "B<-n>I<filename>"
+msgstr "B<-n>I<nombrefichero>"
 
 # type: Plain text
-#: dpkg-source.1:311
+#: dpkg-gencontrol.1:67
 #, fuzzy
 msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
-"Puede especificar una expresión regular de Perl para indicar aquellos "
-"ficheros que desee excluir de la lista de ficheros para el diff (esta lista "
-"es generada con una orden find). Por sí mismo, B<-i> activa la opción con un "
-"filtro predeterminado que elimina los ficheros y directorios de control de "
-"los sistemas de control de versiones más comunes, los ficheros de respaldo, "
-"los ficheros swap y los directorios que se generan como resultado de las "
-"operaciones de Libtool."
+"Asume que el nombre de fichero del paquete será I<nombrefichero> en vez del "
+"habitual, paquete_versión_arquitectura.deb."
+
+# type: TP
+#: dpkg-gencontrol.1:67
+#, fuzzy, no-wrap
+msgid "B<-is>, B<-ip>, B<-isp>"
+msgstr "B<-is>, B<-ip>, B<-isp>"
 
 # type: Plain text
-#: dpkg-source.1:323
-#, fuzzy
+#: dpkg-gencontrol.1:76
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
-"Esta opción es muy útil para eliminar ficheros extraños que se incluyen en "
-"el .diff.gz, (como \"debian/BUGS_TODO/*\" o \"debian/RCS/*,v\"). Por "
-"ejemplo, si mantiene un paquete que sigue a través de CVS remoto, donde no "
-"tiene permisos de acceso para escribir los ficheros de control de Debian ni "
-"para crear etiquetas para I<cvs-buildpackage(1)>, es necesario realizar una "
-"copia/actualización adicional en un directorio que se mantenga limpio, para "
-"generar el .orig.tar.gz. Ese directorio contendrá ficheros CVS/Entries que "
-"tienen fechas distintas de los que están en su directorio de trabajo, "
-"haciendo por tanto que sean incluidos de manera innecesaria en cada .diff."
-"gz, a menos que utilice la opción B<-i>."
 
 # type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+#: dpkg-gencontrol.1:76
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<-IE<lt>nombredeficheroE<gt>>"
+msgid "B<-P>I<packagebuilddir>"
+msgstr "B<-P>I<directoriocreaciónpaquete>"
 
 # type: Plain text
-#: dpkg-source.1:330
+#: dpkg-gencontrol.1:89
 #, fuzzy
 msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
-"Si se especifica esta opción, el nombre de fichero se pasará como parámetro "
-"a la opción --exclude de tar para generar el fichero .orig.tar.gz o .tar."
-"gz.  Por ejemplo, -ICVS hará que tar se salte los directorios CVS cuando "
-"genere el fichero .tar.gz. La opción puede ser repetida varias ocasiones "
-"para permitir la expulsión de varios nombres de fichero."
+"Le dice a B<dpkg-source> que el paquete está siendo creado en "
+"I<directoriocreaciónpaquete> en vez de B<debian/tmp>.  Se usa para encontrar "
+"el valor por omisión de la variable de substitución y campo del fichero de "
+"control B<Installed-Size> - Tamaño-Instalado - (usando B<du>), y para "
+"establecer la ruta del fichero de salida."
 
 # type: TP
-#: dpkg-source.1:330
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
 #, fuzzy, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>"
+msgid "B<-O>"
+msgstr "B<-O>"
 
 # type: Plain text
-#: dpkg-source.1:345
+#: dpkg-gencontrol.1:98
 #, fuzzy
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
-"Si se especifican B<-sk> o B<-sp>, B<dpkg-source> espera la fuente original "
-"como un archivo tar, por omisión I<paquete>B<_>I<versióndesarrolladorppal>B<."
-"orig.tar.gz>.  La fuente original se dejará en el sitio como un archivo tar, "
-"o será copiada al directorio actual en caso de no estar ya ahí presente.  Si "
-"se usa B<-sp> en lugar de B<-sk>, se eliminará de nuevo posteriormente."
+"Muestra el fichero de control por la salida estándar, en lugar de B<debian/"
+"tmp/DEBIAN/control> (o I<directoriocreaciónpaquete>B</DEBIAN/control> si se "
+"usó la opción B<-P>."
+
+# type: TP
+#: dpkg-gencontrol.1:106
+#, fuzzy, no-wrap
+msgid "B<debian/control>"
+msgstr "B<debian/control>"
 
 # type: Plain text
-#: dpkg-source.1:357
+#: dpkg-gencontrol.1:111
 #, fuzzy
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
-"Si se especifican B<-su> o B<-sr>, se espera que la fuente original sea un "
-"directorio, por omisión I<paquete>B<->I<versióndeldesarrolladorppal>B<.orig> "
-"y B<dpkg-source> creará un fichero de fuentes nuevo a partir de él. Si se "
-"usa B<-sr ,> B<dpkg-source eliminará dicho directorio tras la operación .>"
+"El fichero de información de control de fuentes principal, que da "
+"información independiente de la versión sobre el paquete fuente y los "
+"paquetes binarios que puede producir."
 
 # type: Plain text
-#: dpkg-source.1:368
+#: dpkg-gencontrol.1:118
 #, fuzzy
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
-"Si se especifica B<-ss>, B<dpkg-source> esperará que la fuente original esté "
-"disponible tanto como directorio como fichero tar. Usará el directorio para "
-"crear el diff y el fichero tar para crear el B<.dsc>.  Esta opción debe "
-"usarse con precaución - si el directorio y el archivo tar no coinciden se "
-"generará un fichero fuente inválido."
+"La lista de ficheros generados que forman parte de la subida al servidor en "
+"preparación.  B<dpkg-gencontrol> añade aquí los supuestos nombres de fichero "
+"de paquetes binarios cuyos ficheros de control genera; B<dpkg-distaddfile> "
+"puede utilizarse para añadir ficheros adicionales.  B<dpkg-genchanges> lee "
+"los datos de aquí cuando produce un fichero B<.changes>."
+
+# type: TH
+#: dpkg-name.1:6
+#, no-wrap
+msgid "dpkg-name"
+msgstr "dpkg-name"
 
 # type: Plain text
-#: dpkg-source.1:377
+#: dpkg-name.1:9
 #, fuzzy
-msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
-msgstr ""
-"Si se especifica B<-sn>, B<dpkg-source> no buscará ninguna fuente original y "
-"no generará un diff. El segundo argumento, en caso de haberlo, debe ser la "
-"cadena vacía. Esta opción se usa en paquetes específicos de Debian que no "
-"tienen fuentes del desarrollador principal y por tanto carecen de diffs "
-"\"debianizantes\"."
+msgid "dpkg-name - rename Debian packages to full package names"
+msgstr "dpkg-name - Renombra paquetes Debian a nombres de paquetes completos."
 
 # type: Plain text
-#: dpkg-source.1:406
+#: dpkg-name.1:15
 #, fuzzy
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
-msgstr ""
-"Si se especifican B<-sa> o B<-sA>, B<dpkg-source> buscará la fuente original "
-"como directorio o como fichero tar - el segundo argumento, de haberlo, puede "
-"ser cualquiera de las dos cosas o la cadena vacía (equivalente a usar B<-"
-"sn>).  Si se encuentra un fichero tar, se desempaquetará para crear el diff "
-"y será eliminado posteriormente (equivalente a B<-sp>); si se encuentra un "
-"directorio, se empaquetará para crear la fuente original y será eliminado "
-"posteriormente (equivalente a B<-sr>); si no se encuentra ninguno de los "
-"dos, se asume que el paquete no tiene diffs \"debianizantes\", únicamente un "
-"fichero de fuentes (equivalente a B<-sn>).  Si se encuentran ambos, B<dpkg-"
-"source> ignorará el directorio, sobreescribiéndolo, si se especificó B<-sA> "
-"(equivalente a B<-sP>), o ocurrirá un error si se especificó B<-sa>.  B<-sA> "
-"es la opción predeterminada."
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg-divert> [opciones] [--add] I<E<lt>ficheroE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-name.1:27
 #, fuzzy
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> y B<-sr> no sobreescriben directorios o "
-"ficheros tar existentes. Si esto es lo que se desea, debe utilizar B<-sA>, "
-"B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
-
-# type: TP
-#: dpkg-source.1:412
-#, fuzzy, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr "B<-sp>,B<-su>,B<-sn> con B<-x>"
-
-# type: Plain text
-#: dpkg-source.1:415
-#, fuzzy
-msgid "In all cases any existing original source tree will be removed."
-msgstr "En todos los casos cualquier árbol de fuentes original será eliminado."
-
-# type: Plain text
-#: dpkg-source.1:422
-#, fuzzy
-msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
-msgstr ""
-"Si se usa B<-sp> a la hora de extraer, la fuente original (si la hay) se "
-"dejará como un fichero tar. Si no se encuentra en el directorio actual o si "
-"existe un fichero pero es diferente, se copiará ahí. Ésta es la acción por "
-"omisión."
+"Esta pagina de manual trata sobre B<dpkg-name> , un programa hecho en sh que "
+"ofrece una manera fácil de renombrar paquetes B<Debian> a nombres de "
+"paquetes completos. Un nombre de paquete completo consiste de "
+"E<lt>paqueteE<gt>_E<lt>versiónE<gt>_E<lt>arquitecturaE<gt>.deb tal y como "
+"está especificado en el fichero de control del paquete. La parte de "
+"E<lt>versiónE<gt> del archivo consiste en la principal versión de "
+"información opcionalmente seguido de un guión y la versión de revisión."
 
-# type: Plain text
-#: dpkg-source.1:425
-#, fuzzy
-msgid "B<-su> unpacks the original source tree."
-msgstr "B<-su> desempaqueta el archivo de fuentes original."
+# type: TP
+#: dpkg-name.1:29
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-name.1:32
 #, fuzzy
-msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
-msgstr ""
-"B<-sn> se asegura de que la fuente original ni se copia al directorio actual "
-"ni se desempaqueta. Cualquier árbol de fuentes original existente en el "
-"directorio actual es eliminado."
-
-# type: Plain text
-#: dpkg-source.1:435
-msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
-msgstr ""
+msgid "The destination filename will not have the architecture information."
+msgstr "El archivo destino no incluye información sobre la arquitectura."
 
-# type: SH
-#: dpkg-source.1:435
+# type: TP
+#: dpkg-name.1:32
 #, fuzzy, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "OPCIONES DE DPKG-GENCONTROL"
+msgid "B<-k>, B<--symlink>"
+msgstr "B<-k, --symlink>"
 
 # type: Plain text
-#: dpkg-source.1:438
+#: dpkg-name.1:35
 #, fuzzy
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-msgstr "B<dpkg-gencontrol> no acepta ningún argumento que no sea de opción."
+msgid "Create a symlink, instead of moving."
+msgstr "Crea un enlace simbólico en vez de mover el archivo."
 
 # type: TP
-#: dpkg-source.1:438
+#: dpkg-name.1:35
 #, fuzzy, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<-p>I<paquete>"
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<-o, --overwrite>"
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-name.1:39
 #, fuzzy
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
-"Genera información para el paquete binario I<paquete>.  Si el archivo de "
-"control de la fuente lista sólo un paquetes binario, esta opción puede ser "
-"omitida; de otra manera, es esencial seleccionar el paquete binario del cual "
-"se desea generar información."
+"Los archivos existentes se sobreescriben si poseen el mismo nombre que el "
+"archivo de destino."
 
 # type: TP
-#: dpkg-source.1:445
+#: dpkg-name.1:39
 #, fuzzy, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<-n>I<nombrefichero>"
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<-s, --subdir> [I<directorio>]"
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-name.1:51
 #, fuzzy
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
-"Asume que el nombre de fichero del paquete será I<nombrefichero> en vez del "
-"habitual, paquete_versión_arquitectura.deb."
+"Se moverán los archivos dentro del subdirectorio especificado. Si existe el "
+"directorio dado como argumento, los archivos se moverán dentro del "
+"directorio especificado, sino el nombre del directorio de destino se "
+"extraerá del archivo de control del paquete. El directorio de destino será "
+"`unstable/binary-E<lt>arquitecturaE<gt>/E<lt>secciónE<gt>'. Si la sección es "
+"`non-free', `contrib' o si no se encuentra ninguna sección en el archivo de "
+"control, el directorio de destino será `E<lt>secciónE<gt>/binary-"
+"E<lt>arquitecturaE<gt>'. El campo de sección no es necesario, por lo que "
+"muchos paquetes encontrarán su camino hacia el área `no-section' (`sin-"
+"sección'). Use esta opción con cuidado, es algo delicado."
 
 # type: TP
-#: dpkg-source.1:450
+#: dpkg-name.1:51
 #, fuzzy, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
-msgstr "B<-is>, B<-ip>, B<-isp>"
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-c, --create-dir>"
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-name.1:56
+#, fuzzy
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
+"Esta opción puede usarse junto con la opción -s. Si no se encuentra ningún "
+"directorio de destino se crea automáticamente.  B<Use esta opción con "
+"cuidado.>"
 
 # type: TP
-#: dpkg-source.1:459
+#: dpkg-name.1:59
 #, fuzzy, no-wrap
-msgid "B<-P>I<packagebuilddir>"
-msgstr "B<-P>I<directoriocreaciónpaquete>"
+msgid "B<-v>, B<--version>"
+msgstr "B<-v, --version>"
 
-# type: Plain text
-#: dpkg-source.1:472
-#, fuzzy
-msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
-msgstr ""
-"Le dice a B<dpkg-source> que el paquete está siendo creado en "
-"I<directoriocreaciónpaquete> en vez de B<debian/tmp>.  Se usa para encontrar "
-"el valor por omisión de la variable de substitución y campo del fichero de "
-"control B<Installed-Size> - Tamaño-Instalado - (usando B<du>), y para "
-"establecer la ruta del fichero de salida."
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<-l, --license>"
 
 # type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
+#: dpkg-name.1:67
 #, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<-O>"
+msgid "B<dpkg-name bar-foo.deb>"
+msgstr "B<dpkg-name bar-foo.deb>"
 
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-name.1:72
 #, fuzzy
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
-"Muestra el fichero de control por la salida estándar, en lugar de B<debian/"
-"tmp/DEBIAN/control> (o I<directoriocreaciónpaquete>B</DEBIAN/control> si se "
-"usó la opción B<-P>."
+"El archivo `bar-foo.deb' se renombrará a bar-foo_1.0-2_i386.deb o algo "
+"similar (dependiendo de cual sea la información en la sección de control de "
+"`bar-foo.deb')."
 
-# type: SH
-#: dpkg-source.1:482
+# type: TP
+#: dpkg-name.1:72
 #, fuzzy, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
-msgstr "OPCIONES DE DPKG-SHLIBDEPS"
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr "B<find /root/debian/ -name '*.deb' | xargs -n 1 dpkg-name -a>"
 
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-name.1:77
 #, fuzzy
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
-"B<dpkg-shlibdeps> interpreta cualquier argumento que no sea una opción como "
-"nombre de un fichero ejecutable, igual que si se hubiesen proporcionado como "
-"B<-e>I<ejecutable>."
+"dpkg-name renombrará todos los archivos con extensión `deb' dentro del "
+"directorio /root/debian y sus subdirectorios, si fuera necesario, a nombres "
+"sin información de arquitectura."
 
 # type: TP
-#: dpkg-source.1:487
+#: dpkg-name.1:77
 #, fuzzy, no-wrap
-msgid "B<-e>I<executable>"
-msgstr "B<-e>I<ejecutable>"
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgstr "B<find -name '*.deb' | xargs -n 1 dpkg-name -a -o -s -c>"
 
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-name.1:83
 #, fuzzy
 msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
-"Incluye dependencias apropiadas para las bibliotecas compartidas requeridas "
-"por I<ejecutable>."
+"B<No haga esto.> Sus archivos se corromperán debido a que una gran cantidad "
+"de paquetes no incluyen una sección de información.  B<No haga esto.>"
 
 # type: TP
-#: dpkg-source.1:491
+#: dpkg-name.1:83
 #, fuzzy, no-wrap
-msgid "B<-d>I<dependencyfield>"
-msgstr "B<-d>I<campodependencia>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 
 # type: Plain text
-#: dpkg-source.1:497
+#: dpkg-name.1:86
 #, fuzzy
-msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
-msgstr ""
-"Añade dependencias al campo I<campodependencia> del fichero de control. (Las "
-"dependencias para este campo se colocan en la variable B<shlibs:"
-">I<campodependencia>)."
+msgid "This can be used when building new packages."
+msgstr "Esto se puede utilizar cuando se construyen nuevos paquetes."
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-name.1:96
 #, fuzzy
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
-"La opción B<-d>I<campodependencia> tiene efecto para todos los ejecutables "
-"después de dicha opción, hasta el siguiente B<-d>I<campodependencia>.  Por "
-"omisión, el I<campodependencia> es B<Depends>."
+"Algunos paquetes no siguen la misma estructura de "
+"E<lt>paqueteE<gt>_E<lt>versiónE<gt>_E<lt>arquitecturaE<gt>.deb. Los paquetes "
+"que renombre dpkg-name seguirán esta estructura. Generalmente esto no tendrá "
+"ningún impacto sobre cómo los paquetes se instalarán por dselect/dpkg, pero "
+"otras herramientas de instalación podrían depender de esta estructura."
 
 # type: Plain text
-#: dpkg-source.1:515
-#, fuzzy
+#: dpkg-name.1:104
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 msgstr ""
-"Si la misma dependencia (o un conjunto de alternativas) aparece en más de "
-"uno de los nombres de campo de dependencias reconocidos: B<Pre-Depends>, "
-"B<Depends>, B<Recommends>, B<Enhances> o B<Suggests>, entonces B<dpkg-"
-"shlibdeps> eliminará automáticamente la dependencia de todos los campos, "
-"exceptuando aquel que contenga las dependencias más importantes."
-
-# type: TP
-#: dpkg-source.1:515
-#, fuzzy, no-wrap
-msgid "B<-p>I<varnameprefix>"
-msgstr "B<-p>I<prefijodevariable>"
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-name.1:111
 #, fuzzy
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
-"Provoca que las variables de sustitución empiecen por I<prefijodevariable>B<:"
-"> en vez de B<shlibs:>.  Asimismo, cualquier variable de sustitución ya "
-"existente que empiece por I<prefijodevariable>B<:> (en vez de B<shlibs:>)  "
-"será eliminada del fichero de variables de sustitución."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
+"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
+"condiciones de copia.  B<No> hay garantía alguna."
 
-# type: TP
-#: dpkg-source.1:526
+# type: Plain text
+#: dpkg-parsechangelog.1:1
 #, fuzzy, no-wrap
-msgid "B<-L>I<localshlibsfile>"
-msgstr "B<-L>I<ficherodeshlibslocal>"
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg-parsechangelog> [I<opciones>]"
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-parsechangelog.1:4
 #, fuzzy
-msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
-msgstr ""
-"Provoca que B<dpkg-shlibs> lea la información sobre dependencias con "
-"bibliotecas compartidas desde I<ficherodeshlibslocal> en vez de B<debian/"
-"shlibs.local>."
+msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgstr "dpkg-scanpackages - Crea ficheros Packages."
+
+# type: Plain text
+#: dpkg-parsechangelog.1:8
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg-parsechangelog> [I<opciones>]"
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-parsechangelog.1:14
 #, fuzzy
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
-"Provoca que las propiedades de las variables de sustitución sean mostradas "
-"por la salida estándar, en lugar de añadirse al archivo de variables de "
-"sustitución (por omisión B<debian/substvars>)."
+"B<dpkg-parsechangelog> lee y procesa el registro de cambios de un árbol de "
+"fuentes Debian desempaquetado y muestra la información ahí contenida en la "
+"salida estándar en un formato legible por la máquina."
 
 # type: TP
-#: dpkg-source.1:540
+#: dpkg-parsechangelog.1:26
 #, fuzzy, no-wrap
-msgid "B<-t>I<type>"
-msgstr "B<-p>I<paquete>"
+msgid "B<-L>I<libdir>"
+msgstr "B<-U>I<campo>"
 
 # type: Plain text
-#: dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:549
-#, fuzzy, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr "OPCIONES DE DPKG-GENCHANGES"
-
-# type: Plain text
-#: dpkg-source.1:552
-#, fuzzy
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
-msgstr "B<dpkg-genchanges> no acepta ningún argumento que no sea una opción."
-
 # type: TP
-#: dpkg-source.1:552
+#: dpkg-parsechangelog.1:41
 #, fuzzy, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr "B<-u>I<directoriosubidaficheros>"
+msgid "B<debian/changelog>"
+msgstr "B<debian/changelog>"
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-parsechangelog.1:47
 #, fuzzy
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
-"Busca archivos para subir en I<directoriosubidaficheros> en lugar de en B<.."
-"> (B<dpkg-genchanges> necesita encontrar estos ficheros para poder incluir "
-"sus tamaños y sumas de verificación en el fichero B<.changes>)."
+"El fichero de cambios, usado para obtener información dependiente de la "
+"versión acerca del paquete fuente, como la urgencia y la distribución de una "
+"subida, los cambios realizados desde una versión en concreto y el propio "
+"número de versión de la fuente."
 
-# type: TP
-#: dpkg-source.1:563
+# type: TH
+#: dpkg-query.1:1
 #, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<-q>"
+msgid "dpkg-query"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-source.1:571
-#, fuzzy
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
-"Habitualmente B<dpkg-genchanges> producirá mensajes informativos en la "
-"salida de error estándar, por ejemplo acerca de cuántos de los ficheros "
-"fuente de los paquetes se están subiendo.  B<-q> suprime dichos mensajes."
-
-# type: SH
-#: dpkg-source.1:571
-#, fuzzy, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
-msgstr "OPCIONES DE DPKG-BUILDPACKAGE"
 
 # type: Plain text
-#: dpkg-source.1:574
+#: dpkg-query.1:8
 #, fuzzy
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr "B<dpkg-buildpackage> no acepta ningún argumento que no sea una opción."
-
-# type: TP
-#: dpkg-source.1:574
-#, fuzzy, no-wrap
-msgid "B<-k>I<key-id>"
-msgstr "B<-k>I<llave-id>"
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-source.1:577
-#, fuzzy
-msgid "Specify a key-ID to use when signing packages."
-msgstr "Especifica una llave-ID que se usa cuando se firman los paquetes."
+#: dpkg-query.1:12
+msgid ""
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:577
+#: dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-r>I<gain-root-command>"
-msgstr "B<-r>I<orden-para-obtener-root>"
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
-#, fuzzy
+#: dpkg-query.1:23
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
-"Cuando B<dpkg-buildpackage> necesite ejecutar parte del proceso de "
-"construcción como root, añade el prefijo I<orden-para-obtener-root> a la "
-"orden que ejecute en caso de especificarse alguna.  I<orden-para-obtener-"
-"root> debe ser el nombre de un programa que esté en el B<PATH> y tomará como "
-"argumentos el nombre del proceso a ejecutar, así como los argumentos que "
-"éste toma.  I<orden-para-obtener-root> no debe contener espacios ni tampoco "
-"caracteres especiales del intérprete de órdenes."
 
-# type: TP
-#: dpkg-source.1:603
+# type: Plain text
+#: dpkg-query.1:27
 #, fuzzy, no-wrap
-msgid "B<-p>I<sign-command>"
-msgstr "B<-p>I<orden-para-firmar>"
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: dpkg-source.1:628
-#, fuzzy
+#: dpkg-query.1:33
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
-"Cuando B<dpkg-buildpackage> necesite ejecutar GPG o PGP para firmar el "
-"fichero fuente de control (B<.dsc>)  o un fichero B<.changes,> ejecutará "
-"I<orden-para-firmar> (buscando en su B<PATH> si es necesario) en lugar de "
-"B<pgp>.  I<orden-para-firmar> recibirá todos los argumentos que obtendría "
-"B<pgp>.  Si I<orden-para-firmar> toma los argumentos en formato GPG en vez "
-"de PGP, debe usar la opción B<-sgpg> I<orden-para-firmar> no debe contener "
-"espacios ni tampoco caracteres especiales del intérprete de órdenes."
 
 # type: TP
-#: dpkg-source.1:628
+#: dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-tc>"
-msgstr "B<-tc>"
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
-#: dpkg-source.1:634
-#, fuzzy
+#: dpkg-query.1:40
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
-"Limpia el árbol de fuentes (usando I<orden-para-obtener-root> B<debian/rules "
-"clean>)  después de que el paquete se haya creado."
 
 # type: TP
-#: dpkg-source.1:634
+#: dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<-us>, B<-uc>"
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-a>|B<--startas> I<pathname>"
 
 # type: Plain text
-#: dpkg-source.1:637
-#, fuzzy
-msgid "Do not sign the source package or the .changes file, respectively."
-msgstr "No firma el paquete ni el fichero .changes, respectivamente."
+#: dpkg-query.1:44
+msgid ""
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
+#: dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<-a>I<arquitectura>"
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<dpkg -i> | B<--install> I<fichero_paquete>..."
 
 # type: Plain text
-#: dpkg-source.1:642
-#, fuzzy
+#: dpkg-query.1:49
 msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
-"Especifica la arquitectura de Debian para la cual construimos el paquete. La "
-"arquitectura de la máquina en la que construimos el paquete es detectada "
-"automáticamente y es también la arquitectura de destino por omisión para la "
-"máquina."
-
-# type: Plain text
-#: dpkg-source.1:646
-#, fuzzy
-msgid "Passed unchanged to B<dpkg-source>."
-msgstr "Se pasa sin cambios a B<dpkg-source>."
 
 # type: Plain text
-#: dpkg-source.1:651
-#, fuzzy
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
-msgstr ""
-"Se pasa sin cambios a B<dpkg-source>.  Puede repetirse en varias ocasiones."
-
-# type: TP
-#: dpkg-source.1:651
+#: dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<-D>"
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<R archivo [ archivo-de-control ...]>"
 
 # type: Plain text
-#: dpkg-source.1:654
-#, fuzzy
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
+#: dpkg-query.1:55
+msgid ""
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
-"Verifica las dependencias y los conflictos; aborta el proceso si alguna no "
-"es satisfecha."
 
 # type: TP
-#: dpkg-source.1:654
+#: dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<-d>"
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-n>|B<--name> I<nombre-proceso>"
 
 # type: Plain text
-#: dpkg-source.1:657
-#, fuzzy
-msgid "Do not check build dependencies and conflicts."
-msgstr "No revisa dependencias ni conflictos."
+#: dpkg-query.1:59
+msgid ""
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:657
-#, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<-nc>"
-
-# type: Plain text
-#: dpkg-source.1:660
-#, fuzzy
-msgid "Do not clean the source tree(implies -b)."
-msgstr "No limpia las fuentes (implica -b)."
-
-# type: SH
-#: dpkg-source.1:660
+#: dpkg-query.1:74
 #, fuzzy, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
-msgstr "ARGUMENTOS DE DPKG-DISTADDFILE"
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-r>|B<--chroot> I<directorio-raíz>"
 
 # type: Plain text
-#: dpkg-source.1:666
-#, fuzzy
-msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
-"B<dpkg-distaddfile> no acepta argumentos que no sean opciones comunes. Toma "
-"3 argumentos que no sean opciones: el nombre de fichero, la sección y la "
-"prioridad para el fichero B<.changes.>"
 
 # type: Plain text
-#: dpkg-source.1:674
-#, fuzzy
+#: dpkg-query.1:87
+#, no-wrap
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
-"El nombre del fichero debe ser especificado relativo al directorio donde "
-"B<dpkg-genchanges> espera encontrar los archivos, habitualmente B<..>, en "
-"lugar de ser relativo al directorio donde se ejecuta B<dpkg-distaddfile.>"
-
-# type: SH
-#: dpkg-source.1:674
-#, fuzzy, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
-msgstr "ARGUMENTOS DE DPKG-PARSECHANGELOG"
 
 # type: Plain text
-#: dpkg-source.1:677
-#, fuzzy
+#: dpkg-query.1:92
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
-"B<dpkg-parsechangelog> no acepta argumentos que no sean opciones comunes."
-
-# type: SH
-#: dpkg-source.1:677
-#, fuzzy, no-wrap
-msgid "VARIABLE SUBSTITUTION"
-msgstr "SUSTITUCIÓN DE VARIABLES"
 
 # type: Plain text
-#: dpkg-source.1:687
-#, fuzzy
+#: dpkg-query.1:98
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
-"Antes de que B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges> "
-"escriban su información de control (al fichero B<.dsc> de control en el caso "
-"de B<dpkg-source> y a la salida estándar en el de B<dpkg-gencontrol> y "
-"B<dpkg-genchanges>)  realizan algunas sustituciones de variables en el "
-"fichero de salida."
 
 # type: Plain text
-#: dpkg-source.1:694
-#, fuzzy
+#: dpkg-query.1:129
+#, no-wrap
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
-msgstr ""
-"Una variable de sustitución tiene la forma B<${>I<nombre-de-variable>B<}>.  "
-"Los nombres de variable consisten en caracteres alfanuméricos, guiones y dos "
-"puntos (:), y comienzan siempre por un alfanumérico. La sustitución de "
-"variables se lleva a cabo repetidamente hasta que no queda ninguna; el texto "
-"completo del campo tras la sustitución es revisado de nuevo en busca de más "
-"sustituciones."
-
-# type: Plain text
-#: dpkg-source.1:701
-#, fuzzy
-msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
-"Después de que todas las sustituciones hayan tenido lugar, cada aparición de "
-"la cadena B<${}> (que no es una sustitución legal) se reemplaza por un "
-"símbolo B<$>."
 
 # type: Plain text
-#: dpkg-source.1:714
-#, fuzzy
+#: dpkg-query.1:137
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
-"Las variables pueden establecerse usando la opción común B<-V>.  También "
-"pueden especificarse en el fichero B<debian/substvars> (u otro fichero "
-"especificado usando la opción B<-T>).  Este fichero consiste en líneas de la "
-"forma I<nombre = valor >.  Los caracteres en blanco al final de cada línea, "
-"las líneas vacías y las líneas que comiencen con el símbolo B<#> "
-"(comentarios) son ignorados."
 
 # type: Plain text
-#: dpkg-source.1:716
-#, fuzzy
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
-"De manera adicional, las siguientes variables estándar están disponibles:"
 
-# type: TP
-#: dpkg-source.1:716
+# type: SH
+#: dpkg-query.1:143
 #, fuzzy, no-wrap
-msgid "B<Arch>"
-msgstr "B<Arch>"
+msgid "ENVIRONMENT"
+msgstr "VARIABLES DE ENTORNO"
 
 # type: Plain text
-#: dpkg-source.1:720
-#, fuzzy
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-query.1:148
+msgid ""
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
-"La arquitectura de construcción actual (de B<dpkg --print-architecture>)."
-
-# type: TP
-#: dpkg-source.1:720
-#, fuzzy, no-wrap
-msgid "B<source:Version>"
-msgstr "B<Source-Version>"
 
 # type: Plain text
-#: dpkg-source.1:723
+#: dpkg-query.1:151
 #, fuzzy
-msgid "The source package version."
-msgstr "La versión del paquete fuente (del fichero de cambios)."
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr "Copyright 2000 Wichert Akkerman"
 
-# type: TP
-#: dpkg-source.1:723
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, fuzzy, no-wrap
-msgid "B<source:Upstream-Version>"
-msgstr "B<dpkg:UpstreamVersion>"
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: dpkg-source.1:727
+#: dpkg-query.1:153 dpkg-statoverride.8:85
 #, fuzzy
-msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
-msgstr "La versión de desarrollador principal de dpkg."
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
-# type: TP
-#: dpkg-source.1:727
-#, fuzzy, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<dpkg:Version>"
+# type: TH
+#: dpkg-scanpackages.1:16
+#, no-wrap
+msgid "dpkg-scanpackages"
+msgstr "dpkg-scanpackages"
+
+# type: Plain text
+#: dpkg-scanpackages.1:19
+#, fuzzy
+msgid "dpkg-scanpackages - create Packages files"
+msgstr "dpkg-scanpackages - Crea ficheros Packages."
 
 # type: Plain text
-#: dpkg-source.1:731
+#: dpkg-scanpackages.1:28
+#, fuzzy
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
-
-# type: TP
-#: dpkg-source.1:731
-#, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<Source-Version>"
+"\\&B<dpkg-scansources> [switch]... I<bindir> [I<fichero-override> [I<path-"
+"prefijo>]] E<gt> Sources"
 
 # type: Plain text
-#: dpkg-source.1:736
+#: dpkg-scanpackages.1:41
+#, fuzzy
 msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
+"B<dpkg-scanpackages> busca paquetes binarios de Debian en un árbol de "
+"directorios y crea un fichero Packages usado por B<dselect>(8), etc, para "
+"mostrar al usuario los paquetes disponibles para su instalación. Estos "
+"ficheros Packages son idénticos a los que se encuentran en los archivos de "
+"Debian en Internet o en los CD-ROMs.  B<dpkg-scanpackages> se puede usar "
+"para crear un directorio local con paquetes para instalar en una ó varias "
+"máquinas."
 
-# type: TP
-#: dpkg-source.1:736
-#, fuzzy, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<Installed-Size>"
+# type: Plain text
+#: dpkg-scanpackages.1:51
+msgid ""
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:745
+#: dpkg-scanpackages.1:58
 #, fuzzy
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
-"El tamaño total de los ficheros del paquete instalado. Este valor se copia "
-"en el campo del fichero de control correspondiente; establecerlo modifica el "
-"valor de dicho campo. Si la variable no está establecida, B<dpkg-gencontrol> "
-"usará B<du -k debian/tmp> para hallar el valor predeterminado."
-
-# type: TP
-#: dpkg-source.1:745
-#, fuzzy, no-wrap
-msgid "B<Extra-Size>"
-msgstr "B<Extra-Size>"
+"I<bindir> es el nombre del árbol de directorios que contiene los binarios "
+"que se desea procesar (por ejemplo, B<contrib/binary-i386>).  Es mejor hacer "
+"que este directorio sea relativo al directorio principal del repositorio de "
+"Debian, porque todo fichero listado en el nuevo Packages empezará por esta "
+"cadena de caracteres."
 
 # type: Plain text
-#: dpkg-source.1:754
+#: dpkg-scanpackages.1:62
 #, fuzzy
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
-"Espacio en disco adicional usado cuando se instala el paquete. Si esta "
-"variable está establecida, su valor se añade al de la variable B<Installed-"
-"Size> (tanto si se establece manualmente como si se usa el valor "
-"predeterminado)  antes de copiarse al campo B<Installed-Size> del fichero de "
-"control."
-
-# type: TP
-#: dpkg-source.1:754
-#, fuzzy, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<F:>I<nombrecampo>"
+"I<fichero-override> es el nombre del fichero que contiene información acerca "
+"de como los paquetes se instalan en la distribución, vea más abajo."
 
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-scanpackages.1:65
 #, fuzzy
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
-"El valor del campo de salida I<nombrecampo> (que debe darse siguiendo la "
-"convención de mayúsculas/minúsculas).  Establecer estas variables no tiene "
-"ningún efecto excepto en aquellos lugares donde se expandan explícitamente."
-
-# type: TP
-#: dpkg-source.1:761
-#, fuzzy, no-wrap
-msgid "B<Format>"
-msgstr "B<Format>"
+"I<path_prefijo> es un parámetro opcional que se antepondrá en el campo del "
+"nombre de los archivos."
 
 # type: Plain text
-#: dpkg-source.1:771
-#, fuzzy
+#: dpkg-scanpackages.1:69
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
-"El formato del fichero B<.changes> generado por esta versión de los scripts "
-"de empaquetamiento de fuentes.  Si establece esta variable el contenido del "
-"campo B<Format> en el fichero B<.changes> cambiará igualmente."
 
 # type: TP
-#: dpkg-source.1:771
+#: dpkg-scanpackages.1:71
 #, fuzzy, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
-msgstr "B<Newline>, B<Space>, B<Tab>"
+msgid "B<-u>, B<--udeb>"
+msgstr "B<-us>, B<-uc>"
 
 # type: Plain text
-#: dpkg-source.1:774
+#: dpkg-scanpackages.1:74
 #, fuzzy
-msgid "These variables each hold the corresponding character."
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
-"Estas variables contienen cada una el carácter cuyo nombre especifican en "
-"inglés. Nota del traductor: Newline = Terminación de línea, Space = Espacio, "
-"Tab = Tabulador."
+"Si se especifica la opción I<-u> , se buscan ficheros *.udeb en vez de *.deb."
 
 # type: TP
-#: dpkg-source.1:774
+#: dpkg-scanpackages.1:74
 #, fuzzy, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
-msgstr "B<shlibs:>I<campodedependencia>"
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<directorio>"
 
 # type: Plain text
-#: dpkg-source.1:779
-#, fuzzy
+#: dpkg-scanpackages.1:78
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
-"Las variables con nombres de esta forma son generadas por B<dpkg-shlibdeps> "
-"- vea más arriba."
 
 # type: TP
-#: dpkg-source.1:779
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg:UpstreamVersion>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:782
-#, fuzzy
-msgid "The upstream version of dpkg."
-msgstr "La versión de desarrollador principal de dpkg."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
+msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
+# type: SH
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
 #, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg:Version>"
-
-# type: Plain text
-#: dpkg-source.1:785
-#, fuzzy
-msgid "The full version of dpkg."
-msgstr "La versión completa de dpkg."
+msgid "DIAGNOSTICS"
+msgstr "DIAGNÓSTICOS"
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-scanpackages.1:94
 #, fuzzy
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
-"Si se hace referencia a una variable que no existe, se genera un aviso y se "
-"asume un valor vacío."
+"B<dpkg-scanpackages> devuelve los errores auto-explicativos comunes.  Además "
+"avisa acerca de paquetes que están en el subdirectorio equivocado, "
+"duplicados, tienen un campo de nombre en su fichero de control, no aparecen "
+"en el fichero de override, o contienen alguna sustitución de mantenedor que "
+"no ha tenido efecto."
 
-# type: TP
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "B<debian/control>"
+# type: Plain text
+#: dpkg-scanpackages.1:99
+#, fuzzy
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+
+# type: TH
+#: dpkg-scansources.1:1
+#, no-wrap
+msgid "dpkg-scansources"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-scansources.1:4
 #, fuzzy
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
-"El fichero de información de control de fuentes principal, que da "
-"información independiente de la versión sobre el paquete fuente y los "
-"paquetes binarios que puede producir."
-
-# type: TP
-#: dpkg-source.1:794
-#, fuzzy, no-wrap
-msgid "B<debian/changelog>"
-msgstr "B<debian/changelog>"
+"dpkg-scansources - Busca ficheros '.dsc' y construye los índices 'Sources'"
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-scansources.1:13
 #, fuzzy
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
-"El fichero de cambios, usado para obtener información dependiente de la "
-"versión acerca del paquete fuente, como la urgencia y la distribución de una "
-"subida, los cambios realizados desde una versión en concreto y el propio "
-"número de versión de la fuente."
-
-# type: TP
-#: dpkg-source.1:800
-#, fuzzy, no-wrap
-msgid "B<debian/files>"
-msgstr "B<debian/files>"
+"\\&B<dpkg-scansources> [switch]... I<bindir> [I<fichero-override> [I<path-"
+"prefijo>]] E<gt> Sources"
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-scansources.1:18
 #, fuzzy
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
-"La lista de ficheros generados que forman parte de la subida al servidor en "
-"preparación.  B<dpkg-gencontrol> añade aquí los supuestos nombres de fichero "
-"de paquetes binarios cuyos ficheros de control genera; B<dpkg-distaddfile> "
-"puede utilizarse para añadir ficheros adicionales.  B<dpkg-genchanges> lee "
-"los datos de aquí cuando produce un fichero B<.changes>."
-
-# type: TP
-#: dpkg-source.1:813
-#, fuzzy, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<debian/substvars>"
+"<dpkg-scansources> busca ficheros I<.dsc> en un árbol de directorios "
+"I<bindir> dado.  Estos son usados para crear un índice de Sources de Debian, "
+"que es mostrado por la salida estándar."
 
 # type: Plain text
-#: dpkg-source.1:816
+#: dpkg-scansources.1:29
 #, fuzzy
-msgid "List of substitution variables and values."
-msgstr "Lista de variables de sustitución y sus valores."
-
-# type: TP
-#: dpkg-source.1:816
-#, fuzzy, no-wrap
-msgid "B<debian/shlibs.local>"
-msgstr "B<debian/shlibs.local>"
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
+msgstr ""
+"Si se proporciona un I<fichero-override>, este se usará para fijar "
+"prioridades en el índice resultante y sobreescribir el campo del mantenedor "
+"dado en los ficheros \\&I<.dsc>. Lea dpkg-scanpackages para saber más acerca "
+"del formato de este fichero. \\s-1NB:\\s0 El fichero de override está "
+"indexado por paquetes binarios, no por fuentes, esto crea un pequeño "
+"problema. La implementación actual usa la prioridad más alta de los paquetes "
+"binarios producidos por un fichero I<.dsc> como la prioridad del paquete con "
+"las fuentes, y la entrada de override del primer paquete listado el fichero "
+"I<.dsc> para modificar la información sobre el mantenedor. Esto puede "
+"cambiar en un futuro."
 
 # type: Plain text
-#: dpkg-source.1:819
+#: dpkg-scansources.1:33
 #, fuzzy
-msgid "Package-local overriding shared library dependency information."
+msgid ""
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
-"Información acerca de redefinición de dependencias de bibliotecas "
-"compartidas específicas del paquete."
-
-# type: TP
-#: dpkg-source.1:819
-#, fuzzy, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
-msgstr "B</etc/dpkg/shlibs.override>"
+"Si se proporciona I<path-prefijo>, se antepondrá al campo del directorio en "
+"el índice de Sources generado. Normalmente se usará para hacer que el campo "
+"de directorio contenga el path desde el directorio padre del archivo Debian."
 
 # type: Plain text
-#: dpkg-source.1:822
-#, fuzzy
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-scansources.1:44
+msgid ""
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
-"Información acerca de redefinición de dependencias de bibliotecas "
-"compartidas para cada sistema."
 
-# type: TP
-#: dpkg-source.1:822
+# type: IP
+#: dpkg-scansources.1:46
 #, fuzzy, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
-msgstr "B</etc/dpkg/shlibs.default>"
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-n>, B<--no-sort>"
 
 # type: Plain text
-#: dpkg-source.1:825
+#: dpkg-scansources.1:49
 #, fuzzy
-msgid "Per-system default shared library dependency information."
+msgid ""
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
-"Información acerca de las dependencias predeterminadas con bibliotecas "
-"compartidas para cada sistema."
+"No ordenar el índice de fuentes. Normalmente se ordena por el nombre de los "
+"paquetes fuente."
+
+# type: IP
+#: dpkg-scansources.1:49
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-s>, B<--source-override> I<fichero>"
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-scansources.1:52
 #, fuzzy
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
-"El punto en el cual se produce la sustitución de campos, comparado con "
-"ciertos parámetros de los campos de salida estándar, no está claro."
+"Usar I<fichero> como el fichero de override de las fuentes. Por omisión es "
+"el mismo que se especificó para el fichero de override con un I<.src> "
+"añadido."
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-scansources.1:58
 #, fuzzy
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
-"Las entradas de paquetes binarios en el fichero B<debian/files> pasan por la "
-"sustitución de variables dos veces. Esto no debería importar, ya que B<$>, B<"
-"{> y B<}> no son caracteres legales en nombres de paquete o números de "
-"versión."
+"El fichero de override de las fuentes está en un formato distinto del "
+"fichero de override de los paquetes binarios. Contiene solamente dos campos "
+"separados por espacios en blanco, el primer campo es el nombre del paquete "
+"fuente y el segundo es la sección. Las líneas en blanco y de comentarios se "
+"descartan. Si un paquete aparece en ambos ficheros, el campo sección del "
+"fichero override de las fuentes tiene preferencia."
+
+# type: IP
+#: dpkg-scansources.1:58 install-info.8:272
+#, fuzzy, no-wrap
+msgid "B<--debug>"
+msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-scansources.1:60
 #, fuzzy
-msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
-msgstr ""
-"Debería ser posible especificar espacios y caracteres especiales del "
-"intérprete de órdenes en los argumentos iniciales de I<orden-para-obtener-"
-"root> y I<orden-para-firmar>."
+msgid "Turn debugging on."
+msgstr "Activa la depuración."
 
 # type: Plain text
-#: dpkg-source.1:845
+#: dpkg-scansources.1:68
 #, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
-msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "\\&I<dpkg-scanpackages>\\|(1)"
 
 # type: Plain text
-#: dpkg-source.1:847
+#: dpkg-scansources.1:70
 #, fuzzy
-msgid "The utilities and this manpage were written by Ian Jackson."
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+
+# type: Plain text
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
+#, fuzzy, no-wrap
+msgid "dpkg-shlibdeps"
+msgstr "B<dpkg-checkbuilddeps> -B [I<fichero-control>]"
+
+# type: Plain text
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
-"Las herramientas y esta página del manual fueron escritas por Ian Jackson."
 
 # type: Plain text
-#: dpkg-source.1:849
+#: dpkg-shlibdeps.1:35
 #, fuzzy
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr "Copyright (C) 1995-1996 Ian Jackson"
+msgid ""
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
+msgstr ""
+"B<dpkg-shlibdeps> calcula las dependencias de bibliotecas compartidas de los "
+"ejecutables suministrados sus argumentos. Las dependencias se añaden al "
+"fichero de variables de sustitución B<debian/substvars> como nombres "
+"variables B<shlibs:>I<campodependencia> donde I<campodependencia> es un "
+"nombre de campo de dependencia. Cualquier otra variable que empiece con "
+"I<shlibs:> se elimina del fichero.  B<dpkg-shlibdeps> leerá la información "
+"de las dependencias de bibliotecas compartidas de B<debian/shlibs.local,> B</"
+"etc/dpkg/shlibs.override,> el área B<shlibs> del fichero de control del "
+"paquete que contiene el fichero que B<objdump> informa como satisfactorio "
+"para la dependencia de la biblioteca, o bien B</etc/dpkg/shlibs.default>.  "
+"Se usará el primero de ellos. Véase el I<manual de empaquetamiento de "
+"Debian> para más detalles sobre el formato de los ficheros de dependencias "
+"de bibliotecas compartidas."
 
 # type: Plain text
-#: dpkg-source.1:851
+#: dpkg-shlibdeps.1:41
 #, fuzzy
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr "Copyright (C) 2000 Wichert Akkerman"
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
+msgstr ""
+"B<dpkg-shlibdeps> interpreta cualquier argumento que no sea una opción como "
+"nombre de un fichero ejecutable, igual que si se hubiesen proporcionado como "
+"B<-e>I<ejecutable>."
+
+# type: TP
+#: dpkg-shlibdeps.1:41
+#, fuzzy, no-wrap
+msgid "B<-e>I<executable>"
+msgstr "B<-e>I<ejecutable>"
 
 # type: Plain text
-#: dpkg-source.1:857
+#: dpkg-shlibdeps.1:45
 #, fuzzy
 msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
 msgstr ""
-"Esto es software libre, vea la Licencia Pública General de GNU en su versión "
-"2 o superior para las condiciones de copia.  NO hay GARANTÍA.  Vea B</usr/"
-"share/doc/dpkg/copyright> y B</usr/share/common-licenses/GPL> para más "
-"detalles."
+"Incluye dependencias apropiadas para las bibliotecas compartidas requeridas "
+"por I<ejecutable>."
 
-# type: TH
-#: dpkg-split.1:2
+# type: TP
+#: dpkg-shlibdeps.1:45
 #, fuzzy, no-wrap
-msgid "dpkg-split"
-msgstr "dpkg-split"
+msgid "B<-d>I<dependencyfield>"
+msgstr "B<-d>I<campodependencia>"
 
 # type: Plain text
-#: dpkg-split.1:5
+#: dpkg-shlibdeps.1:51
 #, fuzzy
-msgid "dpkg-split - Debian package archive split/join tool"
-msgstr "dpkg-split - herramienta para separar/unir paquetes Debian"
+msgid ""
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
+msgstr ""
+"Añade dependencias al campo I<campodependencia> del fichero de control. (Las "
+"dependencias para este campo se colocan en la variable B<shlibs:"
+">I<campodependencia>)."
 
 # type: Plain text
-#: dpkg-split.1:9
+#: dpkg-shlibdeps.1:61
 #, fuzzy
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-split> B<-s>|B<--split> I<fichero-completo> [I<prefijo>]"
-
-# type: Plain text
-#: dpkg-split.1:13
-#, fuzzy
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg-split> B<-j>|B<--join> I<parte parte >..."
-
-# type: Plain text
-#: dpkg-split.1:17
-#, fuzzy
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-split> B<-I>|B<--info> I<parte parte >..."
+msgid ""
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
+msgstr ""
+"La opción B<-d>I<campodependencia> tiene efecto para todos los ejecutables "
+"después de dicha opción, hasta el siguiente B<-d>I<campodependencia>.  Por "
+"omisión, el I<campodependencia> es B<Depends>."
 
 # type: Plain text
-#: dpkg-split.1:21
+#: dpkg-shlibdeps.1:69
 #, fuzzy
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< salida-completa parte>"
+msgid ""
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
+msgstr ""
+"Si la misma dependencia (o un conjunto de alternativas) aparece en más de "
+"uno de los nombres de campo de dependencias reconocidos: B<Pre-Depends>, "
+"B<Depends>, B<Recommends>, B<Enhances> o B<Suggests>, entonces B<dpkg-"
+"shlibdeps> eliminará automáticamente la dependencia de todos los campos, "
+"exceptuando aquel que contenga las dependencias más importantes."
 
-# type: Plain text
-#: dpkg-split.1:24
-#, fuzzy
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg-split> B<-l>|B<--listq>"
+# type: TP
+#: dpkg-shlibdeps.1:69
+#, fuzzy, no-wrap
+msgid "B<-p>I<varnameprefix>"
+msgstr "B<-p>I<prefijodevariable>"
 
 # type: Plain text
-#: dpkg-split.1:28
+#: dpkg-shlibdeps.1:80
 #, fuzzy
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
+msgid ""
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
+msgstr ""
+"Provoca que las variables de sustitución empiecen por I<prefijodevariable>B<:"
+"> en vez de B<shlibs:>.  Asimismo, cualquier variable de sustitución ya "
+"existente que empiece por I<prefijodevariable>B<:> (en vez de B<shlibs:>)  "
+"será eliminada del fichero de variables de sustitución."
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-shlibdeps.1:86
 #, fuzzy
 msgid ""
-"B<dpkg-split> splits Debian binary package files into smaller parts and "
-"reassembles them again, to support the storage of large package files on "
-"small media such as floppy disks."
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
-"B<dpkg-split> separa un paquete binario de Debian en varias partes más "
-"pequeñas para luego volverlas a unir, de esta forma se pueden almacenar "
-"paquetes en medios de poca capacidad, como disquetes."
+"Provoca que las propiedades de las variables de sustitución sean mostradas "
+"por la salida estándar, en lugar de añadirse al archivo de variables de "
+"sustitución (por omisión B<debian/substvars>)."
+
+# type: TP
+#: dpkg-shlibdeps.1:86
+#, fuzzy, no-wrap
+msgid "B<-t>I<type>"
+msgstr "B<-p>I<paquete>"
 
 # type: Plain text
-#: dpkg-split.1:37
-#, fuzzy
+#: dpkg-shlibdeps.1:93
 msgid ""
-"It can be operated manually using the B<--split>, B<--join> and B<--info> "
-"options."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
-"Puede usarse manualmente usando las opciones B<--split>, B<--join> e B<--"
-"info.>"
+
+# type: TP
+#: dpkg-shlibdeps.1:93
+#, fuzzy, no-wrap
+msgid "B<-L>I<localshlibsfile>"
+msgstr "B<-L>I<ficherodeshlibslocal>"
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-shlibdeps.1:99
 #, fuzzy
 msgid ""
-"It also has an automatic mode, invoked using the B<--auto> option, where it "
-"maintains a queue of parts seen but not yet reassembled and reassembles a "
-"package file when it has seen all of its parts. The B<--listq> and B<--"
-"discard> options allow the management of the queue."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
-"También posee un modo automático, invocado con la opción B<--auto> , "
-"entonces mantiene una cola con las partes que ha visto pero que aún no se "
-"han unido y reensambla el paquete cuando haya visto todas sus partes.  Las "
-"opciones B<--listq> y B<--discard> permiten administrar la cola."
+"Provoca que B<dpkg-shlibs> lea la información sobre dependencias con "
+"bibliotecas compartidas desde I<ficherodeshlibslocal> en vez de B<debian/"
+"shlibs.local>."
 
 # type: Plain text
-#: dpkg-split.1:48
-#, fuzzy
+#: dpkg-shlibdeps.1:105
 msgid ""
-"All splitting, joining and queueing operations produce informative messages "
-"on standard output; these may safely be ignored."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
-"Todas las operaciones de separación, unión y encolado producen mensajes "
-"informativos en la salida estándar, pueden ignorarse sin ningún riesgo."
 
 # type: TP
-#: dpkg-split.1:49
+#: dpkg-shlibdeps.1:117
 #, fuzzy, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--split>, B<-s>"
-
-# type: Plain text
-#: dpkg-split.1:52
-#, fuzzy
-msgid "Splits a single Debian binary package into several parts."
-msgstr "Separa un paquete binario de Debian en varias partes."
+msgid "B<debian/shlibs.local>"
+msgstr "B<debian/shlibs.local>"
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-shlibdeps.1:120
 #, fuzzy
-msgid ""
-"The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
-"number, starting at 1, and I<M> is the total number of parts (both in "
-"decimal)."
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
-"Las partes reciben el nombre I<prefijo>B<.>I<N>B<of>I<M>B<.deb> donde I<N> "
-"es el número de la partes, comenzando por 1, y I<M> el el número total de "
-"partes (ambos en decimal)."
+"Información acerca de redefinición de dependencias de bibliotecas "
+"compartidas específicas del paquete."
+
+# type: TP
+#: dpkg-shlibdeps.1:120
+#, fuzzy, no-wrap
+msgid "B</etc/dpkg/shlibs.override>"
+msgstr "B</etc/dpkg/shlibs.override>"
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-shlibdeps.1:123
 #, fuzzy
-msgid ""
-"If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
-"including directory, with any trailing B<.deb> removed."
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
-"Si no se proporciona ningún I<prefijo> entonces se toma el nombre del "
-"I<fichero-completo> , incluyendo el directorio, con cualquier terminación B<."
-"deb> eliminada."
+"Información acerca de redefinición de dependencias de bibliotecas "
+"compartidas para cada sistema."
 
 # type: TP
-#: dpkg-split.1:68
+#: dpkg-shlibdeps.1:123
 #, fuzzy, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--join>, B<-j>"
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr "B</etc/dpkg/shlibs.default>"
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-shlibdeps.1:126
 #, fuzzy
-msgid ""
-"Joins the parts of a package file together, reassembling the original file "
-"as it was before it was split."
+msgid "Per-system default shared library dependency information."
 msgstr ""
-"Une las partes de un paquete, dejando el paquete tal y como era "
-"originalmente."
+"Información acerca de las dependencias predeterminadas con bibliotecas "
+"compartidas para cada sistema."
 
-# type: Plain text
-#: dpkg-split.1:76
+# type: TP
+#: dpkg-shlibdeps.1:129
 #, fuzzy
-msgid ""
-"The part files given as arguments must be all the parts of exactly the same "
-"original binary file. Each part must occur exactly once in the argument "
-"list, though the parts to not need to be listed in order."
+msgid "B<deb-shlibs>(5)."
+msgstr "B<debian/shlibs.local>"
+
+# type: TH
+#: dpkg-source.1:2
+#, no-wrap
+msgid "dpkg-source"
 msgstr ""
-"Las partes que se proporcionen como argumento deben de ser todas las partes "
-"del fichero original. Cada parte debe proporcionarse una sola vez, aunque no "
-"necesariamente en orden."
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-source.1:6
 #, fuzzy
-msgid ""
-"The parts must of course all have been generated with the same part size "
-"specified at split time, which means that they must usually have been "
-"generated by the same invocation of B<dpkg-split --split>."
-msgstr ""
-"Todas las partes deben generarse con el mismo tamaño especificado a la hora "
-"de la separación, lo que significa que todas deben haber sido generadas por "
-"la misma invocación de B<dpkg-split --split>."
+msgid "dpkg-source, - Debian source package tools"
+msgstr "B<dpkg-source> empaqueta y desempaqueta ficheros fuente de Debian."
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-source.1:11
 #, fuzzy
-msgid "The parts' filenames are not significant for the reassembly process."
-msgstr ""
-"El nombre de las partes no es significativo para el proceso de reensamblado."
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-source.1:15
 #, fuzzy
-msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
-msgstr ""
-"Por omisión el fichero resultante se llama I<paquete>B<->I<versión>B<.deb>."
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
+msgstr "B<dpkg-source> empaqueta y desempaqueta ficheros fuente de Debian."
 
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-source.1:19
 #, fuzzy
 msgid ""
-"Prints information, in a human-readable format, about the part file(s)  "
-"specified. Arguments which are not binary package parts produce a message "
-"saying so instead (but still on standard output)."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
-"Muestra información entendible por una persona acerca de la parte o las "
-"partes del fichero o ficheros especificados. Argumentos que no sean parte de "
-"un paquete binario producen un mensaje avisando del problema (en la salida "
-"estándar)."
+"Ninguna de estas órdenes permite combinar múltiples opciones en una sola.  "
+"Tampoco permiten que el valor de una opción se especifique como argumento "
+"aparte."
 
-# type: TP
-#: dpkg-split.1:92
+# type: Plain text
+#: dpkg-source.1:21
 #, fuzzy, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--auto>, B<-a>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
+msgstr "B<dpkg-source> B<-x >I<fichero>B<.dsc>"
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-source.1:31
 #, fuzzy
-msgid "Automatically queue parts and reassemble a package if possible."
+msgid ""
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
-"Encolar las partes automáticamente y reensamblar el paquete si es posible."
+"Extrae un paquete fuente. Se debe suministrar un argumento que no sea una "
+"opción, el nombre del fichero de control de fuente de Debian (B<.dsc>)."
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-source.1:37
 #, fuzzy
 msgid ""
-"The I<part> specified is examined, and compared with other parts of the same "
-"package (if any) in the queue of packages file parts."
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
-"La I<parte> especificada se examina y compara junto con las otras partes del "
-"mismo paquete (si hay alguna) en la cola de ficheros parte de otros paquetes."
+"Ninguna opción es útil con B<dpkg-source -x>.  B<dpkg-source> lee los "
+"nombres de los demás ficheros que componen el paquete fuente del fichero de "
+"control; se asume que están en el mismo directorio que el B<.dsc>."
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-source.1:45
 #, fuzzy
 msgid ""
-"If all parts of the package file of which I<part> is a part are available "
-"then the package is reassembled and written to I<complete-output> (which "
-"should not usually already exist, though this is not an error)."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
-"Si están disponibles todas las partes del fichero al que pertenece la "
-"I<parte> , entonces se reensamblará el paquete y se guardará en I<salida-"
-"completa> (que normalmente no existe, aunque esto no es un error)."
+"Los permisos y propietarios de los ficheros del paquete extraído serán los "
+"mismos que se esperarían si los ficheros hubiesen sido simplemente creados - "
+"0777 para directorios y ejecutables y 0666 para el resto de ficheros, ambos "
+"modificados según el umask del extractor; si el directorio superior tiene "
+"activado el bit setgid, los directorios extraídos lo tendrán también, y "
+"todos los ficheros y directorios heredarán su grupo de permisos."
+
+# type: Plain text
+#: dpkg-source.1:45
+#, fuzzy, no-wrap
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-source -b> [I<opciones>] I<directorio> [I<directorio-origen>|'']"
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-source.1:60
 #, fuzzy
 msgid ""
-"If not then the I<part> is copied into the queue and I<complete-output> is "
-"not created."
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
-"Si no, la I<parte> se copia en la cola pero no se crea I<salida-completa.>"
+"Construye: empaqueta un árbol de fuentes. Se deben proporcionar uno o dos "
+"argumentos que no sean opciones. El primero se tomará como el nombre del "
+"directorio que contiene el árbol de fuentes descomprimido. Si hay un segundo "
+"argumento, debe ser el nombre del directorio de fuentes o del fichero tar "
+"original o la cadena vacía si el paquete es específico de Debian y por tanto "
+"carece de diffs \"debianizantes\". Si no se proporciona un segundo "
+"argumento, entonces B<dpkg-source> buscará el archivo tar original "
+"I<paquete>B<_>I<versióndeldesarrolladorppal>B<.orig.tar.gz> o el directorio "
+"de fuentes original I<directorio>B<.orig> o la cadena vacía (sin fuentes "
+"originales y por tanto sin diff), en función de los argumentos."
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-source.1:75
 #, fuzzy
 msgid ""
-"If I<part> is not a split binary package part then B<dpkg-split> will exit "
-"with status 1; if some other trouble occurs then it will exit with status 2."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
-"Si I<parte> no es una parte del paquete binario entonces B<dpkg-split> "
-"terminará con un estado de salida igual a 1, si ocurre algún otro tipo de "
-"error el estado de salida será 2."
+"Cuando se usan las opciones comunes B<-c> y B<-l> con rutas relativas, éstas "
+"se interpretan empezando en el directorio superior del árbol de fuentes."
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-source.1:82
 #, fuzzy
 msgid ""
-"The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
-"this were not mandatory the calling program would not know what output file "
-"to expect.)"
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
-"Debe de proporcionar la opción B<--output> o B<-o> cuando use B<--auto>.  "
-"(Si este argumento no fuese obligatorio el programa que ejecute B<dpkg-"
-"split> no sabría que fichero esperar)."
-
-# type: TP
-#: dpkg-split.1:127
-#, fuzzy, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--listq>, B<-l>"
+"Cuando se usan las opciones comunes B<-c> y B<-l> con rutas relativas, éstas "
+"se interpretan empezando en el directorio superior del árbol de fuentes."
 
 # type: Plain text
-#: dpkg-split.1:130
-#, fuzzy
-msgid "Lists the contents of the queue of packages to be reassembled."
-msgstr "Lista los contenidos de la cola de paquetes para reensamblar."
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
-#, fuzzy
-msgid ""
-"For each package file of which parts are in the queue the output gives the "
-"name of the package, the parts in the queue, and the total number of bytes "
-"stored in the queue."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
-"Por cada fichero de un paquete que contenga partes en la cola se muestra el "
-"nombre del paquete, las partes en la cola y el número total de bytes "
-"guardados en ésta."
-
-# type: TP
-#: dpkg-split.1:134
-#, fuzzy, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--discard>, B<-d>"
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-source.1:118
 #, fuzzy
 msgid ""
-"This discards parts from the queue of those waiting for the remaining parts "
-"of their packages."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
-"Descarta partes de la cola de aquéllas que esperan las partes restantes del "
-"paquete para ser reensambladas."
+"Puede especificar una expresión regular de Perl para indicar aquellos "
+"ficheros que desee excluir de la lista de ficheros para el diff (esta lista "
+"es generada con una orden find). Por sí mismo, B<-i> activa la opción con un "
+"filtro predeterminado que elimina los ficheros y directorios de control de "
+"los sistemas de control de versiones más comunes, los ficheros de respaldo, "
+"los ficheros swap y los directorios que se generan como resultado de las "
+"operaciones de Libtool."
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-source.1:130
 #, fuzzy
 msgid ""
-"If no I<package> is specified then the queue is cleared completely; if any "
-"are specified then only parts of the relevant package(s) are deleted."
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
 msgstr ""
-"Si no se especifica ningún I<paquete> se limpia la cola por completo, si se "
-"especifica alguno sólo se eliminan las partes de los paquetes relevantes."
+"Esta opción es muy útil para eliminar ficheros extraños que se incluyen en "
+"el .diff.gz, (como \"debian/BUGS_TODO/*\" o \"debian/RCS/*,v\"). Por "
+"ejemplo, si mantiene un paquete que sigue a través de CVS remoto, donde no "
+"tiene permisos de acceso para escribir los ficheros de control de Debian ni "
+"para crear etiquetas para I<cvs-buildpackage(1)>, es necesario realizar una "
+"copia/actualización adicional en un directorio que se mantenga limpio, para "
+"generar el .orig.tar.gz. Ese directorio contendrá ficheros CVS/Entries que "
+"tienen fechas distintas de los que están en su directorio de trabajo, "
+"haciendo por tanto que sean incluidos de manera innecesaria en cada .diff."
+"gz, a menos que utilice la opción B<-i>."
 
 # type: Plain text
-#: dpkg-split.1:148
+#: dpkg-source.1:137
 #, fuzzy
 msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
-"Muestra el modo de uso de B<dpkg-split> , dando además un breve resumen de "
-"sus opciones."
+"Si se especifica esta opción, el nombre de fichero se pasará como parámetro "
+"a la opción --exclude de tar para generar el fichero .orig.tar.gz o .tar."
+"gz.  Por ejemplo, -ICVS hará que tar se salte los directorios CVS cuando "
+"genere el fichero .tar.gz. La opción puede ser repetida varias ocasiones "
+"para permitir la expulsión de varios nombres de fichero."
 
-# type: Plain text
-#: dpkg-split.1:153
-#, fuzzy
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "Muestra la versión de B<dpkg-split.>"
+# type: TP
+#: dpkg-source.1:158
+#, fuzzy, no-wrap
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> con B<-b>"
 
 # type: Plain text
-#: dpkg-split.1:160
+#: dpkg-source.1:173
 #, fuzzy
 msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
-"Muestra información acerca de la licencia de B<dpkg-split> así como de su "
-"falta de garantía. (La escritura americana B<--license> también se admite)."
-
-# type: TP
-#: dpkg-split.1:161
-#, fuzzy, no-wrap
-msgid "B<--depotdir>I< directory>"
-msgstr "B<--depotdir>I< directorio>"
+"Si se especifican B<-sk> o B<-sp>, B<dpkg-source> espera la fuente original "
+"como un archivo tar, por omisión I<paquete>B<_>I<versióndesarrolladorppal>B<."
+"orig.tar.gz>.  La fuente original se dejará en el sitio como un archivo tar, "
+"o será copiada al directorio actual en caso de no estar ya ahí presente.  Si "
+"se usa B<-sp> en lugar de B<-sk>, se eliminará de nuevo posteriormente."
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-source.1:185
 #, fuzzy
 msgid ""
-"Specifies an alternative directory for the queue of parts awaiting automatic "
-"reassembly. The default is B</var/lib/dpkg>."
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
-"Especifica un directorio alternativo para las partes que se encuentran en la "
-"cola esperando para ser reensambladas. Por omisión es B</var/lib/dpkg>."
-
-# type: TP
-#: dpkg-split.1:166
-#, fuzzy, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
-msgstr "B<--partsize>|B<-S>I< kbytes>"
+"Si se especifican B<-su> o B<-sr>, se espera que la fuente original sea un "
+"directorio, por omisión I<paquete>B<->I<versióndeldesarrolladorppal>B<.orig> "
+"y B<dpkg-source> creará un fichero de fuentes nuevo a partir de él. Si se "
+"usa B<-sr ,> B<dpkg-source eliminará dicho directorio tras la operación .>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-source.1:196
 #, fuzzy
 msgid ""
-"Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
-"Especifica el tamaño máximo de cada parte en kilobytes (1024 bytes). Por "
-"omisión es 450Kb."
-
-# type: TP
-#: dpkg-split.1:170
-#, fuzzy, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
-msgstr "B<--output>|B<-O>I< complete-output>"
+"Si se especifica B<-ss>, B<dpkg-source> esperará que la fuente original esté "
+"disponible tanto como directorio como fichero tar. Usará el directorio para "
+"crear el diff y el fichero tar para crear el B<.dsc>.  Esta opción debe "
+"usarse con precaución - si el directorio y el archivo tar no coinciden se "
+"generará un fichero fuente inválido."
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-source.1:205
 #, fuzzy
-msgid "Specifies the output file name for a reassembly."
-msgstr "Especifica el nombre del fichero donde se reensamblarán las partes."
+msgid ""
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
+msgstr ""
+"Si se especifica B<-sn>, B<dpkg-source> no buscará ninguna fuente original y "
+"no generará un diff. El segundo argumento, en caso de haberlo, debe ser la "
+"cadena vacía. Esta opción se usa en paquetes específicos de Debian que no "
+"tienen fuentes del desarrollador principal y por tanto carecen de diffs "
+"\"debianizantes\"."
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-source.1:234
 #, fuzzy
 msgid ""
-"This overrides the default for a manual reassembly (B<--join>)  and is "
-"mandatory for an automatic queue-or-reassemble (B<--auto>)."
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
-"Ésto substituye el nombre por omisión en modo manual (B<--join>)  y es "
-"obligatorio para el modo automático (B<--auto>)."
-
-# type: TP
-#: dpkg-split.1:178
-#, fuzzy, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--npquiet>, B<-Q>"
+"Si se especifican B<-sa> o B<-sA>, B<dpkg-source> buscará la fuente original "
+"como directorio o como fichero tar - el segundo argumento, de haberlo, puede "
+"ser cualquiera de las dos cosas o la cadena vacía (equivalente a usar B<-"
+"sn>).  Si se encuentra un fichero tar, se desempaquetará para crear el diff "
+"y será eliminado posteriormente (equivalente a B<-sp>); si se encuentra un "
+"directorio, se empaquetará para crear la fuente original y será eliminado "
+"posteriormente (equivalente a B<-sr>); si no se encuentra ninguno de los "
+"dos, se asume que el paquete no tiene diffs \"debianizantes\", únicamente un "
+"fichero de fuentes (equivalente a B<-sn>).  Si se encuentran ambos, B<dpkg-"
+"source> ignorará el directorio, sobreescribiéndolo, si se especificó B<-sA> "
+"(equivalente a B<-sP>), o ocurrirá un error si se especificó B<-sa>.  B<-sA> "
+"es la opción predeterminada."
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-source.1:240
 #, fuzzy
 msgid ""
-"When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
-"message if it is given a I<part> that is not a binary package part. This "
-"option suppresses this message, to allow programs such as B<dpkg> to cope "
-"with both split and unsplit packages without producing spurious messages."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
-"Cuando B<dpkg-split> está en modo automático normalmente muestra mensajes si "
-"se le pasa una I<parte> que no es parte del paquete binario. Esta opción "
-"suprimer estos mensajes, esto permite que programas como B<dpkg> puedan "
-"separar y unir paquetes sin producir mensajes espúreos."
+"B<-sa>, B<-sp>, B<-sk>, B<-su> y B<-sr> no sobreescriben directorios o "
+"ficheros tar existentes. Si esto es lo que se desea, debe utilizar B<-sA>, "
+"B<-sP>, B<-sK>, B<-sU> y B<-sR> en su lugar."
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-source.1:240
 #, fuzzy, no-wrap
-msgid "B<--msdos>"
-msgstr "B<--msdos>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgstr "B<-sp>,B<-su>,B<-sn> con B<-x>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-source.1:243
 #, fuzzy
-msgid ""
-"Forces the output filenames generated by B<--split> to be msdos-compatible."
-msgstr "Fuerza nombres compatibles con msdos."
+msgid "In all cases any existing original source tree will be removed."
+msgstr "En todos los casos cualquier árbol de fuentes original será eliminado."
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-source.1:250
 #, fuzzy
 msgid ""
-"This mangles the prefix - either the default derived from the input filename "
-"or the one supplied as an argument: alphanumerics are lowercased, plus signs "
-"are replaced by B<x>'s and all other characters are discarded."
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
-"Esta opción modifica el prefijo (tanto el prefijo por omisión como el "
-"proporcionado por un argumento), los carácteres alfanuméricos se pasan a "
-"minúsculas, los signos '+' se reemplazano por B<x> y el resto de los "
-"carácteres se descartan."
+"Si se usa B<-sp> a la hora de extraer, la fuente original (si la hay) se "
+"dejará como un fichero tar. Si no se encuentra en el directorio actual o si "
+"existe un fichero pero es diferente, se copiará ahí. Ésta es la acción por "
+"omisión."
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-source.1:253
 #, fuzzy
-msgid ""
-"The result is then truncated as much as is necessary, and filenames of the "
-"form I<prefixN>B<of>I<M>B<.deb> are generated."
-msgstr ""
-"El resultado restante se trunca hasta donde sea necesario de forma que se "
-"generen ficheros de la forma I<prefijoN>B<of>I<M>B<.deb.>"
-
-# type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
-#, fuzzy, no-wrap
-msgid "EXIT STATUS"
-msgstr "ESTADO DE SALIDA"
+msgid "B<-su> unpacks the original source tree."
+msgstr "B<-su> desempaqueta el archivo de fuentes original."
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-source.1:258
 #, fuzzy
 msgid ""
-"An exit status of 0 indicates that the requested split, merge, or other "
-"command succeeded.  B<--info> commands count as successful even if the files "
-"are not binary package parts."
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
-"Un estado de salida 0 indica que que la operación requerida se ha realizado "
-"con éxito.  Las órdenes B<--info> se dan cómo satisfactorias incluso si los "
-"ficheros no son parte de ningún paquete binario."
+"B<-sn> se asegura de que la fuente original ni se copia al directorio actual "
+"ni se desempaqueta. Cualquier árbol de fuentes original existente en el "
+"directorio actual es eliminado."
 
 # type: Plain text
-#: dpkg-split.1:217
-#, fuzzy
+#: dpkg-source.1:263
 msgid ""
-"An exit status of 1 occurs only with B<--auto> and indicates that the "
-"I<part> file was not a binary package part."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
-"Se devuelve un estado de salida de 1 sólo cuando se use la opción B<--auto> "
-"e indica que la I<parte> no era parte de un paquete binario."
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-source.1:274
 #, fuzzy
 msgid ""
-"An exit status of 2 indicates some kind of trouble, such as a system call "
-"failure, a file that looked like a package part file but was corrupted, a "
-"usage error or some other problem."
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
-"Se devuelve un estado de salida de 2 cuando ocurre algún tipo de problema, "
-"como una llamada al sistema fallida, un fichero que parecía parte de un "
-"paquete pero que estaba corrupto, un uso incorrecto del programa o algún "
-"otro problema."
+"Las entradas de paquetes binarios en el fichero B<debian/files> pasan por la "
+"sustitución de variables dos veces. Esto no debería importar, ya que B<$>, B<"
+"{> y B<}> no son caracteres legales en nombres de paquete o números de "
+"versión."
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-source.1:279
 #, fuzzy
-msgid ""
-"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
-"of Debian packages."
-msgstr ""
-"B<dpkg-split> usa algunas convenciones un tanto pasadas de fecha para el "
-"nombre de los paquetes de Debian."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(8), B<dselect>(8), B<gpg>(1), B<pgp>(1)."
+
+# type: TH
+#: dpkg-split.1:2
+#, fuzzy, no-wrap
+msgid "dpkg-split"
+msgstr "dpkg-split"
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:5
 #, fuzzy
-msgid ""
-"Full details of the packages in the queue are impossible to get without "
-"digging into the queue directory yourself."
-msgstr ""
-"Es imposible obtener todos los detalles de los paquetes que están en la cola "
-"sin investigar en la cola directamente por uno mismo."
+msgid "dpkg-split - Debian package archive split/join tool"
+msgstr "dpkg-split - herramienta para separar/unir paquetes Debian"
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:10
 #, fuzzy
-msgid ""
-"There is no easy way to test whether a file that may be a binary package "
-"part is one."
-msgstr ""
-"No una manera sencilla de comprobar cuando un fichero que puede ser parte de "
-"un paquete bianrio lo es realmente."
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:16
 #, fuzzy
 msgid ""
-"The architecture is not represented in the part files' header, only in the "
-"control information of the contained binary package file, and it is not "
-"present in the filenames generated."
+"B<dpkg-split> splits Debian binary package files into smaller parts and "
+"reassembles them again, to support the storage of large package files on "
+"small media such as floppy disks."
 msgstr ""
-"La arquitectura no se refleja en la cabecera de las partes del fichero, sólo "
-"en la información de control del paquete binario original, y este no esta "
-"presente en las partes generadas."
-
-# type: TP
-#: dpkg-split.1:236
-#, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/parts>"
-msgstr "B</var/lib/dpkg/parts>"
+"B<dpkg-split> separa un paquete binario de Debian en varias partes más "
+"pequeñas para luego volverlas a unir, de esta forma se pueden almacenar "
+"paquetes en medios de poca capacidad, como disquetes."
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:20
 #, fuzzy
 msgid ""
-"The default queue directory for part files awaiting automatic reassembly."
+"It can be operated manually using the B<--split>, B<--join> and B<--info> "
+"options."
 msgstr ""
-"El directorio por omisión donde las partes esperan para un reensamblado "
-"automático."
+"Puede usarse manualmente usando las opciones B<--split>, B<--join> e B<--"
+"info.>"
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:28
 #, fuzzy
 msgid ""
-"The filenames used in this directory are in a format internal to B<dpkg-"
-"split> and are unlikely to be useful to other programs, and in any case the "
-"filename format should not be relied upon."
+"It also has an automatic mode, invoked using the B<--auto> option, where it "
+"maintains a queue of parts seen but not yet reassembled and reassembles a "
+"package file when it has seen all of its parts. The B<--listq> and B<--"
+"discard> options allow the management of the queue."
 msgstr ""
-"Los nombre de los ficheros usados en este directorio se encuentran en un "
-"formato interno de B<dpkg-split> y es improbable que sean útiles para otros "
-"programas, en cualquier caso, no se deberían tener en cuenta."
-
-# type: Plain text
-#: dpkg-split.1:250
-#, fuzzy
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(8)"
+"También posee un modo automático, invocado con la opción B<--auto> , "
+"entonces mantiene una cola con las partes que ha visto pero que aún no se "
+"han unido y reensambla el paquete cuando haya visto todas sus partes.  Las "
+"opciones B<--listq> y B<--discard> permiten administrar la cola."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:31
 #, fuzzy
 msgid ""
-"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"All splitting, joining and queueing operations produce informative messages "
+"on standard output; these may safely be ignored."
 msgstr ""
-"B<dpkg-split> Esta página de manual fue escrita por Ian Jackson. Es "
-"Copyright (C) 1995-1996 del mismo y liberada bajo la Licencia Pública "
-"General de GNU, NO hay ninguna garantía. Vea B</usr/share/dpkg/copyright> y "
-"B</usr/share/common-licenses/GPL> para más información."
-
-# type: TP
-#: dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "dpkg-statoverride"
-msgstr "I</var/lib/dpkg/statoverride>"
+"Todas las operaciones de separación, unión y encolado producen mensajes "
+"informativos en la salida estándar, pueden ignorarse sin ningún riesgo."
 
-# type: TH
-#: dpkg-statoverride.8:1
+# type: Plain text
+#: dpkg-split.1:33
 #, fuzzy, no-wrap
-msgid "Debian project"
-msgstr "Proyecto Debian"
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-split> B<-s>|B<--split> I<fichero-completo> [I<prefijo>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:4
+#: dpkg-split.1:36
 #, fuzzy
-msgid "dpkg-statoverride - override ownership and mode of files"
-msgstr "dpkg-statoverride -- cambia el propietario y grupo de ficheros"
+msgid "Splits a single Debian binary package into several parts."
+msgstr "Separa un paquete binario de Debian en varias partes."
 
 # type: Plain text
-#: dpkg-statoverride.8:9
+#: dpkg-split.1:44
 #, fuzzy
 msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
+"The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
+"number, starting at 1, and I<M> is the total number of parts (both in "
+"decimal)."
 msgstr ""
-"B<dpkg-statoverride> [opciones] --add E<lt>usuarioE<gt> E<lt>grupoE<gt> "
-"E<lt>modoE<gt> I<E<lt>ficheroE<gt>>"
+"Las partes reciben el nombre I<prefijo>B<.>I<N>B<of>I<M>B<.deb> donde I<N> "
+"es el número de la partes, comenzando por 1, y I<M> el el número total de "
+"partes (ambos en decimal)."
 
 # type: Plain text
-#: dpkg-statoverride.8:13
+#: dpkg-split.1:52
 #, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<dpkg-statoverride> [opciones] --remove I<E<lt>ficheroE<gt>>"
+msgid ""
+"If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
+"including directory, with any trailing B<.deb> removed."
+msgstr ""
+"Si no se proporciona ningún I<prefijo> entonces se toma el nombre del "
+"I<fichero-completo> , incluyendo el directorio, con cualquier terminación B<."
+"deb> eliminada."
 
 # type: Plain text
-#: dpkg-statoverride.8:18
-#, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr "B<dpkg-statoverride> [opciones] --list I<[E<lt>patrón-globalE<gt>]>"
+#: dpkg-split.1:52
+#, fuzzy, no-wrap
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-split> B<-j>|B<--join> I<parte parte >..."
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-split.1:56
 #, fuzzy
 msgid ""
-"`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
-"or mode for a file when a package is installed. (note: I use the word `file' "
-"here, but in reality this can be any filesystem object that dpkg handles, "
-"including directories, devices, etc.). This can be used to force programs "
-"that are normally setuid to be install without a setuid flag, or only "
-"executable by a certain group."
+"Joins the parts of a package file together, reassembling the original file "
+"as it was before it was split."
 msgstr ""
-"`B<La excepción de propiedades>' es un modo de indicar a dpkg que use un "
-"propietario o modo diferente para un fichero cuando lo instale. (nota: aquí "
-"usamos la palabra `fichero', pero puede tratarse de cualquier objeto del "
-"sistema de ficheros que dpkg pueda manejar, incluyendo directorios, "
-"dispositivos, etc). Puede usarse para forzar que programas que normalmente "
-"se instalan como setuid se instalen sin esta marca, o que sólo sean "
-"ejecutables por un grupo en concreto."
+"Une las partes de un paquete, dejando el paquete tal y como era "
+"originalmente."
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-split.1:60
 #, fuzzy
 msgid ""
-"B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
-"has three basic functions: adding, removing and listing overrides."
+"The part files given as arguments must be all the parts of exactly the same "
+"original binary file. Each part must occur exactly once in the argument "
+"list, though the parts to not need to be listed in order."
 msgstr ""
-"B<dpkg-statoverride> es una utilidad para administrar la lista de "
-"excepciones. Tiene tres funciones básicas: añadir, eliminar y listar las "
-"excepciones."
-
-# type: TP
-#: dpkg-statoverride.8:34
-#, fuzzy, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr "I<--add E<lt>usuarioE<gt> E<lt>grupoE<gt> E<lt>modoE<gt> E<lt>ficheroE<gt>>"
+"Las partes que se proporcionen como argumento deben de ser todas las partes "
+"del fichero original. Cada parte debe proporcionarse una sola vez, aunque no "
+"necesariamente en orden."
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-split.1:65
 #, fuzzy
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"The parts must of course all have been generated with the same part size "
+"specified at split time, which means that they must usually have been "
+"generated by the same invocation of B<dpkg-split --split>."
 msgstr ""
-"Añade una excepción al B<E<lt>ficheroE<gt>>. No es necesario que exista el "
-"B<E<lt>ficheroE<gt>> cuando se use esta orden, la excepción se guardará para "
-"usarse posteriormente. Los usuarios y los grupos pueden especificarse por su "
-"nombre (por ejemplo B<root> o B<nobody>), o por su número precedido por un "
-"`B<#>' (por ejemplo B<#0> o B<#65534>)."
+"Todas las partes deben generarse con el mismo tamaño especificado a la hora "
+"de la separación, lo que significa que todas deben haber sido generadas por "
+"la misma invocación de B<dpkg-split --split>."
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-split.1:67
 #, fuzzy
-msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
-"Si se especifica la opción --update y existe B<E<lt>ficheroE<gt>>, se le "
-"asigna inmediatamente el nuevo propietario y modo."
-
-# type: TP
-#: dpkg-statoverride.8:44
-#, fuzzy, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "I<--remove E<lt>ficheroE<gt>>"
+"El nombre de las partes no es significativo para el proceso de reensamblado."
 
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-split.1:70
 #, fuzzy
-msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
-"Elimina una excepción de B<E<lt>ficheroE<gt>>, esta orden no modifica el "
-"estado de B<E<lt>ficheroE<gt>>."
+"Por omisión el fichero resultante se llama I<paquete>B<->I<versión>B<.deb>."
 
-# type: TP
-#: dpkg-statoverride.8:48
+# type: Plain text
+#: dpkg-split.1:71
 #, fuzzy, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr "I<--list [E<lt>patrón-globalE<gt>]>"
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-split> B<-I>|B<--info> I<parte parte >..."
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-split.1:76
 #, fuzzy
 msgid ""
-"List all overrides. If a glob pattern is specified restrict the output to "
-"overrides which match the glob. If there are no overrides or none match the "
-"glob B<dpkg-statoverride> will exit with an exitcode of 1."
+"Prints information, in a human-readable format, about the part file(s)  "
+"specified. Arguments which are not binary package parts produce a message "
+"saying so instead (but still on standard output)."
 msgstr ""
-"Lista todas las excepciones. Si se especifica un patrón global, éste "
-"restringe la salida a lo que concuerde con el patrón. Si no hay ninguna "
-"excepción o ninguna concuerda con el patrón B<dpkg-statoverride> terminará "
-"con un código de salida igual a 1."
+"Muestra información entendible por una persona acerca de la parte o las "
+"partes del fichero o ficheros especificados. Argumentos que no sean parte de "
+"un paquete binario producen un mensaje avisando del problema (en la salida "
+"estándar)."
 
-# type: TP
-#: dpkg-statoverride.8:53
+# type: Plain text
+#: dpkg-split.1:76
 #, fuzzy, no-wrap
-msgid "B<--force>"
-msgstr "I<--force>"
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< salida-completa parte>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-split.1:79
 #, fuzzy
-msgid ""
-"Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
-"Fuerza una acción, incluso si ésta pudiese resultar perjudicial. Es "
-"necesario para modificar una excepción existente."
-
-# type: TP
-#: dpkg-statoverride.8:57
-#, fuzzy, no-wrap
-msgid "B<--update>"
-msgstr "I<--update>"
+"Encolar las partes automáticamente y reensamblar el paquete si es posible."
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-split.1:84
 #, fuzzy
 msgid ""
-"Immediately try to change the file to the new owner and mode if it exists."
+"The I<part> specified is examined, and compared with other parts of the same "
+"package (if any) in the queue of packages file parts."
 msgstr ""
-"Trata inmediatamente de cambiar el fichero al nuevo propietario y modo, si "
-"es que existe."
+"La I<parte> especificada se examina y compara junto con las otras partes del "
+"mismo paquete (si hay alguna) en la cola de ficheros parte de otros paquetes."
 
 # type: Plain text
-#: dpkg-statoverride.8:64
+#: dpkg-split.1:91
 #, fuzzy
-msgid "Be less verbose about what we do."
-msgstr "Es menos explicativo a cerca de lo que realiza."
+msgid ""
+"If all parts of the package file of which I<part> is a part are available "
+"then the package is reassembled and written to I<complete-output> (which "
+"should not usually already exist, though this is not an error)."
+msgstr ""
+"Si están disponibles todas las partes del fichero al que pertenece la "
+"I<parte> , entonces se reensamblará el paquete y se guardará en I<salida-"
+"completa> (que normalmente no existe, aunque esto no es un error)."
 
 # type: Plain text
-#: dpkg-statoverride.8:67
+#: dpkg-split.1:97
 #, fuzzy
-msgid "Show usage information."
-msgstr "Muestra la versión, copyright y modo de uso."
+msgid ""
+"If not then the I<part> is copied into the queue and I<complete-output> is "
+"not created."
+msgstr ""
+"Si no, la I<parte> se copia en la cola pero no se crea I<salida-completa.>"
 
 # type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
+#: dpkg-split.1:104
+#, fuzzy
+msgid ""
+"If I<part> is not a split binary package part then B<dpkg-split> will exit "
+"with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, fuzzy, no-wrap
-msgid "B<--admindir>"
-msgstr "I<--admindir>"
+"Si I<parte> no es una parte del paquete binario entonces B<dpkg-split> "
+"terminará con un estado de salida igual a 1, si ocurre algún otro tipo de "
+"error el estado de salida será 2."
 
 # type: Plain text
-#: dpkg-statoverride.8:74
+#: dpkg-split.1:111
 #, fuzzy
 msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
+"The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
+"this were not mandatory the calling program would not know what output file "
+"to expect.)"
 msgstr ""
-"Cambia el directorio con la base de datos de dpkg donde también se guarda la "
-"información relativa a statoverride. Por omisión es /var/lib/dpkg."
+"Debe de proporcionar la opción B<--output> o B<-o> cuando use B<--auto>.  "
+"(Si este argumento no fuese obligatorio el programa que ejecute B<dpkg-"
+"split> no sabría que fichero esperar)."
 
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-split.1:111
 #, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/statoverride>"
-msgstr "I</var/lib/dpkg/statoverride>"
+msgid "B<-l>, B<--listq>"
+msgstr "B<-l, --license>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-split.1:114
 #, fuzzy
-msgid ""
-"File which contains the current list of stat overrides of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
-msgstr ""
-"Fichero que contiene la lista actual de excepciones de propiedades del "
-"sistema. Se encuentra en el directorio de administración dpkg, junto con "
-"otros ficheros importantes para dpkg, como `status' o `available'."
+msgid "Lists the contents of the queue of packages to be reassembled."
+msgstr "Lista los contenidos de la cola de paquetes para reensamblar."
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-split.1:118
 #, fuzzy
 msgid ""
-"Note: dpkg-statoverride preserves the old copy of this file, with extension "
-"\"-old\", before replacing it with the new one."
+"For each package file of which parts are in the queue the output gives the "
+"name of the package, the parts in the queue, and the total number of bytes "
+"stored in the queue."
 msgstr ""
-"Nota: dpkg-statoverride preserva una copia antigua del fichero con la "
-"extensión \"-old\" antes de reemplazarla con una nueva."
+"Por cada fichero de un paquete que contenga partes en la cola se muestra el "
+"nombre del paquete, las partes en la cola y el número total de bytes "
+"guardados en ésta."
 
 # type: Plain text
-#: dpkg-statoverride.8:90
-#, fuzzy
-msgid "Copyright 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
-# type: SS
-#: dselect.1:1
+#: dpkg-split.1:118
 #, fuzzy, no-wrap
-msgid "dselect"
-msgstr "select"
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
 
 # type: Plain text
-#: dselect.1:4
+#: dpkg-split.1:122
 #, fuzzy
-msgid "dselect - Debian package management frontend"
-msgstr "dselect - Interfaz del manipulador de paquetes Debian para consola."
+msgid ""
+"This discards parts from the queue of those waiting for the remaining parts "
+"of their packages."
+msgstr ""
+"Descarta partes de la cola de aquéllas que esperan las partes restantes del "
+"paquete para ser reensambladas."
 
 # type: Plain text
-#: dselect.1:17
+#: dpkg-split.1:127
 #, fuzzy
 msgid ""
-"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
-"[B<--licence>|B<--license>] [B<--expert>] [B<--debug>|B<-"
-"D>I<E<lt>fileE<gt>>] [I<E<lt>actionE<gt>>] [B<--colour>|B<--color> "
-"I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]]"
+"If no I<package> is specified then the queue is cleared completely; if any "
+"are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
-"B<dselect> [--admindir E<lt>directorioE<gt>] [--help] [--version] [--licence "
-"| --license] [--expert] [--debug | -D E<lt>archivoE<gt>] "
-"[I<E<lt>acciónE<gt>>] [--colour | --color [parte de la pantalla]:[primer "
-"plano],[fondo][:attr[+attr+..]]]"
+"Si no se especifica ningún I<paquete> se limpia la cola por completo, si se "
+"especifica alguno sólo se eliminan las partes de los paquetes relevantes."
 
-# type: Plain text
-#: dselect.1:26
+# type: TP
+#: dpkg-split.1:138
 #, fuzzy, no-wrap
-msgid ""
-"B<dselect>\n"
-"is one of the primary user interfaces for managing packages on a Debian\n"
-"system. At the B<dselect> main menu, the system administrator can:\n"
-" - Update the list of available package versions,\n"
-" - View the status of installed and available packages,\n"
-" - Alter package selections and manage dependencies,\n"
-" - Install new packages or upgrade to newer versions.\n"
-msgstr ""
-"B<dselect>\n"
-"es la principal interfaz para la instalación, manejo y eliminación de paquetes\n"
-"Debian GNU/Linux. En el menú principal de B<dselect>, el administrador del sistema puede:\n"
-" - Actualizar la lista de paquetes disponibles,\n"
-" - Ver el estado de los paquetes instalados y disponibles,\n"
-" - Alterar selecciones de paquetes y manejar las dependencias correspondientes,\n"
-" - Instalar nuevos paquetes o actualizarlos a nuevas versiones.\n"
+msgid "B<--depotdir>I< directory>"
+msgstr "B<--depotdir>I< directorio>"
 
 # type: Plain text
-#: dselect.1:38
+#: dpkg-split.1:143
 #, fuzzy
 msgid ""
-"B<dselect> operates as a front-end to B<dpkg>(1), the low-level debian "
-"package handling tool. It features a full-screen package selections manager "
-"with package depends and conflicts resolver. When run with administrator "
-"privileges, packages can be installed, upgraded and removed. Various access "
-"methods can be configured to retrieve available package version information "
-"and installable packages from package repositories.  Depending on the used "
-"access method, these repositories can be public archive servers on the "
-"internet, local archive servers or cdroms.  The recommended access method is "
-"I<apt>, which is provided by the package B<apt>."
+"Specifies an alternative directory for the queue of parts awaiting automatic "
+"reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
-"B<dselect> opera como interfaz de B<dpkg(8)>, la herramienta gestora de "
-"paquetes de Debian de bajo nivel.  Su ventaja es que posee una pantalla "
-"completa de selección de paquetes con resolución óptima de dependencias y "
-"conflictos.  Cuando se ejecuta con permisos de administrador, los paquetes "
-"pueden ser instalados, actualizados o eliminados. Varios métodos de acceso "
-"pueden ser configurados para saber las versiones disponibles e instalables "
-"desde los depósitos de paquetes correspondientes.  Dependiendo del método de "
-"acceso usado, esos depósitos de paquetes pueden ser públicos en servidores a "
-"través de Internet, redes locales o bien en cdroms.  El método de acceso "
-"recomendado es I<apt>, proporcionado por el paquete B<apt>."
+"Especifica un directorio alternativo para las partes que se encuentran en la "
+"cola esperando para ser reensambladas. Por omisión es B</var/lib/dpkg>."
+
+# type: TP
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
+msgstr "B<--partsize>|B<-S>I< kbytes>"
 
 # type: Plain text
-#: dselect.1:44
+#: dpkg-split.1:147
 #, fuzzy
 msgid ""
-"Normally B<dselect> is invoked without parameters. An interactive menu is "
-"presented, offering the user a list of actions. If an action is given as "
-"argument, then that action is started immediately. Several commandline "
-"parameters are still available to modify the running behaviour of B<dselect> "
-"or show additional information about the program."
+"Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
+"The default is 450 KiB."
 msgstr ""
-"Normalmente B<dselect> se invoca sin parámetros.  Se presenta un menú "
-"interactivo, ofreciendo al usuario una lista de acciones.  Si se da una "
-"acción como argumento, entonces será ejecutada inmediatamente.  Hay muchas "
-"órdenes disponibles para modificar el comportamiento de B<dselect> o también "
-"para mostrar información adicional acerca del programa."
+"Especifica el tamaño máximo de cada parte en kilobytes (1024 bytes). Por "
+"omisión es 450Kb."
+
+# type: TP
+#: dpkg-split.1:147
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--output> I<complete-output>"
+msgstr "B<--output>|B<-O>I< complete-output>"
 
 # type: Plain text
-#: dselect.1:51
+#: dpkg-split.1:150
 #, fuzzy
-msgid ""
-"All options can be specified both on the commandline and in the B<dselect> "
-"configuration file I</etc/dpkg/dselect.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the commandline option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
-msgstr ""
-"Todas las opciones pueden ser especificadas en la línea de órdenes, o bien "
-"en el fichero de configuración de B<dselect> ubicado en I</etc/dpkg/dselect."
-"cfg>.  Cada línea en el archivo de configuración es también una opción "
-"(exáctamente la misma que en la línea de órdenes) o un comentario (si este "
-"comienza con un B<#>)."
+msgid "Specifies the output file name for a reassembly."
+msgstr "Especifica el nombre del fichero donde se reensamblarán las partes."
 
 # type: Plain text
-#: dselect.1:57
+#: dpkg-split.1:155
 #, fuzzy
 msgid ""
-"Changes the directory where the dpkg `I<status>', `I<available>' and similar "
-"files are located. This defaults to I</var/lib/dpkg> and normally there "
-"shouldn't be any need to change it."
+"This overrides the default for a manual reassembly (B<--join>)  and is "
+"mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
-"Cambia el directorio donde el `estado', `disponible' y archivos similares de "
-"dpkg están ubicados.  Esto por defecto está en I</var/lib/dpkg> y "
-"normalmente no debería cambiar."
+"Ésto substituye el nombre por omisión en modo manual (B<--join>)  y es "
+"obligatorio para el modo automático (B<--auto>)."
 
 # type: TP
-#: dselect.1:57
+#: dpkg-split.1:155
 #, fuzzy, no-wrap
-msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
-msgstr "B<--debug E<lt>archivoE<gt> | -DE<lt>archivoE<gt>>"
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dselect.1:60
+#: dpkg-split.1:166
 #, fuzzy
-msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgid ""
+"When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
+"message if it is given a I<part> that is not a binary package part. This "
+"option suppresses this message, to allow programs such as B<dpkg> to cope "
+"with both split and unsplit packages without producing spurious messages."
 msgstr ""
-"Activa la depuración. Esta información es enviada al I<E<lt>archivoE<gt>> "
-"escogido."
+"Cuando B<dpkg-split> está en modo automático normalmente muestra mensajes si "
+"se le pasa una I<parte> que no es parte del paquete binario. Esta opción "
+"suprimer estos mensajes, esto permite que programas como B<dpkg> puedan "
+"separar y unir paquetes sin producir mensajes espúreos."
 
 # type: TP
-#: dselect.1:60
+#: dpkg-split.1:166
 #, fuzzy, no-wrap
-msgid "B<--expert>"
-msgstr "B<--expert>"
+msgid "B<--msdos>"
+msgstr "B<--msdos>"
 
 # type: Plain text
-#: dselect.1:64
+#: dpkg-split.1:171
 #, fuzzy
 msgid ""
-"Turns on expert mode, i.e. doesn't display possibly annoying help messages."
-msgstr ""
-"Activa el modo experto, por ejemplo, no mensajes de ayuda posiblemente "
-"molestos."
-
-# type: TP
-#: dselect.1:64
-#, fuzzy, no-wrap
-msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
-msgstr "B<--colour | --color [parte de la pantalla]:[primer plano],[fondo][:attr[+attr+..]]]>"
+"Forces the output filenames generated by B<--split> to be msdos-compatible."
+msgstr "Fuerza nombres compatibles con msdos."
 
 # type: Plain text
-#: dselect.1:71
+#: dpkg-split.1:177
 #, fuzzy
 msgid ""
-"Configures screen colors. This works only if your display supports colors.  "
-"This option may be used multiple times (and is best used in I<dselect.cfg>). "
-"Each use changes the color (and optionally, other attributes) of one part of "
-"the screen.  The parts of the screen (from top to bottom) are:"
+"This mangles the prefix - either the default derived from the input filename "
+"or the one supplied as an argument: alphanumerics are lowercased, plus signs "
+"are replaced by B<x>'s and all other characters are discarded."
 msgstr ""
-"Configura los colores de la pantalla. Estos funcionan únicamente si en su "
-"equipo es posible mostrar colores.  Esta opción puede ser usada cuantas "
-"veces se desee (es mejor usarla en I<dselect.cfg>).  Cada uso cambia el "
-"color (y opcionalmente, otros atributos) de una parte de la pantalla.  Estas "
-"partes de la pantalla (desde arriba hacia abajo) son:"
-
-# type: TP
-#: dselect.1:72
-#, fuzzy, no-wrap
-msgid "B<title>"
-msgstr "B<title>"
+"Esta opción modifica el prefijo (tanto el prefijo por omisión como el "
+"proporcionado por un argumento), los carácteres alfanuméricos se pasan a "
+"minúsculas, los signos '+' se reemplazano por B<x> y el resto de los "
+"carácteres se descartan."
 
 # type: Plain text
-#: dselect.1:75
+#: dpkg-split.1:182
 #, fuzzy
-msgid "The screen title."
-msgstr "El título de la pantalla."
+msgid ""
+"The result is then truncated as much as is necessary, and filenames of the "
+"form I<prefixN>B<of>I<M>B<.deb> are generated."
+msgstr ""
+"El resultado restante se trunca hasta donde sea necesario de forma que se "
+"generen ficheros de la forma I<prefijoN>B<of>I<M>B<.deb.>"
 
-# type: TP
-#: dselect.1:75
+# type: SH
+#: dpkg-split.1:183 update-alternatives.8:339
 #, fuzzy, no-wrap
-msgid "B<listhead>"
-msgstr "B<listhead>"
+msgid "EXIT STATUS"
+msgstr "ESTADO DE SALIDA"
 
 # type: Plain text
-#: dselect.1:78
+#: dpkg-split.1:189
 #, fuzzy
-msgid "The header line above the list of packages."
-msgstr "La línea de cabecera encima de la lista de paquetes."
-
-# type: TP
-#: dselect.1:78
-#, fuzzy, no-wrap
-msgid "B<list>"
-msgstr "B<list>"
+msgid ""
+"An exit status of 0 indicates that the requested split, merge, or other "
+"command succeeded.  B<--info> commands count as successful even if the files "
+"are not binary package parts."
+msgstr ""
+"Un estado de salida 0 indica que que la operación requerida se ha realizado "
+"con éxito.  Las órdenes B<--info> se dan cómo satisfactorias incluso si los "
+"ficheros no son parte de ningún paquete binario."
 
 # type: Plain text
-#: dselect.1:81
+#: dpkg-split.1:195
 #, fuzzy
-msgid "The scrolling list of packages (and also some help text)."
-msgstr "La lista de paquetes (y también otros textos de ayuda)."
-
-# type: TP
-#: dselect.1:81
-#, fuzzy, no-wrap
-msgid "B<listsel>"
-msgstr "B<listsel>"
+msgid ""
+"An exit status of 1 occurs only with B<--auto> and indicates that the "
+"I<part> file was not a binary package part."
+msgstr ""
+"Se devuelve un estado de salida de 1 sólo cuando se use la opción B<--auto> "
+"e indica que la I<parte> no era parte de un paquete binario."
 
 # type: Plain text
-#: dselect.1:84
+#: dpkg-split.1:199
 #, fuzzy
-msgid "The selected item in the list."
-msgstr "El elemento seleccionado en la lista."
-
-# type: TP
-#: dselect.1:84
-#, fuzzy, no-wrap
-msgid "B<pkgstate>"
-msgstr "B<pkgstate>"
+msgid ""
+"An exit status of 2 indicates some kind of trouble, such as a system call "
+"failure, a file that looked like a package part file but was corrupted, a "
+"usage error or some other problem."
+msgstr ""
+"Se devuelve un estado de salida de 2 cuando ocurre algún tipo de problema, "
+"como una llamada al sistema fallida, un fichero que parecía parte de un "
+"paquete pero que estaba corrupto, un uso incorrecto del programa o algún "
+"otro problema."
 
 # type: Plain text
-#: dselect.1:88
+#: dpkg-split.1:204
 #, fuzzy
 msgid ""
-"In the list of packages, the text indicating the current state of each "
-"package."
+"B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
+"of Debian packages."
 msgstr ""
-"En la lista de paquetes, el texto que indica el estado actual de cada "
-"paquete."
-
-# type: TP
-#: dselect.1:88
-#, fuzzy, no-wrap
-msgid "B<pkgstatesel>"
-msgstr "B<pkgstatesel>"
+"B<dpkg-split> usa algunas convenciones un tanto pasadas de fecha para el "
+"nombre de los paquetes de Debian."
 
 # type: Plain text
-#: dselect.1:92
+#: dpkg-split.1:207
 #, fuzzy
 msgid ""
-"In the list of packages, the text indicating the current state of the "
-"currently selected package."
+"Full details of the packages in the queue are impossible to get without "
+"digging into the queue directory yourself."
 msgstr ""
-"En la lista de paquetes, el texto que indica el estado actual del paquete "
-"seleccionado."
-
-# type: TP
-#: dselect.1:92
-#, fuzzy, no-wrap
-msgid "B<infohead>"
-msgstr "B<infohead>"
+"Es imposible obtener todos los detalles de los paquetes que están en la cola "
+"sin investigar en la cola directamente por uno mismo."
 
 # type: Plain text
-#: dselect.1:95
+#: dpkg-split.1:210
 #, fuzzy
 msgid ""
-"The header line that displays the state of the currently selected package."
-msgstr "La línea de cabecera que muestra el estado del paquete seleccionado."
-
-# type: TP
-#: dselect.1:95
-#, fuzzy, no-wrap
-msgid "B<infodesc>"
-msgstr "B<infodesc>"
+"There is no easy way to test whether a file that may be a binary package "
+"part is one."
+msgstr ""
+"No una manera sencilla de comprobar cuando un fichero que puede ser parte de "
+"un paquete bianrio lo es realmente."
 
 # type: Plain text
-#: dselect.1:98
+#: dpkg-split.1:214
 #, fuzzy
-msgid "The package's short description."
-msgstr "La descripción corta del paquete."
+msgid ""
+"The architecture is not represented in the part files' header, only in the "
+"control information of the contained binary package file, and it is not "
+"present in the filenames generated."
+msgstr ""
+"La arquitectura no se refleja en la cabecera de las partes del fichero, sólo "
+"en la información de control del paquete binario original, y este no esta "
+"presente en las partes generadas."
 
 # type: TP
-#: dselect.1:98
+#: dpkg-split.1:216
 #, fuzzy, no-wrap
-msgid "B<info>"
-msgstr "B<info>"
+msgid "I</var/lib/dpkg/parts>"
+msgstr "B</var/lib/dpkg/parts>"
 
 # type: Plain text
-#: dselect.1:101
+#: dpkg-split.1:220
 #, fuzzy
-msgid "Used to display package info such as the package's description."
+msgid ""
+"The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
-"Usado para mostrar la información del paquete tal como la descripción de él."
-
-# type: TP
-#: dselect.1:101
-#, fuzzy, no-wrap
-msgid "B<infofoot>"
-msgstr "B<infofoot>"
+"El directorio por omisión donde las partes esperan para un reensamblado "
+"automático."
 
 # type: Plain text
-#: dselect.1:104
+#: dpkg-split.1:225
 #, fuzzy
-msgid "The last line of the screen when selecting packages."
-msgstr "La última línea de la pantalla cuando se seleccionan paquetes."
+msgid ""
+"The filenames used in this directory are in a format internal to B<dpkg-"
+"split> and are unlikely to be useful to other programs, and in any case the "
+"filename format should not be relied upon."
+msgstr ""
+"Los nombre de los ficheros usados en este directorio se encuentran en un "
+"formato interno de B<dpkg-split> y es improbable que sean útiles para otros "
+"programas, en cualquier caso, no se deberían tener en cuenta."
 
-# type: TP
-#: dselect.1:104
-#, fuzzy, no-wrap
-msgid "B<query>"
-msgstr "B<query>"
+# type: Plain text
+#: dpkg-split.1:231
+#, fuzzy
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(8)"
 
 # type: Plain text
-#: dselect.1:107
+#: dpkg-split.1:241
 #, fuzzy
-msgid "Used to display query lines"
-msgstr "Usado para mostrar líneas de pregunta."
+msgid ""
+"B<dpkg-split> and this manpage were written by Ian Jackson. They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
+msgstr ""
+"B<dpkg-split> Esta página de manual fue escrita por Ian Jackson. Es "
+"Copyright (C) 1995-1996 del mismo y liberada bajo la Licencia Pública "
+"General de GNU, NO hay ninguna garantía. Vea B</usr/share/dpkg/copyright> y "
+"B</usr/share/common-licenses/GPL> para más información."
 
 # type: TP
-#: dselect.1:107
+#: dpkg-statoverride.8:1
 #, fuzzy, no-wrap
-msgid "B<helpscreen>"
-msgstr "B<helpscreen>"
+msgid "dpkg-statoverride"
+msgstr "I</var/lib/dpkg/statoverride>"
+
+# type: TH
+#: dpkg-statoverride.8:1
+#, fuzzy, no-wrap
+msgid "Debian project"
+msgstr "Proyecto Debian"
 
 # type: Plain text
-#: dselect.1:110
+#: dpkg-statoverride.8:4
 #, fuzzy
-msgid "Color of help screens."
-msgstr "Color de las pantallas de ayuda."
+msgid "dpkg-statoverride - override ownership and mode of files"
+msgstr "dpkg-statoverride -- cambia el propietario y grupo de ficheros"
 
 # type: Plain text
-#: dselect.1:115
+#: dpkg-statoverride.8:9
 #, fuzzy
-msgid ""
-"After the part of the screen comes a colon and the color specification. You "
-"can specify either the foreground color, the background color, or both, "
-"overriding the compiled-in colors. Use standard curses color names."
-msgstr ""
-"Luego de la parte de la pantalla, vienen dos puntos y la especificación del "
-"color.  Usted puede especificar el color del primer plano, el color de "
-"fondo, o ambos evitando los colores por defecto. Usted debe usar colores "
-"estándares de la biblioteca curses."
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opciones>] I<acción>"
 
 # type: Plain text
-#: dselect.1:121
+#: dpkg-statoverride.8:19
 #, fuzzy
 msgid ""
-"Optionally, after the color specification is another colon, and an attribute "
-"specification. This is a list of one or more attributes, separated by plus "
-"(\"+\") characters. Available attributes include (not all of these will work "
-"on all terminals): normal, standout, underline, reverse, blink, bright, dim, "
-"bold"
+"`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
+"or mode for a file when a package is installed. (note: I use the word `file' "
+"here, but in reality this can be any filesystem object that dpkg handles, "
+"including directories, devices, etc.). This can be used to force programs "
+"that are normally setuid to be install without a setuid flag, or only "
+"executable by a certain group."
 msgstr ""
-"Opcionalmente, luego de la especificación de colores hay otros dos puntos, y "
-"la especificación de los atributos. Ésta es una lista de uno o más "
-"atributos, separados por un signo (\"+\").  Los atributos disponibles "
-"incluyen (no todos funcionarán en todos los terminales): normal, standout, "
-"underline, reverse, blink, bright, dim, bold."
+"`B<La excepción de propiedades>' es un modo de indicar a dpkg que use un "
+"propietario o modo diferente para un fichero cuando lo instale. (nota: aquí "
+"usamos la palabra `fichero', pero puede tratarse de cualquier objeto del "
+"sistema de ficheros que dpkg pueda manejar, incluyendo directorios, "
+"dispositivos, etc). Puede usarse para forzar que programas que normalmente "
+"se instalan como setuid se instalen sin esta marca, o que sólo sean "
+"ejecutables por un grupo en concreto."
 
 # type: Plain text
-#: dselect.1:124
+#: dpkg-statoverride.8:23
 #, fuzzy
-msgid "Print a brief help text and exit successfully."
-msgstr "Muestra un breve texto de ayuda y termina el programa."
+msgid ""
+"B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
+"has three basic functions: adding, removing and listing overrides."
+msgstr ""
+"B<dpkg-statoverride> es una utilidad para administrar la lista de "
+"excepciones. Tiene tres funciones básicas: añadir, eliminar y listar las "
+"excepciones."
 
 # type: TP
-#: dselect.1:124
+#: dpkg-statoverride.8:25
 #, fuzzy, no-wrap
-msgid "B<--licence>|B<--license>"
-msgstr "B<--licence | --license>"
+msgid "B<--add>I< user group mode file>"
+msgstr "I<--add E<lt>usuarioE<gt> E<lt>grupoE<gt> E<lt>modoE<gt> E<lt>ficheroE<gt>>"
 
 # type: Plain text
-#: dselect.1:128
+#: dpkg-statoverride.8:32
 #, fuzzy
 msgid ""
-"Displays the B<dselect> copyright and license information and exits "
-"successfully."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
-"Muestra en pantalla los derechos de copia de B<dselect>, la información con "
-"respecto a su licencia y termina el programa."
+"Añade una excepción al B<E<lt>ficheroE<gt>>. No es necesario que exista el "
+"B<E<lt>ficheroE<gt>> cuando se use esta orden, la excepción se guardará para "
+"usarse posteriormente. Los usuarios y los grupos pueden especificarse por su "
+"nombre (por ejemplo B<root> o B<nobody>), o por su número precedido por un "
+"`B<#>' (por ejemplo B<#0> o B<#65534>)."
 
-# type: SH
-#: dselect.1:132
-#, fuzzy, no-wrap
-msgid "USAGE"
-msgstr "USO"
+# type: Plain text
+#: dpkg-statoverride.8:35
+#, fuzzy
+msgid ""
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
+msgstr ""
+"Si se especifica la opción --update y existe B<E<lt>ficheroE<gt>>, se le "
+"asigna inmediatamente el nuevo propietario y modo."
 
 # type: Plain text
-#: dselect.1:137
+#: dpkg-statoverride.8:39
 #, fuzzy
 msgid ""
-"When B<dselect> is started interactively, it prompts the user with a menu of "
-"available actions:"
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
-"Cuando B<dselect> es iniciado interactivamente, muestra al usuario un menú "
-"con las siguientes opciones disponibles:"
+"Elimina una excepción de B<E<lt>ficheroE<gt>>, esta orden no modifica el "
+"estado de B<E<lt>ficheroE<gt>>."
 
-# type: SS
-#: dselect.1:137
+# type: TP
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
-msgid "access"
-msgstr "access"
+msgid "B<--list> [I<glob-pattern>]"
+msgstr "I<--list [E<lt>patrón-globalE<gt>]>"
 
 # type: Plain text
-#: dselect.1:139
+#: dpkg-statoverride.8:44
 #, fuzzy
-msgid "Choose and configure an access method to access package repositories."
+msgid ""
+"List all overrides. If a glob pattern is specified restrict the output to "
+"overrides which match the glob. If there are no overrides or none match the "
+"glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
-"Selecciona y configura un método de acceso para los depósitos de paquetes."
+"Lista todas las excepciones. Si se especifica un patrón global, éste "
+"restringe la salida a lo que concuerde con el patrón. Si no hay ninguna "
+"excepción o ninguna concuerda con el patrón B<dpkg-statoverride> terminará "
+"con un código de salida igual a 1."
 
 # type: Plain text
-#: dselect.1:145
+#: dpkg-statoverride.8:56
 #, fuzzy
 msgid ""
-"By default, B<dselect> provides several methods such as I<floppy>, "
-"I<harddisk> or I<cdrom>, but other packages may provide additional methods, "
-"eg. the I<apt> access method provided by the B<apt> package or I<multi_cd> "
-"by the B<dpkg-multicd> package."
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
 msgstr ""
-"Por defecto, B<dselect> proporciona una alta cantidad de métodos tales como "
-"I<floppy>, I<harddisk> o I<cdrom>, aunque otros paquetes podrían "
-"proporcionar más aún, ejemplo, el método de acceso I<apt> proporcionado por "
-"el paquete B<apt> o bien I<multi_cd> proporcionado por el paquete B<dpkg-"
-"multicd>."
-
-# type: Plain text
-#: dselect.1:147
-#, fuzzy
-msgid "The use of the I<apt> access method is strongly recommended."
-msgstr "El uso del método de acceso vía I<apt> es altamente recomendado."
+"Cambia el directorio con la base de datos de dpkg donde también se guarda la "
+"información relativa a statoverride. Por omisión es /var/lib/dpkg."
 
-# type: SS
-#: dselect.1:148
+# type: TP
+#: dpkg-statoverride.8:56
 #, fuzzy, no-wrap
-msgid "update"
-msgstr "update"
-
-# type: Plain text
-#: dselect.1:150
-#, fuzzy
-msgid "Refresh the available packages database."
-msgstr "Actualiza la lista disponible de paquetes."
+msgid "B<--force>"
+msgstr "I<--force>"
 
 # type: Plain text
-#: dselect.1:157
+#: dpkg-statoverride.8:60
 #, fuzzy
 msgid ""
-"Retrieves a list of available package versions from the package repository, "
-"configured for the current access method, and update the dpkg database. The "
-"package lists are commonly provided by the repository as files named "
-"I<Packages> or I<Packages.gz>.  These files can be generated by repository "
-"maintainers, using the program B<dpkg-scanpackages>(1)."
+"Force an action, even if a sanity check would otherwise prohibit it.  This "
+"is necessary to override an existing override."
 msgstr ""
-"Obtiene una lista de versiones disponibles de paquetes desde un depósito de "
-"ellos, configurado por el método de acceso seleccionado, y actualiza la base "
-"de datos de dpkg.  La lista de paquetes es comúnmente proporcionada por el "
-"depósito de paquetes, mediante un archivo llamado B<Packages> o B<Packages."
-"gz>.  Esos archivos pueden ser generados por los mantenedores de los "
-"depósitos de paquetes, usando el programa B<dpkg-scanpackages(1)>."
+"Fuerza una acción, incluso si ésta pudiese resultar perjudicial. Es "
+"necesario para modificar una excepción existente."
+
+# type: TP
+#: dpkg-statoverride.8:60
+#, fuzzy, no-wrap
+msgid "B<--update>"
+msgstr "I<--update>"
 
 # type: Plain text
-#: dselect.1:160
+#: dpkg-statoverride.8:64
 #, fuzzy
 msgid ""
-"Details of the update action depend on the access method's implementation.  "
-"Normally the process is straightforward and requires no user interaction."
+"Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
-"Los detalles de la acción de actualizar dependen del método de acceso que se "
-"haya implementado.  Normalmente este proceso es automático y no requiere "
-"interacción del usuario."
-
-# type: SS
-#: dselect.1:161
-#, fuzzy, no-wrap
-msgid "select"
-msgstr "select"
+"Trata inmediatamente de cambiar el fichero al nuevo propietario y modo, si "
+"es que existe."
 
 # type: Plain text
-#: dselect.1:163
+#: dpkg-statoverride.8:67
 #, fuzzy
-msgid "View or manage package selections and dependencies."
-msgstr ""
-"Visualiza o maneja la selección de paquetes y sus respectivas dependencias."
+msgid "Be less verbose about what we do."
+msgstr "Es menos explicativo a cerca de lo que realiza."
+
+# type: TP
+#: dpkg-statoverride.8:69
+#, fuzzy, no-wrap
+msgid "I</var/lib/dpkg/statoverride>"
+msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dselect.1:169
+#: dpkg-statoverride.8:74
 #, fuzzy
 msgid ""
-"This is the main function of B<dselect>. In the select screen, the user can "
-"review a list of all available and installed packages. When run with "
-"administrator privileges, it is also possible to interactively change "
-"packages selection state. B<dselect> tracks the implications of these "
-"changes to other depending or conflicting packages."
+"File which contains the current list of stat overrides of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
-"Esta es la principal función de B<dselect>.  En la pantalla de selección, el "
-"usuario puede revisar una lista de todos los paquetes disponibles e "
-"instalados.  Cuando se ejecuta con permisos de administrador, también es "
-"posible cambiar el estado de la selección interactivamente.  B<dselect> "
-"sigue esos cambios a otros paquetes dependientes o conflictivos."
+"Fichero que contiene la lista actual de excepciones de propiedades del "
+"sistema. Se encuentra en el directorio de administración dpkg, junto con "
+"otros ficheros importantes para dpkg, como `status' o `available'."
 
 # type: Plain text
-#: dselect.1:176
+#: dpkg-statoverride.8:77
 #, fuzzy
 msgid ""
-"When a conflict or failed depends is detected, a dependency resolution "
-"subscreen is prompted to the user. In this screen, a list of conflicting or "
-"depending packages is shown, and for each package listed, the reason for its "
-"listing is shown. The user may apply the suggestions proposed by B<dselect>, "
-"override them, or back out all the changes, including the ones that created "
-"the unresolved depends or conflicts."
+"Note: dpkg-statoverride preserves the old copy of this file, with extension "
+"\"-old\", before replacing it with the new one."
 msgstr ""
-"Cuando hay un conflicto, o bien una dependencia falla, se muestra la "
-"pantalla de resolución de dependencias.  En esta pantalla, se muestra una "
-"lista de paquetes conflictivos o dependientes, para cada paquete en la "
-"lista. El usuario puede aplicar las sugerencias entregadas por B<dselect>, "
-"evitarlas, o bien deshacer los cambios hechos, incluyendo aquellos en los "
-"que de dejaron dependencias o conflictos sin resolver."
+"Nota: dpkg-statoverride preserva una copia antigua del fichero con la "
+"extensión \"-old\" antes de reemplazarla con una nueva."
 
 # type: Plain text
-#: dselect.1:179
+#: dpkg-statoverride.8:83
 #, fuzzy
-msgid ""
-"The use of the interactive package selections management screen is explained "
-"in more detail below."
-msgstr ""
-"El uso de esta selección de paquetes interactiva con respecto al manejo de "
-"la pantalla será explicada más abajo en el texto."
+msgid "Copyright 2000 Wichert Akkerman"
+msgstr "Copyright 2000 Wichert Akkerman"
 
 # type: SS
-#: dselect.1:180
+#: dselect.1:1
 #, fuzzy, no-wrap
-msgid "install"
-msgstr "install"
+msgid "dselect"
+msgstr "select"
 
 # type: Plain text
-#: dselect.1:182
+#: dselect.1:4
 #, fuzzy
-msgid "Installs selected packages."
-msgstr "Instala los paquetes seleccionados."
+msgid "dselect - Debian package management frontend"
+msgstr "dselect - Interfaz del manipulador de paquetes Debian para consola."
 
 # type: Plain text
-#: dselect.1:188
+#: dselect.1:17
 #, fuzzy
 msgid ""
-"The configured access method will fetch installable or upgradable packages "
-"from the relevant repositories and install these using B<dpkg>.  Depending "
-"on the implementation of the access method, all packages can be prefetched "
-"before installation, or fetched when needed.  Some access methods may also "
-"remove packages that were marked for removal."
+"B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
+"[B<--licence>|B<--license>] [B<--expert>] [B<--debug>|B<-"
+"D>I<E<lt>fileE<gt>>] [I<E<lt>actionE<gt>>] [B<--colour>|B<--color> "
+"I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]]"
 msgstr ""
-"El método de acceso configurado descargará los paquetes instalables o "
-"actualizables desde los depósitos relevantes, y los instalará usando "
-"B<dpkg>.  Dependiendo de la implementación del método de acceso, todos los "
-"paquetes pueden ser pre-descargados antes de la instalación, o bien cuando "
-"se requiera.  Algunos métodos de acceso podrían borrar paquetes que fueron "
-"marcados para ser eliminados"
+"B<dselect> [--admindir E<lt>directorioE<gt>] [--help] [--version] [--licence "
+"| --license] [--expert] [--debug | -D E<lt>archivoE<gt>] "
+"[I<E<lt>acciónE<gt>>] [--colour | --color [parte de la pantalla]:[primer "
+"plano],[fondo][:attr[+attr+..]]]"
 
 # type: Plain text
-#: dselect.1:196
-#, fuzzy
+#: dselect.1:26
+#, fuzzy, no-wrap
 msgid ""
-"If an error occurred during install, it is usually advisable to run install "
-"again. In most cases, the problems will disappear or be solved.  If problems "
-"persist or the installation performed was incorrect, please investigate into "
-"the causes and circumstances, and file a bug in the Debian bug tracking "
-"system. Instructions on how to do this can be found at http://bugs.debian."
-"org/ or by reading the documentation for B<bug>(1) or B<reportbug>(1), if "
-"these are installed."
+"B<dselect>\n"
+"is one of the primary user interfaces for managing packages on a Debian\n"
+"system. At the B<dselect> main menu, the system administrator can:\n"
+" - Update the list of available package versions,\n"
+" - View the status of installed and available packages,\n"
+" - Alter package selections and manage dependencies,\n"
+" - Install new packages or upgrade to newer versions.\n"
 msgstr ""
-"Si ocurre algún error durante la instalación, normalmente usted debería "
-"ejecutar la instalación nuevamente.  En la mayoría de los casos, los "
-"problemas desaparecerán o bien serán resueltos.  SI el problema persiste o "
-"la instalación fue realizada de forma incorrecta, por favor sírvase a "
-"investigar las causas y circunstancias de el problema, y contacte "
-"rápidamente al sistema de seguimiento de fallos de Debian.  Las "
-"instrucciones correspondientes pueden encontrarse en http://bugs.debian.org/ "
-"o bien leyendo la documentación de los programas B<bug(1)> o B<reportbug(1)"
-">, si es que están instalados, obviamente."
+"B<dselect>\n"
+"es la principal interfaz para la instalación, manejo y eliminación de paquetes\n"
+"Debian GNU/Linux. En el menú principal de B<dselect>, el administrador del sistema puede:\n"
+" - Actualizar la lista de paquetes disponibles,\n"
+" - Ver el estado de los paquetes instalados y disponibles,\n"
+" - Alterar selecciones de paquetes y manejar las dependencias correspondientes,\n"
+" - Instalar nuevos paquetes o actualizarlos a nuevas versiones.\n"
 
 # type: Plain text
-#: dselect.1:203
+#: dselect.1:38
 #, fuzzy
 msgid ""
-"Details of the install action depend on the access method's implementation.  "
-"The user's attention and input may be required during installation, "
-"configuration or removal of packages. This depends on the maintainer scripts "
-"in the package. Some packages make use of the B<debconf>(1)  library, "
-"allowing for more flexible or even automated installation setups."
+"B<dselect> operates as a front-end to B<dpkg>(1), the low-level debian "
+"package handling tool. It features a full-screen package selections manager "
+"with package depends and conflicts resolver. When run with administrator "
+"privileges, packages can be installed, upgraded and removed. Various access "
+"methods can be configured to retrieve available package version information "
+"and installable packages from package repositories.  Depending on the used "
+"access method, these repositories can be public archive servers on the "
+"internet, local archive servers or cdroms.  The recommended access method is "
+"I<apt>, which is provided by the package B<apt>."
 msgstr ""
-"Los detalles de la instalación dependen de la implementación de el método de "
-"acceso.  La atención completa del usuario puede ser requerida durante la "
-"instalación, configuración o eliminación de los paquetes correspondientes.  "
-"Esto depende exclusivamente de los scripts que posean los paquetes.  Algunos "
-"de ellos hacen uso de la biblioteca de B<debconf(8)>, permitiendo de esta "
-"manera una instalación mas flexible o también más automatizada."
-
-# type: SS
-#: dselect.1:204
-#, fuzzy, no-wrap
-msgid "config"
-msgstr "config"
+"B<dselect> opera como interfaz de B<dpkg(8)>, la herramienta gestora de "
+"paquetes de Debian de bajo nivel.  Su ventaja es que posee una pantalla "
+"completa de selección de paquetes con resolución óptima de dependencias y "
+"conflictos.  Cuando se ejecuta con permisos de administrador, los paquetes "
+"pueden ser instalados, actualizados o eliminados. Varios métodos de acceso "
+"pueden ser configurados para saber las versiones disponibles e instalables "
+"desde los depósitos de paquetes correspondientes.  Dependiendo del método de "
+"acceso usado, esos depósitos de paquetes pueden ser públicos en servidores a "
+"través de Internet, redes locales o bien en cdroms.  El método de acceso "
+"recomendado es I<apt>, proporcionado por el paquete B<apt>."
 
 # type: Plain text
-#: dselect.1:206
+#: dselect.1:44
 #, fuzzy
-msgid "Configures any previously installed, but not fully configured packages."
+msgid ""
+"Normally B<dselect> is invoked without parameters. An interactive menu is "
+"presented, offering the user a list of actions. If an action is given as "
+"argument, then that action is started immediately. Several commandline "
+"parameters are still available to modify the running behaviour of B<dselect> "
+"or show additional information about the program."
 msgstr ""
-"Configura cualquier paquete previamente instalado, que no este totalmente "
-"configurado."
-
-# type: SS
-#: dselect.1:207
-#, fuzzy, no-wrap
-msgid "remove"
-msgstr "remove"
+"Normalmente B<dselect> se invoca sin parámetros.  Se presenta un menú "
+"interactivo, ofreciendo al usuario una lista de acciones.  Si se da una "
+"acción como argumento, entonces será ejecutada inmediatamente.  Hay muchas "
+"órdenes disponibles para modificar el comportamiento de B<dselect> o también "
+"para mostrar información adicional acerca del programa."
 
 # type: Plain text
-#: dselect.1:209
+#: dselect.1:51
 #, fuzzy
-msgid "Removes or purges installed packages, that are marked for removal."
-msgstr ""
-"Elimina o purga (n.t. es decir, elimina los ficheros de configuración) los "
-"paquetes instalados que estén marcados para este proceso."
+msgid ""
+"All options can be specified both on the commandline and in the B<dselect> "
+"configuration file I</etc/dpkg/dselect.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the commandline option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
+msgstr ""
+"Todas las opciones pueden ser especificadas en la línea de órdenes, o bien "
+"en el fichero de configuración de B<dselect> ubicado en I</etc/dpkg/dselect."
+"cfg>.  Cada línea en el archivo de configuración es también una opción "
+"(exáctamente la misma que en la línea de órdenes) o un comentario (si este "
+"comienza con un B<#>)."
 
-# type: SS
-#: dselect.1:210
+# type: TP
+#: dselect.1:52
 #, fuzzy, no-wrap
-msgid "quit"
-msgstr "quit"
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir>I< E<lt>directorioE<gt>>"
 
 # type: Plain text
-#: dselect.1:212
+#: dselect.1:57
 #, fuzzy
-msgid "Quit B<dselect>"
-msgstr "Salir de B<dselect>"
+msgid ""
+"Changes the directory where the dpkg `I<status>', `I<available>' and similar "
+"files are located. This defaults to I</var/lib/dpkg> and normally there "
+"shouldn't be any need to change it."
+msgstr ""
+"Cambia el directorio donde el `estado', `disponible' y archivos similares de "
+"dpkg están ubicados.  Esto por defecto está en I</var/lib/dpkg> y "
+"normalmente no debería cambiar."
+
+# type: TP
+#: dselect.1:57
+#, fuzzy, no-wrap
+msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
+msgstr "B<--debug E<lt>archivoE<gt> | -DE<lt>archivoE<gt>>"
 
 # type: Plain text
-#: dselect.1:214
+#: dselect.1:60
 #, fuzzy
-msgid "Exits the program with zero (successful) errorcode."
-msgstr "Termina el programa exitosamente (el código de error devuelto será 0)."
-
-# type: SH
-#: dselect.1:216
-#, fuzzy, no-wrap
-msgid "Package selections management"
-msgstr "Manejo de selecciones de paquetes"
+msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
+msgstr ""
+"Activa la depuración. Esta información es enviada al I<E<lt>archivoE<gt>> "
+"escogido."
 
-# type: SS
-#: dselect.1:218
+# type: TP
+#: dselect.1:60
 #, fuzzy, no-wrap
-msgid "Introduction"
-msgstr "Introducción"
+msgid "B<--expert>"
+msgstr "B<--expert>"
 
 # type: Plain text
-#: dselect.1:234
+#: dselect.1:64
 #, fuzzy
 msgid ""
-"B<dselect> directly exposes the administrator to some of the complexities "
-"involved with managing large sets of packages with many interdependencies. "
-"For a user who is unfamiliar with the concepts and the ways of the debian "
-"package management system, it can be quite overwhelming. Although B<dselect> "
-"is aimed at easing package management and administration, it is only "
-"instrumental in doing so and can not be assumed to be a sufficient "
-"substitute for administrator skill and understanding. The user is required "
-"to be familiar with the concepts underlying the Debian packaging system.  In "
-"case of doubt, consult the B<dpkg>(1) manpage and the Debian Policy manual, "
-"contained in the B<debian-policy> package."
+"Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
-"B<dselect> expone directamente al administrador algunas de las posibles "
-"complejidades relacionadas con el manejo de una larga lista de paquetes con "
-"muchas dependencias.  Para un usuario que no esté familiarizo con los "
-"conceptos y el manejo de paquetes que posee Debian, este proceso podría ser "
-"un tanto complicado. Sin embargo B<dselect> apunta a ser un programa de "
-"manejo y administración fácil, por lo mismo no podría ser considerado como "
-"un substituto de un administrador.  Se requiere que el usuario este "
-"familiarizado con algunos conceptos del sistema de paquetes de Debian.  En "
-"caso de dudas, consulte la página man de B<dpkg(8)> y el manual de normas de "
-"Debian."
+"Activa el modo experto, por ejemplo, no mensajes de ayuda posiblemente "
+"molestos."
+
+# type: TP
+#: dselect.1:64
+#, fuzzy, no-wrap
+msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
+msgstr "B<--colour | --color [parte de la pantalla]:[primer plano],[fondo][:attr[+attr+..]]]>"
 
 # type: Plain text
-#: dselect.1:240
+#: dselect.1:71
 #, fuzzy
 msgid ""
-"Unless B<dselect> is run in expert or immediate mode, a help screen is first "
-"displayed when choosing this action from the menu. The user is I<strongly> "
-"advised to study all of the information presented in the online help "
-"screens, when one pops up.  The online help screens can at any time be "
-"invoked with the B<'?'> key."
+"Configures screen colors. This works only if your display supports colors.  "
+"This option may be used multiple times (and is best used in I<dselect.cfg>). "
+"Each use changes the color (and optionally, other attributes) of one part of "
+"the screen.  The parts of the screen (from top to bottom) are:"
 msgstr ""
-"A menos que B<dselect> sea ejecutado en modo experto o intermedio, se "
-"muestra una pantalla de ayuda cuando se selecciona esta acción desde el "
-"menú.  Se aconseja I<fervientemente> al usuario que estudie toda la "
-"información presentada en las pantallas de ayuda.  La ayuda en línea puede "
-"obtenerse en cualquier momento mediante la tecla B<'?'>."
+"Configura los colores de la pantalla. Estos funcionan únicamente si en su "
+"equipo es posible mostrar colores.  Esta opción puede ser usada cuantas "
+"veces se desee (es mejor usarla en I<dselect.cfg>).  Cada uso cambia el "
+"color (y opcionalmente, otros atributos) de una parte de la pantalla.  Estas "
+"partes de la pantalla (desde arriba hacia abajo) son:"
 
-# type: SS
-#: dselect.1:241
+# type: TP
+#: dselect.1:72
 #, fuzzy, no-wrap
-msgid "Screen layout"
-msgstr "Disposición de la pantalla"
+msgid "B<title>"
+msgstr "B<title>"
 
 # type: Plain text
-#: dselect.1:249
+#: dselect.1:75
 #, fuzzy
-msgid ""
-"The select screen is by default split in a top and a bottom half.  The top "
-"half shows a list of packages. A cursor bar can select an individual "
-"package, or a group of packages, if applicable, by selecting the group "
-"header. The bottom half of the screen shows some details about the package "
-"currently selected in the top half of the screen.  The type of detail that "
-"is displayed can be varied."
-msgstr ""
-"La pantalla de selección es por defecto dividida en dos partes, superior e "
-"inferior.  La parte de arriba muestra la lista de paquetes. Mediante el "
-"cursor se puede seleccionar un paquete individual, o un grupo de paquetes, "
-"si es que se puede, seleccionando la cabecera del grupo.  La parte de abajo "
-"de la pantalla muestra algunos de los detalles del paquete seleccionado en "
-"la parte de arriba de la pantalla.  El tipo de detalle mostrado puede variar."
+msgid "The screen title."
+msgstr "El título de la pantalla."
+
+# type: TP
+#: dselect.1:75
+#, fuzzy, no-wrap
+msgid "B<listhead>"
+msgstr "B<listhead>"
 
 # type: Plain text
-#: dselect.1:252
+#: dselect.1:78
 #, fuzzy
-msgid ""
-"Pressing the B<'I'> key toggles a full-screen display of the packages list, "
-"an enlarged view of the package details, or the equally split screen."
-msgstr ""
-"Presionando la tecla B<'I'> la lista de paquetes será mostrada en pantalla "
-"completa, también una vista alargada de los detalles de los paquetes, o la "
-"pantalla igualmente dividida."
+msgid "The header line above the list of packages."
+msgstr "La línea de cabecera encima de la lista de paquetes."
 
-# type: SS
-#: dselect.1:253
+# type: TP
+#: dselect.1:78
 #, fuzzy, no-wrap
-msgid "Package details view"
-msgstr "Detalles de la vista de paquetes."
+msgid "B<list>"
+msgstr "B<list>"
 
 # type: Plain text
-#: dselect.1:262
+#: dselect.1:81
+#, fuzzy
+msgid "The scrolling list of packages (and also some help text)."
+msgstr "La lista de paquetes (y también otros textos de ayuda)."
+
+# type: TP
+#: dselect.1:81
 #, fuzzy, no-wrap
-msgid ""
-"The package details view by default shows the extended package description\n"
-"for the package that is currently selected in the packages status list.\n"
-"The type of detail can be toggled by pressing the B<'i'> key. This\n"
-"alternates between:\n"
-" - the extended description\n"
-" - the control information for the installed version\n"
-" - the control information for the available version\n"
-msgstr ""
-"Por defecto se muestra una descripción bastante extensa del paquete que esta seleccionado en la lista.\n"
-"El tipo de detalles puede ser cambiado presionando la tecla B<'i'>.\n"
-"Las opciones posibles son:\n"
-" - la descripción extendida\n"
-" - la información de control de la versión instalada\n"
-" - la información de control de la versión disponible\n"
+msgid "B<listsel>"
+msgstr "B<listsel>"
 
 # type: Plain text
-#: dselect.1:266
+#: dselect.1:84
 #, fuzzy
-msgid ""
-"In a dependency resolution screen, there is also the possibility of viewing "
-"the specific unresolved depends or conflicts related to the package and "
-"causing it to be listed."
-msgstr ""
-"En la pantalla de resolución de dependencias, existe la posibilidad de ver "
-"los posibles problemas sin resolver, o los conflictos con respecto al "
-"paquete."
+msgid "The selected item in the list."
+msgstr "El elemento seleccionado en la lista."
 
-# type: SS
-#: dselect.1:267
+# type: TP
+#: dselect.1:84
 #, fuzzy, no-wrap
-msgid "Packages status list"
-msgstr "Lista de estado de los paquetes"
+msgid "B<pkgstate>"
+msgstr "B<pkgstate>"
 
 # type: Plain text
-#: dselect.1:272
+#: dselect.1:88
 #, fuzzy
 msgid ""
-"The main select screen displays a list of all packages known to the debian "
-"package management system. This includes packages installed on the system "
-"and packages known from the available packages database."
+"In the list of packages, the text indicating the current state of each "
+"package."
 msgstr ""
-"La pantalla principal muestra una lista de todos los paquetes conocidos por "
-"el sistema de manejo de paquetes de Debian.  Esto incluye a los paquetes "
-"instalados en el sistema, y también los disponibles en los depósitos."
+"En la lista de paquetes, el texto que indica el estado actual de cada "
+"paquete."
+
+# type: TP
+#: dselect.1:88
+#, fuzzy, no-wrap
+msgid "B<pkgstatesel>"
+msgstr "B<pkgstatesel>"
 
 # type: Plain text
-#: dselect.1:280
+#: dselect.1:92
 #, fuzzy
 msgid ""
-"For every package, the list shows the package's status, priority, section, "
-"installed and available versions, the package name and its short "
-"description, all in one line. By pressing the B<'V'> key, the display of the "
-"installed and available version can be toggled between on an off. By "
-"pressing the B<'v'> key, the package status display is toggled between "
-"verbose and shorthand.  Shorthand display is the default."
+"In the list of packages, the text indicating the current state of the "
+"currently selected package."
 msgstr ""
-"Para cada paquete, la lista muestra el estado, prioridad, sección, versión "
-"instalada y disponible, el nombre del paquete y su descripción corta, todo "
-"esto en una sola línea.  Presionando la tecla B<'V'>, se puede decidir si se "
-"desea mostrar la versión instalada y disponible.  Presionando la tecla "
-"B<'v'>, se puede decidir si se desea mostrar el estado del paquete, de forma "
-"breve o prolija.  De forma breve, es la opción por defecto."
+"En la lista de paquetes, el texto que indica el estado actual del paquete "
+"seleccionado."
+
+# type: TP
+#: dselect.1:92
+#, fuzzy, no-wrap
+msgid "B<infohead>"
+msgstr "B<infohead>"
 
 # type: Plain text
-#: dselect.1:286
+#: dselect.1:95
 #, fuzzy
 msgid ""
-"The shorthand status indication consists of four parts: an error flag, which "
-"should normally be clear, the current status, the last selection state and "
-"the current selection state.  The first two relate to the actual state of "
-"the package, the second pair are about the selections set by the user."
-msgstr ""
-"El estado en forma breve consiste de cuatro partes: una parte de error, la "
-"cual normalmente debería estar vacía, el estado actual, el estado de la "
-"última y actual selección.  Las primeras dos están en directa relación con "
-"el estado actual del paquete, el segundo par con las selecciones del usuario."
+"The header line that displays the state of the currently selected package."
+msgstr "La línea de cabecera que muestra el estado del paquete seleccionado."
+
+# type: TP
+#: dselect.1:95
+#, fuzzy, no-wrap
+msgid "B<infodesc>"
+msgstr "B<infodesc>"
 
 # type: Plain text
-#: dselect.1:304
+#: dselect.1:98
+#, fuzzy
+msgid "The package's short description."
+msgstr "La descripción corta del paquete."
+
+# type: TP
+#: dselect.1:98
 #, fuzzy, no-wrap
-msgid ""
-"These are the meanings of the shorthand package status indicator codes:\n"
-" Error flag:\n"
-"  I<empty>   no error\n"
-"  B<R>       serious error, needs reinstallation;\n"
-" Installed state:\n"
-"  I<empty>   not installed;\n"
-"  B<*>       fully installed and configured;\n"
-"  B<->       not installed but some config files may remain;\n"
-"  B<U>       unpacked but not yet configured;\n"
-"  B<C>       half-configured (an error happened);\n"
-"  B<I>       half-installed (an error happened).\n"
-" Current and requested selections:\n"
-"  B<*>       marked for installation or upgrade;\n"
-"  B<->       marked for removal, configuration files remain;\n"
-"  B<=>       on hold: package will not be processed at all;\n"
-"  B<_>       marked for purge, also remove configuration;\n"
-"  B<n>       package is new and has yet to be marked.\n"
+msgid "B<info>"
+msgstr "B<info>"
+
+# type: Plain text
+#: dselect.1:101
+#, fuzzy
+msgid "Used to display package info such as the package's description."
 msgstr ""
-"Aquí están los significados de cada uno de los indicadores:\n"
-" Parte de error: \n"
-"  I<vacío>   no hay error\n"
-"  B<R>       error serio, necesita reinstalación;\n"
-" Estado de la instalación:   \n"
-"  I<vacío>   no está instalado;\n"
-"  B<*>       totalmente instalado y configurado;\n"
-"  B<->      no está instalado, pero aún existen archivos de configuración;\n"
-"  B<U>       desempaquetado, pero aún no configurado;\n"
-"  B<C>       medio-configurado (ocurrió un error);\n"
-"  B<I>       medio-instalado (ocurrió un error).\n"
-" Selección actual y solicitada:\n"
-"  B<*>       marcado para instalación o actualización;\n"
-"  B<->      marcado para ser eliminado, no se eliminan ficheros de configuración;\n"
-"  B<=>       bloqueado: el paquete no será procesado en absoluto;\n"
-"  B<_>       paquete marcado para purgación, también elimina configuración;\n"
-"  B<n>       paquete es nuevo y aún todavía necesita ser marcado.\n"
+"Usado para mostrar la información del paquete tal como la descripción de él."
 
-# type: SS
-#: dselect.1:305
+# type: TP
+#: dselect.1:101
 #, fuzzy, no-wrap
-msgid "Cursor and screen movement"
-msgstr "Movimiento del cursor y de la pantalla"
+msgid "B<infofoot>"
+msgstr "B<infofoot>"
 
 # type: Plain text
-#: dselect.1:310
+#: dselect.1:104
+#, fuzzy
+msgid "The last line of the screen when selecting packages."
+msgstr "La última línea de la pantalla cuando se seleccionan paquetes."
+
+# type: TP
+#: dselect.1:104
+#, fuzzy, no-wrap
+msgid "B<query>"
+msgstr "B<query>"
+
+# type: Plain text
+#: dselect.1:107
+#, fuzzy
+msgid "Used to display query lines"
+msgstr "Usado para mostrar líneas de pregunta."
+
+# type: TP
+#: dselect.1:107
+#, fuzzy, no-wrap
+msgid "B<helpscreen>"
+msgstr "B<helpscreen>"
+
+# type: Plain text
+#: dselect.1:110
+#, fuzzy
+msgid "Color of help screens."
+msgstr "Color de las pantallas de ayuda."
+
+# type: Plain text
+#: dselect.1:115
 #, fuzzy
 msgid ""
-"The package selection list and the dependency conflict resolution screens "
-"can be navigated using motion commands mapped to the following keys:"
+"After the part of the screen comes a colon and the color specification. You "
+"can specify either the foreground color, the background color, or both, "
+"overriding the compiled-in colors. Use standard curses color names."
 msgstr ""
-"La lista de selección de paquetes y la pantalla de resolución de "
-"dependencias y conflictos pueden ser navegadas usando las siguientes teclas:"
+"Luego de la parte de la pantalla, vienen dos puntos y la especificación del "
+"color.  Usted puede especificar el color del primer plano, el color de "
+"fondo, o ambos evitando los colores por defecto. Usted debe usar colores "
+"estándares de la biblioteca curses."
 
 # type: Plain text
-#: dselect.1:327
-#, fuzzy, no-wrap
+#: dselect.1:121
+#, fuzzy
 msgid ""
-"  B<p, Up, k>           move cursor bar up\n"
-"  B<n, Down, j>         move cursor bar down\n"
-"  B<P, Pgup, Backspace> scroll list 1 page up\n"
-"  B<N, Pgdn, Space>     scroll list 1 page down\n"
-"  B<^p>                 scroll list 1 line up\n"
-"  B<^n>                 scroll list 1 line down\n"
-"  B<t, Home>            jump to top of list\n"
-"  B<e, End>             jump to end of list\n"
-"  B<u>                  scroll info 1 page up\n"
-"  B<d>                  scroll info 1 page down\n"
-"  B<^u>                 scroll info 1 line up\n"
-"  B<^d>                 scroll info 1 line down\n"
-"  B<B, Left-arrow>      pan display 1/3 screen left\n"
-"  B<F, Right-arrow>     pan display 1/3 screen right\n"
-"  B<^b>                 pan display 1 character left\n"
-"  B<^f>                 pan display 1 character right\n"
+"Optionally, after the color specification is another colon, and an attribute "
+"specification. This is a list of one or more attributes, separated by plus "
+"(\"+\") characters. Available attributes include (not all of these will work "
+"on all terminals): normal, standout, underline, reverse, blink, bright, dim, "
+"bold"
 msgstr ""
-"  B<p, Up, k>           mueve el cursor hacia arriba\n"
-"  B<n, Down, j>         mueve el cursor hacia abajo\n"
-"  B<P, Pgup, Backspace> mueve la lista una página hacia arriba\n"
-"  B<N, Pgdn, Space>     mueve la lista una página hacia abajo\n"
-"  B<^p>                 mueve la lista una línea hacia arriba\n"
-"  B<^n>                 mueve la lista una línea hacia abajo\n"
-"  B<t, Home>            salta al principio de la lista\n"
-"  B<e, End>             salta al fin de la lista\n"
-"  B<u>                  mueve info una página hacia arriba\n"
-"  B<d>                  mueve info una página hacia abajo\n"
-"  B<^u>                 mueve info una línea hacia abajo\n"
-"  B<^d>                 mueve info una línea hacia abajo\n"
-"  B<B, Left-arrow>     exhibe la pantalla 1/3 hacia la izquierda\n"
-"  B<F, Right-arrow>    exhibe la pantalla 1/3 hacia la derecha\n"
-"  B<^b>                 exhibe un carácter hacia la izquierda\n"
-"  B<^f>                 exhibe un carácter hacia la derecha\n"
+"Opcionalmente, luego de la especificación de colores hay otros dos puntos, y "
+"la especificación de los atributos. Ésta es una lista de uno o más "
+"atributos, separados por un signo (\"+\").  Los atributos disponibles "
+"incluyen (no todos funcionarán en todos los terminales): normal, standout, "
+"underline, reverse, blink, bright, dim, bold."
 
-# type: SS
-#: dselect.1:328
+# type: Plain text
+#: dselect.1:124
+#, fuzzy
+msgid "Print a brief help text and exit successfully."
+msgstr "Muestra un breve texto de ayuda y termina el programa."
+
+# type: TP
+#: dselect.1:124
 #, fuzzy, no-wrap
-msgid "Searching and sorting"
-msgstr "Buscando y clasificando"
+msgid "B<--licence>|B<--license>"
+msgstr "B<--licence | --license>"
 
 # type: Plain text
-#: dselect.1:342
+#: dselect.1:128
 #, fuzzy
 msgid ""
-"The list of packages can be searched by package name. This is done by "
-"pressing B<'/'>, and typing a simple search string. The string is "
-"interpreted as a B<regex>(7)  regular expression.  If you add B<'/d'> to the "
-"search expression, dselect will also search in descriptions. If you add B<'/"
-"i'> the search will be case insensitive.  You may combine these two suffixes "
-"like this: B<'/id'>.  Repeated searching is accomplished by repeatedly "
-"pressing the B<'n'> or B<'\\e'> keys, until the wanted package is found.  If "
-"the search reaches the bottom of the list, it wraps to the top and continues "
-"searching from there."
+"Displays the B<dselect> copyright and license information and exits "
+"successfully."
 msgstr ""
-"Los paquetes en la lista pueden ser buscados por el nombre.  Esto se realiza "
-"presionando la tecla B<'/'>, y escribiendo el nombre del paquete que se "
-"desea buscar. Este nombre es interpretado como una una expresión regular de "
-"acuerdo con B<regex>(7).  Si usted añade B<'/d'> a la búsqueda, dselect "
-"además buscará en las descripciones. Si usted añade B<'/i'> la búsqueda no "
-"discriminará entre mayúsculas y minúsculas.  Usted puede combinar estas dos "
-"opciones de esta manera : B<'/id'>.  Se puede repetir la búsqueda "
-"presionando las teclas B<'n'> o B<'\\e'>, hasta que usted encuentre el "
-"paquete que estaba buscando.  Si la búsqueda comienza al final de la lista, "
-"subirá al principio y también revisará allí."
+"Muestra en pantalla los derechos de copia de B<dselect>, la información con "
+"respecto a su licencia y termina el programa."
 
 # type: Plain text
-#: dselect.1:349
-#, fuzzy, no-wrap
-msgid ""
-"The list sort order can be varied by pressing\n"
-"the B<'o'> and B<'O'> keys repeatedly.\n"
-"The following nine sort orderings can be selected:\n"
-" alphabet          available           status\n"
-" priority+section  available+priority  status+priority\n"
-" section+priority  available+section   status+section\n"
+#: dselect.1:131
+#, fuzzy
+msgid "Print version information and exit successfully."
 msgstr ""
-"El orden de la lista puede cambiarse presionando las teclas B<'o'> y B<'O'> repetidamente.\n"
-"Los siguientes ordenamientos son posibles:\n"
-" alfabético        disponible          \t estado\n"
-" prioridad+sección disponible+prioridad  estado+prioridad\n"
-" sección+prioridad disponible+sección    estado+sección\n"
+"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
+"Muestra en pantalla la versión correspondiente y termina el programa.\n"
+"#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
+"Muestra la información de versión del programa y sale con éxito."
+
+# type: SH
+#: dselect.1:132
+#, fuzzy, no-wrap
+msgid "USAGE"
+msgstr "USO"
 
 # type: Plain text
-#: dselect.1:352
+#: dselect.1:137
 #, fuzzy
 msgid ""
-"Where not listed above explicitly, alphabetic order is used as the final "
-"subordering sort key."
+"When B<dselect> is started interactively, it prompts the user with a menu of "
+"available actions:"
 msgstr ""
-"Si no se usa explícitamente ninguno de los mencionados arriba, se usa el "
-"orden alfabético."
+"Cuando B<dselect> es iniciado interactivamente, muestra al usuario un menú "
+"con las siguientes opciones disponibles:"
 
 # type: SS
-#: dselect.1:353
+#: dselect.1:137
 #, fuzzy, no-wrap
-msgid "Altering selections"
-msgstr "Alterando selecciones."
+msgid "access"
+msgstr "access"
 
 # type: Plain text
-#: dselect.1:362
-#, fuzzy, no-wrap
-msgid ""
-"The requested selection state of individual packages may be\n"
-"altered with the following commands:\n"
-"  B<+, Insert>    install or upgrade\n"
-"  B<=, H>         hold in present state and version\n"
-"  B<:, G>         unhold: upgrade or leave uninstalled\n"
-"  B<-, Delete>    remove, but leave configuration\n"
-"  B<_>            remove & purge configuration\n"
+#: dselect.1:139
+#, fuzzy
+msgid "Choose and configure an access method to access package repositories."
 msgstr ""
-"El estado de la selección solicitada de paquetes individuales puede ser alterada \n"
-"mediante los siguientes comandos:\n"
-"  B<+, Insert>    instala o actualiza\n"
+"Selecciona y configura un método de acceso para los depósitos de paquetes."
+
+# type: Plain text
+#: dselect.1:145
+#, fuzzy
+msgid ""
+"By default, B<dselect> provides several methods such as I<floppy>, "
+"I<harddisk> or I<cdrom>, but other packages may provide additional methods, "
+"eg. the I<apt> access method provided by the B<apt> package or I<multi_cd> "
+"by the B<dpkg-multicd> package."
+msgstr ""
+"Por defecto, B<dselect> proporciona una alta cantidad de métodos tales como "
+"I<floppy>, I<harddisk> o I<cdrom>, aunque otros paquetes podrían "
+"proporcionar más aún, ejemplo, el método de acceso I<apt> proporcionado por "
+"el paquete B<apt> o bien I<multi_cd> proporcionado por el paquete B<dpkg-"
+"multicd>."
+
+# type: Plain text
+#: dselect.1:147
+#, fuzzy
+msgid "The use of the I<apt> access method is strongly recommended."
+msgstr "El uso del método de acceso vía I<apt> es altamente recomendado."
+
+# type: SS
+#: dselect.1:148
+#, fuzzy, no-wrap
+msgid "update"
+msgstr "update"
+
+# type: Plain text
+#: dselect.1:150
+#, fuzzy
+msgid "Refresh the available packages database."
+msgstr "Actualiza la lista disponible de paquetes."
+
+# type: Plain text
+#: dselect.1:157
+#, fuzzy
+msgid ""
+"Retrieves a list of available package versions from the package repository, "
+"configured for the current access method, and update the dpkg database. The "
+"package lists are commonly provided by the repository as files named "
+"I<Packages> or I<Packages.gz>.  These files can be generated by repository "
+"maintainers, using the program B<dpkg-scanpackages>(1)."
+msgstr ""
+"Obtiene una lista de versiones disponibles de paquetes desde un depósito de "
+"ellos, configurado por el método de acceso seleccionado, y actualiza la base "
+"de datos de dpkg.  La lista de paquetes es comúnmente proporcionada por el "
+"depósito de paquetes, mediante un archivo llamado B<Packages> o B<Packages."
+"gz>.  Esos archivos pueden ser generados por los mantenedores de los "
+"depósitos de paquetes, usando el programa B<dpkg-scanpackages(1)>."
+
+# type: Plain text
+#: dselect.1:160
+#, fuzzy
+msgid ""
+"Details of the update action depend on the access method's implementation.  "
+"Normally the process is straightforward and requires no user interaction."
+msgstr ""
+"Los detalles de la acción de actualizar dependen del método de acceso que se "
+"haya implementado.  Normalmente este proceso es automático y no requiere "
+"interacción del usuario."
+
+# type: SS
+#: dselect.1:161
+#, fuzzy, no-wrap
+msgid "select"
+msgstr "select"
+
+# type: Plain text
+#: dselect.1:163
+#, fuzzy
+msgid "View or manage package selections and dependencies."
+msgstr ""
+"Visualiza o maneja la selección de paquetes y sus respectivas dependencias."
+
+# type: Plain text
+#: dselect.1:169
+#, fuzzy
+msgid ""
+"This is the main function of B<dselect>. In the select screen, the user can "
+"review a list of all available and installed packages. When run with "
+"administrator privileges, it is also possible to interactively change "
+"packages selection state. B<dselect> tracks the implications of these "
+"changes to other depending or conflicting packages."
+msgstr ""
+"Esta es la principal función de B<dselect>.  En la pantalla de selección, el "
+"usuario puede revisar una lista de todos los paquetes disponibles e "
+"instalados.  Cuando se ejecuta con permisos de administrador, también es "
+"posible cambiar el estado de la selección interactivamente.  B<dselect> "
+"sigue esos cambios a otros paquetes dependientes o conflictivos."
+
+# type: Plain text
+#: dselect.1:176
+#, fuzzy
+msgid ""
+"When a conflict or failed depends is detected, a dependency resolution "
+"subscreen is prompted to the user. In this screen, a list of conflicting or "
+"depending packages is shown, and for each package listed, the reason for its "
+"listing is shown. The user may apply the suggestions proposed by B<dselect>, "
+"override them, or back out all the changes, including the ones that created "
+"the unresolved depends or conflicts."
+msgstr ""
+"Cuando hay un conflicto, o bien una dependencia falla, se muestra la "
+"pantalla de resolución de dependencias.  En esta pantalla, se muestra una "
+"lista de paquetes conflictivos o dependientes, para cada paquete en la "
+"lista. El usuario puede aplicar las sugerencias entregadas por B<dselect>, "
+"evitarlas, o bien deshacer los cambios hechos, incluyendo aquellos en los "
+"que de dejaron dependencias o conflictos sin resolver."
+
+# type: Plain text
+#: dselect.1:179
+#, fuzzy
+msgid ""
+"The use of the interactive package selections management screen is explained "
+"in more detail below."
+msgstr ""
+"El uso de esta selección de paquetes interactiva con respecto al manejo de "
+"la pantalla será explicada más abajo en el texto."
+
+# type: SS
+#: dselect.1:180
+#, fuzzy, no-wrap
+msgid "install"
+msgstr "install"
+
+# type: Plain text
+#: dselect.1:182
+#, fuzzy
+msgid "Installs selected packages."
+msgstr "Instala los paquetes seleccionados."
+
+# type: Plain text
+#: dselect.1:188
+#, fuzzy
+msgid ""
+"The configured access method will fetch installable or upgradable packages "
+"from the relevant repositories and install these using B<dpkg>.  Depending "
+"on the implementation of the access method, all packages can be prefetched "
+"before installation, or fetched when needed.  Some access methods may also "
+"remove packages that were marked for removal."
+msgstr ""
+"El método de acceso configurado descargará los paquetes instalables o "
+"actualizables desde los depósitos relevantes, y los instalará usando "
+"B<dpkg>.  Dependiendo de la implementación del método de acceso, todos los "
+"paquetes pueden ser pre-descargados antes de la instalación, o bien cuando "
+"se requiera.  Algunos métodos de acceso podrían borrar paquetes que fueron "
+"marcados para ser eliminados"
+
+# type: Plain text
+#: dselect.1:196
+#, fuzzy
+msgid ""
+"If an error occurred during install, it is usually advisable to run install "
+"again. In most cases, the problems will disappear or be solved.  If problems "
+"persist or the installation performed was incorrect, please investigate into "
+"the causes and circumstances, and file a bug in the Debian bug tracking "
+"system. Instructions on how to do this can be found at http://bugs.debian."
+"org/ or by reading the documentation for B<bug>(1) or B<reportbug>(1), if "
+"these are installed."
+msgstr ""
+"Si ocurre algún error durante la instalación, normalmente usted debería "
+"ejecutar la instalación nuevamente.  En la mayoría de los casos, los "
+"problemas desaparecerán o bien serán resueltos.  SI el problema persiste o "
+"la instalación fue realizada de forma incorrecta, por favor sírvase a "
+"investigar las causas y circunstancias de el problema, y contacte "
+"rápidamente al sistema de seguimiento de fallos de Debian.  Las "
+"instrucciones correspondientes pueden encontrarse en http://bugs.debian.org/ "
+"o bien leyendo la documentación de los programas B<bug(1)> o B<reportbug(1)"
+">, si es que están instalados, obviamente."
+
+# type: Plain text
+#: dselect.1:203
+#, fuzzy
+msgid ""
+"Details of the install action depend on the access method's implementation.  "
+"The user's attention and input may be required during installation, "
+"configuration or removal of packages. This depends on the maintainer scripts "
+"in the package. Some packages make use of the B<debconf>(1)  library, "
+"allowing for more flexible or even automated installation setups."
+msgstr ""
+"Los detalles de la instalación dependen de la implementación de el método de "
+"acceso.  La atención completa del usuario puede ser requerida durante la "
+"instalación, configuración o eliminación de los paquetes correspondientes.  "
+"Esto depende exclusivamente de los scripts que posean los paquetes.  Algunos "
+"de ellos hacen uso de la biblioteca de B<debconf(8)>, permitiendo de esta "
+"manera una instalación mas flexible o también más automatizada."
+
+# type: SS
+#: dselect.1:204
+#, fuzzy, no-wrap
+msgid "config"
+msgstr "config"
+
+# type: Plain text
+#: dselect.1:206
+#, fuzzy
+msgid "Configures any previously installed, but not fully configured packages."
+msgstr ""
+"Configura cualquier paquete previamente instalado, que no este totalmente "
+"configurado."
+
+# type: SS
+#: dselect.1:207
+#, fuzzy, no-wrap
+msgid "remove"
+msgstr "remove"
+
+# type: Plain text
+#: dselect.1:209
+#, fuzzy
+msgid "Removes or purges installed packages, that are marked for removal."
+msgstr ""
+"Elimina o purga (n.t. es decir, elimina los ficheros de configuración) los "
+"paquetes instalados que estén marcados para este proceso."
+
+# type: SS
+#: dselect.1:210
+#, fuzzy, no-wrap
+msgid "quit"
+msgstr "quit"
+
+# type: Plain text
+#: dselect.1:212
+#, fuzzy
+msgid "Quit B<dselect>"
+msgstr "Salir de B<dselect>"
+
+# type: Plain text
+#: dselect.1:214
+#, fuzzy
+msgid "Exits the program with zero (successful) errorcode."
+msgstr "Termina el programa exitosamente (el código de error devuelto será 0)."
+
+# type: SH
+#: dselect.1:216
+#, fuzzy, no-wrap
+msgid "Package selections management"
+msgstr "Manejo de selecciones de paquetes"
+
+# type: SS
+#: dselect.1:218
+#, fuzzy, no-wrap
+msgid "Introduction"
+msgstr "Introducción"
+
+# type: Plain text
+#: dselect.1:234
+#, fuzzy
+msgid ""
+"B<dselect> directly exposes the administrator to some of the complexities "
+"involved with managing large sets of packages with many interdependencies. "
+"For a user who is unfamiliar with the concepts and the ways of the debian "
+"package management system, it can be quite overwhelming. Although B<dselect> "
+"is aimed at easing package management and administration, it is only "
+"instrumental in doing so and can not be assumed to be a sufficient "
+"substitute for administrator skill and understanding. The user is required "
+"to be familiar with the concepts underlying the Debian packaging system.  In "
+"case of doubt, consult the B<dpkg>(1) manpage and the Debian Policy manual, "
+"contained in the B<debian-policy> package."
+msgstr ""
+"B<dselect> expone directamente al administrador algunas de las posibles "
+"complejidades relacionadas con el manejo de una larga lista de paquetes con "
+"muchas dependencias.  Para un usuario que no esté familiarizo con los "
+"conceptos y el manejo de paquetes que posee Debian, este proceso podría ser "
+"un tanto complicado. Sin embargo B<dselect> apunta a ser un programa de "
+"manejo y administración fácil, por lo mismo no podría ser considerado como "
+"un substituto de un administrador.  Se requiere que el usuario este "
+"familiarizado con algunos conceptos del sistema de paquetes de Debian.  En "
+"caso de dudas, consulte la página man de B<dpkg(8)> y el manual de normas de "
+"Debian."
+
+# type: Plain text
+#: dselect.1:240
+#, fuzzy
+msgid ""
+"Unless B<dselect> is run in expert or immediate mode, a help screen is first "
+"displayed when choosing this action from the menu. The user is I<strongly> "
+"advised to study all of the information presented in the online help "
+"screens, when one pops up.  The online help screens can at any time be "
+"invoked with the B<'?'> key."
+msgstr ""
+"A menos que B<dselect> sea ejecutado en modo experto o intermedio, se "
+"muestra una pantalla de ayuda cuando se selecciona esta acción desde el "
+"menú.  Se aconseja I<fervientemente> al usuario que estudie toda la "
+"información presentada en las pantallas de ayuda.  La ayuda en línea puede "
+"obtenerse en cualquier momento mediante la tecla B<'?'>."
+
+# type: SS
+#: dselect.1:241
+#, fuzzy, no-wrap
+msgid "Screen layout"
+msgstr "Disposición de la pantalla"
+
+# type: Plain text
+#: dselect.1:249
+#, fuzzy
+msgid ""
+"The select screen is by default split in a top and a bottom half.  The top "
+"half shows a list of packages. A cursor bar can select an individual "
+"package, or a group of packages, if applicable, by selecting the group "
+"header. The bottom half of the screen shows some details about the package "
+"currently selected in the top half of the screen.  The type of detail that "
+"is displayed can be varied."
+msgstr ""
+"La pantalla de selección es por defecto dividida en dos partes, superior e "
+"inferior.  La parte de arriba muestra la lista de paquetes. Mediante el "
+"cursor se puede seleccionar un paquete individual, o un grupo de paquetes, "
+"si es que se puede, seleccionando la cabecera del grupo.  La parte de abajo "
+"de la pantalla muestra algunos de los detalles del paquete seleccionado en "
+"la parte de arriba de la pantalla.  El tipo de detalle mostrado puede variar."
+
+# type: Plain text
+#: dselect.1:252
+#, fuzzy
+msgid ""
+"Pressing the B<'I'> key toggles a full-screen display of the packages list, "
+"an enlarged view of the package details, or the equally split screen."
+msgstr ""
+"Presionando la tecla B<'I'> la lista de paquetes será mostrada en pantalla "
+"completa, también una vista alargada de los detalles de los paquetes, o la "
+"pantalla igualmente dividida."
+
+# type: SS
+#: dselect.1:253
+#, fuzzy, no-wrap
+msgid "Package details view"
+msgstr "Detalles de la vista de paquetes."
+
+# type: Plain text
+#: dselect.1:262
+#, fuzzy, no-wrap
+msgid ""
+"The package details view by default shows the extended package description\n"
+"for the package that is currently selected in the packages status list.\n"
+"The type of detail can be toggled by pressing the B<'i'> key. This\n"
+"alternates between:\n"
+" - the extended description\n"
+" - the control information for the installed version\n"
+" - the control information for the available version\n"
+msgstr ""
+"Por defecto se muestra una descripción bastante extensa del paquete que esta seleccionado en la lista.\n"
+"El tipo de detalles puede ser cambiado presionando la tecla B<'i'>.\n"
+"Las opciones posibles son:\n"
+" - la descripción extendida\n"
+" - la información de control de la versión instalada\n"
+" - la información de control de la versión disponible\n"
+
+# type: Plain text
+#: dselect.1:266
+#, fuzzy
+msgid ""
+"In a dependency resolution screen, there is also the possibility of viewing "
+"the specific unresolved depends or conflicts related to the package and "
+"causing it to be listed."
+msgstr ""
+"En la pantalla de resolución de dependencias, existe la posibilidad de ver "
+"los posibles problemas sin resolver, o los conflictos con respecto al "
+"paquete."
+
+# type: SS
+#: dselect.1:267
+#, fuzzy, no-wrap
+msgid "Packages status list"
+msgstr "Lista de estado de los paquetes"
+
+# type: Plain text
+#: dselect.1:272
+#, fuzzy
+msgid ""
+"The main select screen displays a list of all packages known to the debian "
+"package management system. This includes packages installed on the system "
+"and packages known from the available packages database."
+msgstr ""
+"La pantalla principal muestra una lista de todos los paquetes conocidos por "
+"el sistema de manejo de paquetes de Debian.  Esto incluye a los paquetes "
+"instalados en el sistema, y también los disponibles en los depósitos."
+
+# type: Plain text
+#: dselect.1:280
+#, fuzzy
+msgid ""
+"For every package, the list shows the package's status, priority, section, "
+"installed and available versions, the package name and its short "
+"description, all in one line. By pressing the B<'V'> key, the display of the "
+"installed and available version can be toggled between on an off. By "
+"pressing the B<'v'> key, the package status display is toggled between "
+"verbose and shorthand.  Shorthand display is the default."
+msgstr ""
+"Para cada paquete, la lista muestra el estado, prioridad, sección, versión "
+"instalada y disponible, el nombre del paquete y su descripción corta, todo "
+"esto en una sola línea.  Presionando la tecla B<'V'>, se puede decidir si se "
+"desea mostrar la versión instalada y disponible.  Presionando la tecla "
+"B<'v'>, se puede decidir si se desea mostrar el estado del paquete, de forma "
+"breve o prolija.  De forma breve, es la opción por defecto."
+
+# type: Plain text
+#: dselect.1:286
+#, fuzzy
+msgid ""
+"The shorthand status indication consists of four parts: an error flag, which "
+"should normally be clear, the current status, the last selection state and "
+"the current selection state.  The first two relate to the actual state of "
+"the package, the second pair are about the selections set by the user."
+msgstr ""
+"El estado en forma breve consiste de cuatro partes: una parte de error, la "
+"cual normalmente debería estar vacía, el estado actual, el estado de la "
+"última y actual selección.  Las primeras dos están en directa relación con "
+"el estado actual del paquete, el segundo par con las selecciones del usuario."
+
+# type: Plain text
+#: dselect.1:304
+#, fuzzy, no-wrap
+msgid ""
+"These are the meanings of the shorthand package status indicator codes:\n"
+" Error flag:\n"
+"  I<empty>   no error\n"
+"  B<R>       serious error, needs reinstallation;\n"
+" Installed state:\n"
+"  I<empty>   not installed;\n"
+"  B<*>       fully installed and configured;\n"
+"  B<->       not installed but some config files may remain;\n"
+"  B<U>       unpacked but not yet configured;\n"
+"  B<C>       half-configured (an error happened);\n"
+"  B<I>       half-installed (an error happened).\n"
+" Current and requested selections:\n"
+"  B<*>       marked for installation or upgrade;\n"
+"  B<->       marked for removal, configuration files remain;\n"
+"  B<=>       on hold: package will not be processed at all;\n"
+"  B<_>       marked for purge, also remove configuration;\n"
+"  B<n>       package is new and has yet to be marked.\n"
+msgstr ""
+"Aquí están los significados de cada uno de los indicadores:\n"
+" Parte de error: \n"
+"  I<vacío>   no hay error\n"
+"  B<R>       error serio, necesita reinstalación;\n"
+" Estado de la instalación:   \n"
+"  I<vacío>   no está instalado;\n"
+"  B<*>       totalmente instalado y configurado;\n"
+"  B<->      no está instalado, pero aún existen archivos de configuración;\n"
+"  B<U>       desempaquetado, pero aún no configurado;\n"
+"  B<C>       medio-configurado (ocurrió un error);\n"
+"  B<I>       medio-instalado (ocurrió un error).\n"
+" Selección actual y solicitada:\n"
+"  B<*>       marcado para instalación o actualización;\n"
+"  B<->      marcado para ser eliminado, no se eliminan ficheros de configuración;\n"
+"  B<=>       bloqueado: el paquete no será procesado en absoluto;\n"
+"  B<_>       paquete marcado para purgación, también elimina configuración;\n"
+"  B<n>       paquete es nuevo y aún todavía necesita ser marcado.\n"
+
+# type: SS
+#: dselect.1:305
+#, fuzzy, no-wrap
+msgid "Cursor and screen movement"
+msgstr "Movimiento del cursor y de la pantalla"
+
+# type: Plain text
+#: dselect.1:310
+#, fuzzy
+msgid ""
+"The package selection list and the dependency conflict resolution screens "
+"can be navigated using motion commands mapped to the following keys:"
+msgstr ""
+"La lista de selección de paquetes y la pantalla de resolución de "
+"dependencias y conflictos pueden ser navegadas usando las siguientes teclas:"
+
+# type: Plain text
+#: dselect.1:327
+#, fuzzy, no-wrap
+msgid ""
+"  B<p, Up, k>           move cursor bar up\n"
+"  B<n, Down, j>         move cursor bar down\n"
+"  B<P, Pgup, Backspace> scroll list 1 page up\n"
+"  B<N, Pgdn, Space>     scroll list 1 page down\n"
+"  B<^p>                 scroll list 1 line up\n"
+"  B<^n>                 scroll list 1 line down\n"
+"  B<t, Home>            jump to top of list\n"
+"  B<e, End>             jump to end of list\n"
+"  B<u>                  scroll info 1 page up\n"
+"  B<d>                  scroll info 1 page down\n"
+"  B<^u>                 scroll info 1 line up\n"
+"  B<^d>                 scroll info 1 line down\n"
+"  B<B, Left-arrow>      pan display 1/3 screen left\n"
+"  B<F, Right-arrow>     pan display 1/3 screen right\n"
+"  B<^b>                 pan display 1 character left\n"
+"  B<^f>                 pan display 1 character right\n"
+msgstr ""
+"  B<p, Up, k>           mueve el cursor hacia arriba\n"
+"  B<n, Down, j>         mueve el cursor hacia abajo\n"
+"  B<P, Pgup, Backspace> mueve la lista una página hacia arriba\n"
+"  B<N, Pgdn, Space>     mueve la lista una página hacia abajo\n"
+"  B<^p>                 mueve la lista una línea hacia arriba\n"
+"  B<^n>                 mueve la lista una línea hacia abajo\n"
+"  B<t, Home>            salta al principio de la lista\n"
+"  B<e, End>             salta al fin de la lista\n"
+"  B<u>                  mueve info una página hacia arriba\n"
+"  B<d>                  mueve info una página hacia abajo\n"
+"  B<^u>                 mueve info una línea hacia abajo\n"
+"  B<^d>                 mueve info una línea hacia abajo\n"
+"  B<B, Left-arrow>     exhibe la pantalla 1/3 hacia la izquierda\n"
+"  B<F, Right-arrow>    exhibe la pantalla 1/3 hacia la derecha\n"
+"  B<^b>                 exhibe un carácter hacia la izquierda\n"
+"  B<^f>                 exhibe un carácter hacia la derecha\n"
+
+# type: SS
+#: dselect.1:328
+#, fuzzy, no-wrap
+msgid "Searching and sorting"
+msgstr "Buscando y clasificando"
+
+# type: Plain text
+#: dselect.1:342
+#, fuzzy
+msgid ""
+"The list of packages can be searched by package name. This is done by "
+"pressing B<'/'>, and typing a simple search string. The string is "
+"interpreted as a B<regex>(7)  regular expression.  If you add B<'/d'> to the "
+"search expression, dselect will also search in descriptions. If you add B<'/"
+"i'> the search will be case insensitive.  You may combine these two suffixes "
+"like this: B<'/id'>.  Repeated searching is accomplished by repeatedly "
+"pressing the B<'n'> or B<'\\e'> keys, until the wanted package is found.  If "
+"the search reaches the bottom of the list, it wraps to the top and continues "
+"searching from there."
+msgstr ""
+"Los paquetes en la lista pueden ser buscados por el nombre.  Esto se realiza "
+"presionando la tecla B<'/'>, y escribiendo el nombre del paquete que se "
+"desea buscar. Este nombre es interpretado como una una expresión regular de "
+"acuerdo con B<regex>(7).  Si usted añade B<'/d'> a la búsqueda, dselect "
+"además buscará en las descripciones. Si usted añade B<'/i'> la búsqueda no "
+"discriminará entre mayúsculas y minúsculas.  Usted puede combinar estas dos "
+"opciones de esta manera : B<'/id'>.  Se puede repetir la búsqueda "
+"presionando las teclas B<'n'> o B<'\\e'>, hasta que usted encuentre el "
+"paquete que estaba buscando.  Si la búsqueda comienza al final de la lista, "
+"subirá al principio y también revisará allí."
+
+# type: Plain text
+#: dselect.1:349
+#, fuzzy, no-wrap
+msgid ""
+"The list sort order can be varied by pressing\n"
+"the B<'o'> and B<'O'> keys repeatedly.\n"
+"The following nine sort orderings can be selected:\n"
+" alphabet          available           status\n"
+" priority+section  available+priority  status+priority\n"
+" section+priority  available+section   status+section\n"
+msgstr ""
+"El orden de la lista puede cambiarse presionando las teclas B<'o'> y B<'O'> repetidamente.\n"
+"Los siguientes ordenamientos son posibles:\n"
+" alfabético        disponible          \t estado\n"
+" prioridad+sección disponible+prioridad  estado+prioridad\n"
+" sección+prioridad disponible+sección    estado+sección\n"
+
+# type: Plain text
+#: dselect.1:352
+#, fuzzy
+msgid ""
+"Where not listed above explicitly, alphabetic order is used as the final "
+"subordering sort key."
+msgstr ""
+"Si no se usa explícitamente ninguno de los mencionados arriba, se usa el "
+"orden alfabético."
+
+# type: SS
+#: dselect.1:353
+#, fuzzy, no-wrap
+msgid "Altering selections"
+msgstr "Alterando selecciones."
+
+# type: Plain text
+#: dselect.1:362
+#, fuzzy, no-wrap
+msgid ""
+"The requested selection state of individual packages may be\n"
+"altered with the following commands:\n"
+"  B<+, Insert>    install or upgrade\n"
+"  B<=, H>         hold in present state and version\n"
+"  B<:, G>         unhold: upgrade or leave uninstalled\n"
+"  B<-, Delete>    remove, but leave configuration\n"
+"  B<_>            remove & purge configuration\n"
+msgstr ""
+"El estado de la selección solicitada de paquetes individuales puede ser alterada \n"
+"mediante los siguientes comandos:\n"
+"  B<+, Insert>    instala o actualiza\n"
 "  B<=, H>         bloqueo en estado y versión actual\n"
 "  B<:, G>         sin espera: actualiza o deja sin instalar  \n"
 "  B<-, Delete>   elimina, pero deja la configuracion\n"
 "  B<_>            elimina y borra la configuración\n"
 
 # type: Plain text
-#: dselect.1:366
-#, fuzzy
+#: dselect.1:366
+#, fuzzy
+msgid ""
+"When the change request results in one or more unsatisfied depends or "
+"conflicts, B<dselect> prompts the user with a dependency resolution screen. "
+"This will be further explained below."
+msgstr ""
+"Cuando los cambios resultan en una o más dependencias no satisfechas, o "
+"también en conflictos B<dselect> muestra al usuario una pantalla con "
+"resolución de dependencias Esta pantalla será explicada en detalles mas "
+"abajo."
+
+# type: Plain text
+#: dselect.1:371
+#, fuzzy
+msgid ""
+"It is also possible to apply these commands to groups of package selections, "
+"by pointing the cursor bar onto a group header. The exact grouping of "
+"packages is dependent on the current list ordering settings."
+msgstr ""
+"También es posible aplicar esas órdenes a grupos de selecciones de paquetes, "
+"apuntando el cursor a la cabecera del grupo.  El agrupamiento exacto de los "
+"paquetes depende la configuración de la lista ordenamiento."
+
+# type: Plain text
+#: dselect.1:377
+#, fuzzy
+msgid ""
+"Proper care should be taken when altering large groups of selections, "
+"because this can instantaneously create large numbers of unresolved depends "
+"or conflicts, all of which will be listed in one dependency resolution "
+"screen, making them very hard to handle. In practice, only hold and unhold "
+"operations are useful when applied to groups."
+msgstr ""
+"Se debe tomar el cuidado apropiado cuando se alteran largas listas de "
+"selecciones de paquetes mediante grupos, ya que esto puede inmediatamente "
+"crear una larga lista de dependencias sin resolver o conflictos con otros "
+"paquetes, todos ellos serán mostrados en una pantalla única, lo que hará más "
+"difícil el proceso.  En la práctica, es mejor dejar en espera algunos grupos "
+"e ir trantándolos uno a uno."
+
+# type: SS
+#: dselect.1:378
+#, fuzzy, no-wrap
+msgid "Resolving depends and conflicts"
+msgstr "Resolviendo problemas de dependencias y conflictos."
+
+# type: Plain text
+#: dselect.1:383
+#, fuzzy
+msgid ""
+"When the change request results in one or more unsatisfied depends or "
+"conflicts, B<dselect> prompts the user with a dependency resolution screen. "
+"First however, an informative help screen is displayed."
+msgstr ""
+"Cuando el cambio resulta en una o más dependencias sin resolver o también en "
+"conflictos, B<dselect> muestra al usuario una pantalla con la posible "
+"solución al problema.  Primero, sin embargo, se muestra una pantalla "
+"informativa."
+
+# type: Plain text
+#: dselect.1:390
+#, fuzzy
+msgid ""
+"The top half of this screen lists all the packages that will have unresolved "
+"depends or conflicts, as a result of the requested change, and all the "
+"packages whose installation can resolve any of these depends or whose "
+"removal can resolve any of the conflicts.  The bottom half defaults to show "
+"the depends or conflicts that cause the currently selected package to be "
+"listed."
+msgstr ""
+"La mitad superior de esta pantalla enumera todos los paquetes que tendrán "
+"conflictos, o problemas de dependencias sin resolver, como resultado del "
+"cambio requerido por el usuario, además de todos los paquetes cuya "
+"instalación solucionará el problema.  La mitad inferior muestra los "
+"problemas que causa el paquete seleccionado."
+
+# type: Plain text
+#: dselect.1:396
+#, fuzzy
+msgid ""
+"When the sublist of packages is displayed initially, B<dselect> may have "
+"already set the requested selection status of some of the listed packages, "
+"in order to resolve the depends of conflicts that caused the dependency "
+"resolution screen to be displayed. Usually, it is best to follow up the "
+"suggestions made by B<dselect>."
+msgstr ""
+"Cuando la sublista de paquete se exhibe inicialmente, B<dselect> podría ya "
+"haber establecido el estado requerido de alguno de los paquetes listados, "
+"para resolver los problemas de dependencias o conflictos que la pantalla de "
+"resolución mostrado.  Usualmente, lo mejor es seguir las sugerencias hechas "
+"por B<dselect>."
+
+# type: Plain text
+#: dselect.1:404
+#, fuzzy
+msgid ""
+"The listed packages' selection state may be reverted to the original "
+"settings, as they were before the unresolved depends or conflicts were "
+"created, by pressing the B<'R'> key. By pressing the B<'D'> key, the "
+"automatic suggestions are reset, but the change that caused the dependency "
+"resolution screen to be prompted is kept as requested.  Finally, by pressing "
+"B<'U'>, the selections are again set to the automatic suggestion values."
+msgstr ""
+"El estado de los paquetes seleccionados en la lista, puede ser revertido a "
+"los ajustes originales, así como también las dependencias sin resolver y los "
+"conflictos que fueron creados, presionando la tecla B<'R'>. Presionando la "
+"tecla B<'D'>, las sugerencias automáticas son reajustadas, pero el cambio "
+"que realizó la pantalla de resolución de dependencias se mantiene.  "
+"Finalmente, presionando la tecla B<'U'>, las selecciones son ajustadas "
+"nuevamente a los valores automáticos."
+
+# type: SS
+#: dselect.1:405
+#, fuzzy, no-wrap
+msgid "Establishing the requested selections"
+msgstr "Estableciendo las selecciones solicitadas"
+
+# type: Plain text
+#: dselect.1:412
+#, fuzzy
+msgid ""
+"By pressing B<enter>, the currently displayed set of selections is accepted. "
+"If B<dselect> detects no unresolved depends as a result of the requested "
+"selections, the new selections will be set.  However, if there are any "
+"unresolved depends, B<dselect> will again prompt the user with a dependency "
+"resolution screen."
+msgstr ""
+"Presionando la tecla B<enter>, la lista actual es aceptada.  Si B<dselect> "
+"detecta que no hay problemas, las nueves selecciones serán aceptadas.  Sin "
+"embargo, si hay dependencias sin resolver, B<dselect> nuevamente mostrará la "
+"pantalla de resolución de dependencias."
+
+# type: Plain text
+#: dselect.1:418
+#, fuzzy
+msgid ""
+"To alter a set of selections that creates unresolved depends or conflicts "
+"and forcing B<dselect> to accept it, press the B<'Q'> key. This sets the "
+"selections as specified by the user, unconditionally. Generally, don't do "
+"this unless you've read the fine print."
+msgstr ""
+"Para alterar una lista de selecciones que crea dependencias sin resolver o "
+"conflictos y forzar a B<dselect> a aceptarla, presione la tecla B<'Q'>.  "
+"Esto fija las selecciones especificadas por el usuario, incondicionalmente.  "
+"Generalmente, usted no debería hacer esto, a menos que sepa lo que este "
+"haciendo."
+
+# type: Plain text
+#: dselect.1:425
+#, fuzzy
+msgid ""
+"The opposite effect, to back out any selections change requests and go back "
+"to the previous list of selections, is attained by pressing the B<'X'> or "
+"B<escape> keys. By repeatedly pressing these keys, any possibly detrimental "
+"changes to the requested package selections can be backed out completely to "
+"the last established settings."
+msgstr ""
+"El efecto opuesto, es deshacer sus cambios y volver hacia atrás hasta que no "
+"tenga problemas, esto se puede realizar presionando la tecla B<'X'> ó "
+"B<escape>.  Presionando repetidamente estas teclas, cualquier cambio "
+"perjudicial a las selecciones de paquetes se puede retirar totalmente, "
+"volviendo así a la última configuración existente."
+
+# type: Plain text
+#: dselect.1:432
+#, fuzzy
+msgid ""
+"The B<dselect> package selection interface is confusing to some new users.  "
+"Reportedly, it even makes seasoned kernel developers cry."
+msgstr ""
+"La interfaz de selección de B<dselect> puede parecer confusa para algunos "
+"usuarios principiantes.  Se ha informado, que incluso experimentados "
+"desarrolladores del kernel se han quejado."
+
+# type: Plain text
+#: dselect.1:434
+#, fuzzy
+msgid "The documentation is lacking."
+msgstr "Carece de documentación"
+
+# type: Plain text
+#: dselect.1:436
+#, fuzzy
+msgid "There is no help option in the main menu."
+msgstr "No hay ninguna opción de ayuda en el menú principal."
+
+# type: Plain text
+#: dselect.1:438
+#, fuzzy
+msgid "The visible list of available packages cannot be reduced."
+msgstr "La lista de paquetes disponibles no puede ser reducida."
+
+# type: Plain text
+#: dselect.1:442
+#, fuzzy
+msgid ""
+"The built in access methods can no longer stand up to current quality "
+"standards. Use the access method provided by apt, it is not only not broken, "
+"it is also much more flexible than the built in access methods."
+msgstr ""
+"Los otros métodos de acceso no tienen tanta calidad como el método que "
+"proporciona apt, no implica que los otros no funcionen, sino que este último "
+"es mucho mas flexible, lo cual lo hace ser mucho mas recomendable."
+
+# type: Plain text
+#: dselect.1:448
+#, fuzzy
+msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
+msgstr ""
+"B<dpkg>(8), B<apt-get>(8), B<sources.list>(5), B<deb>(5)B<y> el manual de "
+"normas de Debian."
+
+# type: Plain text
+#: dselect.1:453
+#, fuzzy
+msgid ""
+"B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
+"of contributors may be found in `dselect --license'."
+msgstr ""
+"B<dselect> fue escrito por (ijackson@gnu.ai.mit.edu). La lista entera de "
+"contribuidores puede ser leída ejecutando `dselect --license'."
+
+# type: Plain text
+#: dselect.1:456
+#, fuzzy
+msgid ""
+"This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
+"Josip Rodin and Joost kooij."
+msgstr ""
+"Este manual fue escrito por Juho Vuori E<lt>javuori@cc.helsinki.fi E<gt>, "
+"Josip Rodin, Joost kooij y finalmente traducida por Bruno Barrera C <bruno."
+"barrera@igloo.cl>."
+
+# type: SS
+#: dselect.cfg.5:1
+#, fuzzy, no-wrap
+msgid "dselect.cfg"
+msgstr "select"
+
+# type: Plain text
+#: dselect.cfg.5:4
+msgid "dselect.cfg - dselect configuration file"
+msgstr ""
+
+# type: Plain text
+#: dselect.cfg.5:11
+msgid ""
+"This file contains default options for dselect. Each line contains a single "
+"option which is exactly the same as a normal commandline option for dselect "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
+msgstr ""
+
+# type: TP
+#: dselect.cfg.5:14
+#, fuzzy
+msgid "I</etc/dpkg/dselect.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+# type: Plain text
+#: dselect.cfg.5:16
+msgid "I<~/.dselect.cfg>"
+msgstr ""
+
+# type: Plain text
+#: dselect.cfg.5:20
+#, fuzzy
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dselect>."
+msgstr ""
+"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
+"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
+"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
+
+# type: Plain text
+#: dselect.cfg.5:22
+#, fuzzy
+msgid "B<dselect>(1)."
+msgstr "B<date>(1)."
+
+# type: SS
+#: install-info.8:5
+#, fuzzy, no-wrap
+msgid "install-info"
+msgstr "install"
+
+# type: Plain text
+#: install-info.8:8
+msgid "install-info - create or update entry in Info directory"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:24
+msgid ""
+"B<install-info> [B<--version>] [B<--help>] [B<--debug>] [B<--"
+"maxwidth=>I<nnn>] [B<--section >I<regexp>B< >I<title>] [B<--infodir=>I<xxx>] "
+"[B<--align=>I<nnn>] [B<--quiet>] [B<--menuentry=>I<xxx>] [B<--"
+"description=>I<xxx>] [B<--remove>|B<--remove-exactly>] [B<-->] I<filename>"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:32
+msgid ""
+"B<install-info> makes, updates or removes entries in the Info directory, the "
+"B<dir> file. When updating or creating entries, if no description is "
+"specified on the command line or in the Info file it attempts to guess a "
+"description from the contents of the file."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:39
+msgid ""
+"See the description of the B<--section> option for details of where the "
+"entry will be placed and a description of the expected format of the B<dir> "
+"file."
+msgstr ""
+
+# type: TP
+#: install-info.8:40
+#, fuzzy, no-wrap
+msgid "B<[--] >I<filename>"
+msgstr "B<-n>I<nombrefichero>"
+
+# type: Plain text
+#: install-info.8:57
+msgid ""
+"Gives the filename of the Info file whose menu entry is to be created, "
+"updated or removed. If B<--remove-exactly> is specified, then I<filename> "
+"should be the exact entry name to be removed (i.e. \"emacs-20/emacs\" or "
+"\"gcc\"), otherwise the basename of this filename is used as the referent of "
+"the menu entry which is created, unless there's an overriding START-INFO-DIR "
+"entry inside the given file. This file must therefore exist (or be about to "
+"be installed, or have previously existed when removing an entry) in the same "
+"directory as the B<dir> file (see the B<--infodir> option)."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:66
+msgid ""
+"If I<filename> ends in B<.gz> it is taken to refer to a file compressed with "
+"GNU gzip; if it doesn't exist, but a corresponding I<filename>B<.gz> does, "
+"the latter is used instead."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:71
+msgid ""
+"When adding or updating entries the file must exist at the path specified "
+"(possibly with an additional B<.gz> extension)."
+msgstr ""
+
+# type: TP
+#: install-info.8:71
+#, fuzzy, no-wrap
+msgid "B<--remove>"
+msgstr "I<--rename>"
+
+# type: Plain text
+#: install-info.8:76
+msgid ""
+"Specifies that the entry for the file I<filename> is to be removed; by "
+"default entries are created or updated."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:86
+msgid ""
+"If the removal results in a section becoming empty the section heading (and "
+"the spare blank line) will be removed as well, unless this is the last "
+"section in the file or B<--keep-old> is specified. See the B<--section> "
+"option for details about the expected format of the B<dir> file."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:91
+msgid ""
+"If there are several suitable entries in the B<dir> file only those in the "
+"first matching contiguous group will be removed and the others silently "
+"ignored."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:97
+msgid ""
+"It is not an error for no suitable entry to be found, though B<install-info> "
+"will issue a warning unless the B<--quiet> option was specified."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:103
+msgid ""
+"When B<--remove> is specified the B<--maxwidth>, B<--align> and B<--calign> "
+"formatting options are silently ignored."
+msgstr ""
+
+# type: TP
+#: install-info.8:103
+#, fuzzy, no-wrap
+msgid "B<--remove-exactly>"
+msgstr "B<--remove-all> I<nombre>"
+
+# type: Plain text
+#: install-info.8:121
+msgid ""
+"This option is essentially the same as B<--remove> except that I<filename> "
+"is taken as the exact entry to be removed, rather than as the name of an "
+"existing file. This can be important when trying to remove entries that "
+"refer to info files in subdirectories (i.e. \"emacs-20/emacs\") because B<--"
+"remove> will operate on the basename of the given I<filename> rather than "
+"the exact name given. (i.e.  B<--remove> \"emacs-20/emacs\" would cause "
+"B<install-info> to look for \"emacs\", not \"emacs-20/emacs\")."
+msgstr ""
+
+# type: TP
+#: install-info.8:121
+#, no-wrap
+msgid "B<--section >I<regexp title>"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:135
+msgid ""
+"Specifies that, if a new entry is to be made, it should be placed in a "
+"section of the B<dir> file whose title matches I<regexp>.  If no such "
+"section exists one will be created as the second last section in the file "
+"(see below), with title I<title>.  A section is a part of the B<dir> menu "
+"delimited by blank lines; the first line is assumed to be the title."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:142
+msgid ""
+"If a new entry is to be created B<install-info> will attempt to insert it "
+"within the section according in alphabetic order; if the entries in the "
+"section aren't already sorted the new location within the section will be "
+"unpredictable. The order of existing entries will not be changed."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:148
+msgid ""
+"The default is to append new entries to the end of the file. The last "
+"section (even if it only consists of the title line) should always exist, to "
+"ensure that new sections are created in the right place.  The final section "
+"should be titled to reflect the fact that Info files with no more well "
+"specified location are appended to it."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:151
+msgid ""
+"If there is already an entry for the Info file being installed it is "
+"replaced in situ with the new entry."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:154
+msgid ""
+"If a section is specified when removing an entry the section is ignored and "
+"a warning is issued."
+msgstr ""
+
+# type: Plain text
+#: install-info.8:160
+msgid ""
+"If a section is requested when adding an entry but the file contains no "
+"section headings at all then B<install-info> will create both the requested "
+"section and a Miscellaneous section at the end of the file."
+msgstr ""
+
+# type: TP
+#: install-info.8:160
+#, fuzzy, no-wrap
+msgid "B<--infodir=>I<infodir>"
+msgstr "B<--admindir> I<directorio>"
+
+# type: Plain text
+#: install-info.8:169
+msgid ""
+"Specifies that the B<dir> file is, and the installed copy of the new Info "
+"file was, is or will be located in I<infodir>.  The default is B</usr/share/"
+"info/>."
+msgstr ""
+
+# type: TP
+#: install-info.8:169
+#, no-wrap
+msgid "B<--align=>I<nnn>B< [deprecated]>"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:178
 msgid ""
-"When the change request results in one or more unsatisfied depends or "
-"conflicts, B<dselect> prompts the user with a dependency resolution screen. "
-"This will be further explained below."
+"Specifies that the first line of the description should be indented at least "
+"I<nnn> characters; extra spaces will be added as required. If necessary "
+"because of the length of the B<dir> menu entry details it may be offset "
+"more. The default is 27."
 msgstr ""
-"Cuando los cambios resultan en una o más dependencias no satisfechas, o "
-"también en conflictos B<dselect> muestra al usuario una pantalla con "
-"resolución de dependencias Esta pantalla será explicada en detalles mas "
-"abajo."
 
-# type: Plain text
-#: dselect.1:371
-#, fuzzy
-msgid ""
-"It is also possible to apply these commands to groups of package selections, "
-"by pointing the cursor bar onto a group header. The exact grouping of "
-"packages is dependent on the current list ordering settings."
+# type: TP
+#: install-info.8:178
+#, no-wrap
+msgid "B<--calign=>I<nnn>B< [deprecated]>"
 msgstr ""
-"También es posible aplicar esas órdenes a grupos de selecciones de paquetes, "
-"apuntando el cursor a la cabecera del grupo.  El agrupamiento exacto de los "
-"paquetes depende la configuración de la lista ordenamiento."
 
 # type: Plain text
-#: dselect.1:377
-#, fuzzy
+#: install-info.8:184
 msgid ""
-"Proper care should be taken when altering large groups of selections, "
-"because this can instantaneously create large numbers of unresolved depends "
-"or conflicts, all of which will be listed in one dependency resolution "
-"screen, making them very hard to handle. In practice, only hold and unhold "
-"operations are useful when applied to groups."
+"Specifies that the second and subsequent lines of the description should be "
+"indented at least I<nnn> characters. The default is 29."
 msgstr ""
-"Se debe tomar el cuidado apropiado cuando se alteran largas listas de "
-"selecciones de paquetes mediante grupos, ya que esto puede inmediatamente "
-"crear una larga lista de dependencias sin resolver o conflictos con otros "
-"paquetes, todos ellos serán mostrados en una pantalla única, lo que hará más "
-"difícil el proceso.  En la práctica, es mejor dejar en espera algunos grupos "
-"e ir trantándolos uno a uno."
 
-# type: SS
-#: dselect.1:378
-#, fuzzy, no-wrap
-msgid "Resolving depends and conflicts"
-msgstr "Resolviendo problemas de dependencias y conflictos."
+# type: TP
+#: install-info.8:184
+#, no-wrap
+msgid "B<--maxwidth=>I<nnn>B< [deprecated]>"
+msgstr ""
 
 # type: Plain text
-#: dselect.1:383
-#, fuzzy
+#: install-info.8:190
 msgid ""
-"When the change request results in one or more unsatisfied depends or "
-"conflicts, B<dselect> prompts the user with a dependency resolution screen. "
-"First however, an informative help screen is displayed."
+"Specifies that the maximum width for the Info file is I<nnn>.  This is used "
+"when word-wrapping the descriptive text.  The default is 79."
 msgstr ""
-"Cuando el cambio resulta en una o más dependencias sin resolver o también en "
-"conflictos, B<dselect> muestra al usuario una pantalla con la posible "
-"solución al problema.  Primero, sin embargo, se muestra una pantalla "
-"informativa."
 
 # type: Plain text
-#: dselect.1:390
-#, fuzzy
+#: install-info.8:195
 msgid ""
-"The top half of this screen lists all the packages that will have unresolved "
-"depends or conflicts, as a result of the requested change, and all the "
-"packages whose installation can resolve any of these depends or whose "
-"removal can resolve any of the conflicts.  The bottom half defaults to show "
-"the depends or conflicts that cause the currently selected package to be "
-"listed."
+"Prevents the usual display of the new menu entry just before it is inserted, "
+"and of the messages announcing the replacement and removal of existing "
+"entries and the creation and deletion of sections."
 msgstr ""
-"La mitad superior de esta pantalla enumera todos los paquetes que tendrán "
-"conflictos, o problemas de dependencias sin resolver, como resultado del "
-"cambio requerido por el usuario, además de todos los paquetes cuya "
-"instalación solucionará el problema.  La mitad inferior muestra los "
-"problemas que causa el paquete seleccionado."
 
 # type: Plain text
-#: dselect.1:396
-#, fuzzy
-msgid ""
-"When the sublist of packages is displayed initially, B<dselect> may have "
-"already set the requested selection status of some of the listed packages, "
-"in order to resolve the depends of conflicts that caused the dependency "
-"resolution screen to be displayed. Usually, it is best to follow up the "
-"suggestions made by B<dselect>."
+#: install-info.8:200
+msgid "Causes B<install-info> to display its usage information and exit."
 msgstr ""
-"Cuando la sublista de paquete se exhibe inicialmente, B<dselect> podría ya "
-"haber establecido el estado requerido de alguno de los paquetes listados, "
-"para resolver los problemas de dependencias o conflictos que la pantalla de "
-"resolución mostrado.  Usualmente, lo mejor es seguir las sugerencias hechas "
-"por B<dselect>."
 
 # type: Plain text
-#: dselect.1:404
-#, fuzzy
+#: install-info.8:205
 msgid ""
-"The listed packages' selection state may be reverted to the original "
-"settings, as they were before the unresolved depends or conflicts were "
-"created, by pressing the B<'R'> key. By pressing the B<'D'> key, the "
-"automatic suggestions are reset, but the change that caused the dependency "
-"resolution screen to be prompted is kept as requested.  Finally, by pressing "
-"B<'U'>, the selections are again set to the automatic suggestion values."
+"Causes B<install-info> to display its version and copyright information and "
+"exit."
 msgstr ""
-"El estado de los paquetes seleccionados en la lista, puede ser revertido a "
-"los ajustes originales, así como también las dependencias sin resolver y los "
-"conflictos que fueron creados, presionando la tecla B<'R'>. Presionando la "
-"tecla B<'D'>, las sugerencias automáticas son reajustadas, pero el cambio "
-"que realizó la pantalla de resolución de dependencias se mantiene.  "
-"Finalmente, presionando la tecla B<'U'>, las selecciones son ajustadas "
-"nuevamente a los valores automáticos."
 
-# type: SS
-#: dselect.1:405
+# type: TP
+#: install-info.8:205
 #, fuzzy, no-wrap
-msgid "Establishing the requested selections"
-msgstr "Estableciendo las selecciones solicitadas"
+msgid "B<--description=>I<xxx>"
+msgstr "B<-C>I<descripcióndecambios>"
 
 # type: Plain text
-#: dselect.1:412
-#, fuzzy
+#: install-info.8:212
 msgid ""
-"By pressing B<enter>, the currently displayed set of selections is accepted. "
-"If B<dselect> detects no unresolved depends as a result of the requested "
-"selections, the new selections will be set.  However, if there are any "
-"unresolved depends, B<dselect> will again prompt the user with a dependency "
-"resolution screen."
+"Specifies that the description to use after the menu entry in new or updated "
+"entries be I<xxx>.  The default is to use the the value specified in the "
+"Info file itself; this is found by searching for a section of the form"
 msgstr ""
-"Presionando la tecla B<enter>, la lista actual es aceptada.  Si B<dselect> "
-"detecta que no hay problemas, las nueves selecciones serán aceptadas.  Sin "
-"embargo, si hay dependencias sin resolver, B<dselect> nuevamente mostrará la "
-"pantalla de resolución de dependencias."
 
 # type: Plain text
-#: dselect.1:418
-#, fuzzy
-msgid ""
-"To alter a set of selections that creates unresolved depends or conflicts "
-"and forcing B<dselect> to accept it, press the B<'Q'> key. This sets the "
-"selections as specified by the user, unconditionally. Generally, don't do "
-"this unless you've read the fine print."
+#: install-info.8:214
+msgid "B<START-INFO-DIR-ENTRY>"
 msgstr ""
-"Para alterar una lista de selecciones que crea dependencias sin resolver o "
-"conflictos y forzar a B<dselect> a aceptarla, presione la tecla B<'Q'>.  "
-"Esto fija las selecciones especificadas por el usuario, incondicionalmente.  "
-"Generalmente, usted no debería hacer esto, a menos que sepa lo que este "
-"haciendo."
 
 # type: Plain text
-#: dselect.1:425
-#, fuzzy
+#: install-info.8:216
+msgid "B<* Auto-PGP: (auto-pgp). PGP under GNU Emacs.>"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:218
+msgid "B<END-INFO-DIR-ENTRY>"
+msgstr ""
+
+# type: Plain text
+#: install-info.8:227
 msgid ""
-"The opposite effect, to back out any selections change requests and go back "
-"to the previous list of selections, is attained by pressing the B<'X'> or "
-"B<escape> keys. By repeatedly pressing these keys, any possibly detrimental "
-"changes to the requested package selections can be backed out completely to "
-"the last established settings."
+"If the entry found in the Info file itself extends across several lines, "
+"each giving a menu entry, the text found in the file is used verbatim. In "
+"this case the alphabetic ordering scheme is turned off, and the entries are "
+"inserted at the top of section in question. In this case the B<--menuentry>, "
+"B<--maxwidth>, B<--align>, B<--calign> and B<--menuentry> options are "
+"ignored."
 msgstr ""
-"El efecto opuesto, es deshacer sus cambios y volver hacia atrás hasta que no "
-"tenga problemas, esto se puede realizar presionando la tecla B<'X'> ó "
-"B<escape>.  Presionando repetidamente estas teclas, cualquier cambio "
-"perjudicial a las selecciones de paquetes se puede retirar totalmente, "
-"volviendo así a la última configuración existente."
 
 # type: Plain text
-#: dselect.1:432
-#, fuzzy
+#: install-info.8:234
 msgid ""
-"The B<dselect> package selection interface is confusing to some new users.  "
-"Reportedly, it even makes seasoned kernel developers cry."
+"If there is no B<dir> entry in the file the program will try to find a "
+"paragraph early in the file starting B<this file documents>.  It will "
+"capitalise the first character of the remainder, and use that."
 msgstr ""
-"La interfaz de selección de B<dselect> puede parecer confusa para algunos "
-"usuarios principiantes.  Se ha informado, que incluso experimentados "
-"desarrolladores del kernel se han quejado."
 
 # type: Plain text
-#: dselect.1:434
-#, fuzzy
-msgid "The documentation is lacking."
-msgstr "Carece de documentación"
+#: install-info.8:236
+msgid "It is an error for none of these methods to yield a description."
+msgstr ""
 
 # type: Plain text
-#: dselect.1:436
-#, fuzzy
-msgid "There is no help option in the main menu."
-msgstr "No hay ninguna opción de ayuda en el menú principal."
+#: install-info.8:240
+msgid ""
+"If a description argument is given when B<--remove> is specified it is "
+"ignored and a warning is issued."
+msgstr ""
+
+# type: TP
+#: install-info.8:240
+#, no-wrap
+msgid "B<--menuentry=>I<xxx>"
+msgstr ""
 
 # type: Plain text
-#: dselect.1:438
-#, fuzzy
-msgid "The visible list of available packages cannot be reduced."
-msgstr "La lista de paquetes disponibles no puede ser reducida."
+#: install-info.8:249
+msgid ""
+"Specifies that the entry in the menu should be I<xxx>.  The default is to "
+"use the the value specified in the Info file itself.  If this is not present "
+"the basename of the Info file is used (any B<.info >is deleted, and the "
+"entry is made mixed case).  See above for details of the format expected for "
+"the menu entry in the Info file."
+msgstr ""
 
 # type: Plain text
-#: dselect.1:442
-#, fuzzy
+#: install-info.8:256
 msgid ""
-"The built in access methods can no longer stand up to current quality "
-"standards. Use the access method provided by apt, it is not only not broken, "
-"it is also much more flexible than the built in access methods."
+"When removing entries the value of the B<--menuentry> option must match the "
+"actual menu entry field in the menu item to be removed (case not "
+"significant). If B<--menuentry> is omitted no check on the menu entry is "
+"done."
 msgstr ""
-"Los otros métodos de acceso no tienen tanta calidad como el método que "
-"proporciona apt, no implica que los otros no funcionen, sino que este último "
-"es mucho mas flexible, lo cual lo hace ser mucho mas recomendable."
+
+# type: TP
+#: install-info.8:256
+#, fuzzy, no-wrap
+msgid "B<--keep-old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dselect.1:448
-#, fuzzy
-msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
+#: install-info.8:260
+msgid ""
+"Inhibits the replacement of existing entries and the removal of empty "
+"sections."
 msgstr ""
-"B<dpkg>(8), B<apt-get>(8), B<sources.list>(5), B<deb>(5)B<y> el manual de "
-"normas de Debian."
 
 # type: Plain text
-#: dselect.1:453
-#, fuzzy
+#: install-info.8:264
 msgid ""
-"B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
-"of contributors may be found in `dselect --license'."
+"If the file being installed already has an entry in the directory the old "
+"entry will be left alone instead of being replaced; the default is to "
+"overwrite any old entry found with the newly generated one."
 msgstr ""
-"B<dselect> fue escrito por (ijackson@gnu.ai.mit.edu). La lista entera de "
-"contribuidores puede ser leída ejecutando `dselect --license'."
 
 # type: Plain text
-#: dselect.1:456
-#, fuzzy
+#: install-info.8:269
 msgid ""
-"This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
-"Josip Rodin and Joost kooij."
+"If B<--remove> is specified B<--keep-old> will prevent the removal of the "
+"section heading which would otherwise happen if the section is made empty by "
+"the removal."
 msgstr ""
-"Este manual fue escrito por Juho Vuori E<lt>javuori@cc.helsinki.fi E<gt>, "
-"Josip Rodin, Joost kooij y finalmente traducida por Bruno Barrera C <bruno."
-"barrera@igloo.cl>."
-
-# type: SS
-#: dselect.cfg.5:1
-#, fuzzy, no-wrap
-msgid "dselect.cfg"
-msgstr "select"
 
 # type: Plain text
-#: dselect.cfg.5:4
-msgid "dselect.cfg - dselect configuration file"
+#: install-info.8:272
+msgid "Enables test mode, which inhibits the update of the directory file."
 msgstr ""
 
 # type: Plain text
-#: dselect.cfg.5:11
+#: install-info.8:276
 msgid ""
-"This file contains default options for dselect. Each line contains a single "
-"option which is exactly the same as a normal commandline option for dselect "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+"Enables debugging mode, in which the results of some internal processing "
+"steps are shown."
 msgstr ""
 
-# type: TP
-#: dselect.cfg.5:14
-#, fuzzy
-msgid "I</etc/dpkg/dselect.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
-
 # type: Plain text
-#: dselect.cfg.5:16
-msgid "I<~/.dselect.cfg>"
-msgstr ""
+#: install-info.8:281
+#, fuzzy
+msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dselect.cfg.5:20
+#: install-info.8:287
 #, fuzzy
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dselect>."
+"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
+"General Public Licence version 2 or later for copying conditions. There is "
+"I<no> warranty."
 msgstr ""
-"El programador original de B<dpkg> fue Ian Jackson, y luego mucha gente fue\n"
-"mejorándolo. La lista completa está en B</usr/share/doc/dpkg/THANKS.gz>.\n"
-"Traducción realizada por Esteban Manchado Velázquez (zoso@demiurgo.org).\n"
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
+"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
+"condiciones de copia.  B<No> hay garantía alguna."
 
 # type: Plain text
-#: dselect.cfg.5:22
-#, fuzzy
-msgid "B<dselect>(1)."
-msgstr "B<date>(1)."
-
-# type: SS
-#: install-info.8:5
+#: start-stop-daemon.8:1
 #, fuzzy, no-wrap
-msgid "install-info"
-msgstr "install"
+msgid "start-stop-daemon"
+msgstr "B<start-stop-daemon> B<-H>|B<--help>"
 
 # type: Plain text
-#: install-info.8:8
-msgid "install-info - create or update entry in Info directory"
-msgstr ""
+#: start-stop-daemon.8:4
+#, fuzzy
+msgid "start-stop-daemon - start and stop system daemon programs"
+msgstr "start-stop-daemon - para y arranca demonios del sistema"
 
 # type: Plain text
-#: install-info.8:24
-msgid ""
-"B<install-info> [B<--version>] [B<--help>] [B<--debug>] [B<--"
-"maxwidth=>I<nnn>] [B<--section >I<regexp>B< >I<title>] [B<--infodir=>I<xxx>] "
-"[B<--align=>I<nnn>] [B<--quiet>] [B<--menuentry=>I<xxx>] [B<--"
-"description=>I<xxx>] [B<--remove>|B<--remove-exactly>] [B<-->] I<filename>"
-msgstr ""
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<opciones>"
 
 # type: Plain text
-#: install-info.8:32
+#: start-stop-daemon.8:17
+#, fuzzy
 msgid ""
-"B<install-info> makes, updates or removes entries in the Info directory, the "
-"B<dir> file. When updating or creating entries, if no description is "
-"specified on the command line or in the Info file it attempts to guess a "
-"description from the contents of the file."
+"B<start-stop-daemon> is used to control the creation and termination of "
+"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
+"B<--name> options, B<start-stop-daemon> can be configured to find existing "
+"instances of a running process."
 msgstr ""
+"B<start-stop-daemon> se usa para controlar la creación y terminación de los "
+"procesos del sistema.  Usando las opciones B<--exec>, B<--pidfile>, B<--"
+"user>, y B<--name> opciones, B<start-stop-daemon> se puede configurar para "
+"encontrar distintos procesos del mismo demonio."
 
 # type: Plain text
-#: install-info.8:39
+#: start-stop-daemon.8:36
+#, fuzzy
 msgid ""
-"See the description of the B<--section> option for details of where the "
-"entry will be placed and a description of the expected format of the B<dir> "
-"file."
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
 msgstr ""
+"Dese cuenta que a menos que se especifique B<--pidfile ,> B<start-stop-"
+"daemon> se comporta similar a B<killall(1).> B<start-stop-daemon> buscará en "
+"la tabla de procesos cualquier proceso que concuerde en nombre, uid y/o gid "
+"(si se especifica). Cualquier proceso que concuerde con los parámetros "
+"prevendrá a B<--start> de empezar el demonio. Se mandará a todos los "
+"procesos la señal KILL si se especifica B<--stop.> Para los demonios que "
+"tengan hijos de larga duración que necesiten sobrevivir a un B<--stop> debe "
+"especificar un fichero-de-pid."
 
-# type: TP
-#: install-info.8:40
+# type: Plain text
+#: start-stop-daemon.8:38
 #, fuzzy, no-wrap
-msgid "B<[--] >I<filename>"
-msgstr "B<-n>I<nombrefichero>"
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|B<--start> I<opciones> [B<-->] I<argumentos>"
 
 # type: Plain text
-#: install-info.8:57
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"Gives the filename of the Info file whose menu entry is to be created, "
-"updated or removed. If B<--remove-exactly> is specified, then I<filename> "
-"should be the exact entry name to be removed (i.e. \"emacs-20/emacs\" or "
-"\"gcc\"), otherwise the basename of this filename is used as the referent of "
-"the menu entry which is created, unless there's an overriding START-INFO-DIR "
-"entry inside the given file. This file must therefore exist (or be about to "
-"be installed, or have previously existed when removing an entry) in the same "
-"directory as the B<dir> file (see the B<--infodir> option)."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
+"Con B<--start>, B<start-stop-daemon> comprueba la existencia del proceso "
+"especificado.  Si este proceso ya existe, B<start-stop-daemon> no hace nada, "
+"y termina con un estado de error 1 (0 si se especifica B<--oknodo> ).  Si el "
+"proceso no existe, comienza uno nuevo, usando el ejecutable especificado por "
+"B<--exec>, (o, si se especifica, por B<--startas> ).  Cualquier argumento "
+"dado en la línea de órdenes después de B<--> se pasa sin modificación alguna "
+"al programa que se va a ejecutar."
+
+# type: IP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-n>, B<--no-sort>"
 
 # type: Plain text
-#: install-info.8:66
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"If I<filename> ends in B<.gz> it is taken to refer to a file compressed with "
-"GNU gzip; if it doesn't exist, but a corresponding I<filename>B<.gz> does, "
-"the latter is used instead."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
+"Con B<--stop>, B<start-stop-daemon> comprueba además la existencia del "
+"proceso especificado.  Si este proceso existe, B<start-stop-daemon> envía la "
+"señal especificada por B<--signal>, y termina con un estado de error 0.  Si "
+"este proceso no existe, B<start-stop-daemon> termina con un estado de error "
+"1 (0 si se ha especificado la opción B<--oknodo> ). Si se especifica la "
+"opción B<--retry> entonces B<start-stop-daemon> comprobará que el proceso o "
+"los procesos han terminado."
+
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-us>, B<-uc>"
 
 # type: Plain text
-#: install-info.8:71
-msgid ""
-"When adding or updating entries the file must exist at the path specified "
-"(possibly with an additional B<.gz> extension)."
-msgstr ""
+#: start-stop-daemon.8:76
+#, fuzzy
+msgid "Show usage information and exit."
+msgstr "Muestra la versión, copyright y modo de uso."
 
 # type: TP
-#: install-info.8:71
+#: start-stop-daemon.8:76
 #, fuzzy, no-wrap
-msgid "B<--remove>"
-msgstr "I<--rename>"
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: install-info.8:76
-msgid ""
-"Specifies that the entry for the file I<filename> is to be removed; by "
-"default entries are created or updated."
-msgstr ""
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Muestra la versión y termina."
+
+# type: TP
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
+msgstr "B<-x>|B<--exec> I<ejecutable>"
 
 # type: Plain text
-#: install-info.8:86
+#: start-stop-daemon.8:85
+#, fuzzy
 msgid ""
-"If the removal results in a section becoming empty the section heading (and "
-"the spare blank line) will be removed as well, unless this is the last "
-"section in the file or B<--keep-old> is specified. See the B<--section> "
-"option for details about the expected format of the B<dir> file."
+"Check for processes that are instances of this executable (according to B</"
+"proc/>I<pid>B</exe>)."
 msgstr ""
+"Busca distintos procesos de este ejecutable (según B</proc/>I<pid>B</exe>)."
+
+# type: TP
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
+msgstr "B<-p>|B<--pidfile> I<fichero-de-pid>"
 
 # type: Plain text
-#: install-info.8:91
-msgid ""
-"If there are several suitable entries in the B<dir> file only those in the "
-"first matching contiguous group will be removed and the others silently "
-"ignored."
-msgstr ""
+#: start-stop-daemon.8:89
+#, fuzzy
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr "Comprueba si un procesos ha creado el fichero I<fichero-de-pid>."
+
+# type: TP
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
+msgstr "B<-u>|B<--user> I<nombre-usuario>|I<uid>"
 
 # type: Plain text
-#: install-info.8:97
+#: start-stop-daemon.8:95
+#, fuzzy
 msgid ""
-"It is not an error for no suitable entry to be found, though B<install-info> "
-"will issue a warning unless the B<--quiet> option was specified."
+"Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
+"Comprueba si existen los procesos del usuario especificado por I<nombre-"
+"usuario> o I<uid>."
+
+# type: TP
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
+msgstr "B<-g>|B<--group> I<grupo>|I<gid>"
 
 # type: Plain text
-#: install-info.8:103
+#: start-stop-daemon.8:98
+#, fuzzy
+msgid "Change to I<group> or I<gid> when starting the process."
+msgstr "Cambia a I<grupo> o I<gid> cuando comienza el proceso."
+
+# type: TP
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
+msgstr "B<-n>|B<--name> I<nombre-proceso>"
+
+# type: Plain text
+#: start-stop-daemon.8:104
+#, fuzzy
 msgid ""
-"When B<--remove> is specified the B<--maxwidth>, B<--align> and B<--calign> "
-"formatting options are silently ignored."
+"Check for processes with the name I<process-name> (according to B</proc/"
+">I<pid>B</stat>)."
 msgstr ""
+"Comprueba los procesos con el nombre I<nombre-proceso> (según B</proc/"
+">I<pid>B</stat>)."
 
 # type: TP
-#: install-info.8:103
-#, fuzzy, no-wrap
-msgid "B<--remove-exactly>"
-msgstr "B<--remove-all> I<nombre>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
+msgstr "B<-s>|B<--signal> I<señal>"
 
 # type: Plain text
-#: install-info.8:121
+#: start-stop-daemon.8:109
+#, fuzzy
 msgid ""
-"This option is essentially the same as B<--remove> except that I<filename> "
-"is taken as the exact entry to be removed, rather than as the name of an "
-"existing file. This can be important when trying to remove entries that "
-"refer to info files in subdirectories (i.e. \"emacs-20/emacs\") because B<--"
-"remove> will operate on the basename of the given I<filename> rather than "
-"the exact name given. (i.e.  B<--remove> \"emacs-20/emacs\" would cause "
-"B<install-info> to look for \"emacs\", not \"emacs-20/emacs\")."
+"With B<--stop>, specifies the signal to send to processes being stopped "
+"(default 15)."
 msgstr ""
+"Junto con B<--stop>, especifica la señal enviada al proceso que se desea "
+"parar (15 por omisión)."
 
 # type: TP
-#: install-info.8:121
-#, no-wrap
-msgid "B<--section >I<regexp title>"
-msgstr ""
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
+msgstr "B<-R>|B<--retry> I<tiempo-de-espera>|I<acción-programada>"
 
 # type: Plain text
-#: install-info.8:135
+#: start-stop-daemon.8:119
+#, fuzzy
 msgid ""
-"Specifies that, if a new entry is to be made, it should be placed in a "
-"section of the B<dir> file whose title matches I<regexp>.  If no such "
-"section exists one will be created as the second last section in the file "
-"(see below), with title I<title>.  A section is a part of the B<dir> menu "
-"delimited by blank lines; the first line is assumed to be the title."
+"With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
+"process(es)  do finish. It will check repeatedly whether any matching "
+"processes are running, until none are. If the processes do not exit it will "
+"then take further action as determined by the schedule."
 msgstr ""
+"Junto con B<--stop>, especifica que B<start-stop-daemon> compruebe que el "
+"proceso o los procesos han terminado.  Lo comprobará repetidas veces hasta "
+"que no haya ningún proceso que coincida. Si el proceso no termina tomará una "
+"decisión determinada por I<acción-programada .>"
 
 # type: Plain text
-#: install-info.8:142
+#: start-stop-daemon.8:130
+#, fuzzy
 msgid ""
-"If a new entry is to be created B<install-info> will attempt to insert it "
-"within the section according in alphabetic order; if the entries in the "
-"section aren't already sorted the new location within the section will be "
-"unpredictable. The order of existing entries will not be changed."
+"If I<timeout> is specified instead of I<schedule> then the schedule "
+"I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
+"signal specified with B<--signal>."
 msgstr ""
+"Si se especifica I<tiempo-de-espera> en vez de I<acción-programada> entonces "
+"se usa la secuencia I<señal>B</>I<tiempo-de-espera>B</KILL/>I<tiempo-de-"
+"espera> , donde I<señal> es la señal especificada por B<--signal>."
 
 # type: Plain text
-#: install-info.8:148
+#: start-stop-daemon.8:146
+#, fuzzy
 msgid ""
-"The default is to append new entries to the end of the file. The last "
-"section (even if it only consists of the title line) should always exist, to "
-"ensure that new sections are created in the right place.  The final section "
-"should be titled to reflect the fact that Info files with no more well "
-"specified location are appended to it."
+"I<schedule> is a list of at least two items separated by slashes (B</>); "
+"each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
+"to send that signal, or I<timeout>, which means to wait that many seconds "
+"for processes to exit, or B<forever>, which means to repeat the rest of the "
+"schedule forever if necessary."
 msgstr ""
+"I<acción-programada> es una lista de al menos dos artículos separados por "
+"barras (B</>); cada artículo puede ser un B<->I<número>B<de>I<señal> o [B<->]"
+"I<nombre de señal>, que significa que se debe mandar esa señal, o I<tiempo-"
+"de-espera,> que significa que se debe esperar esos segundos para que el "
+"programa termine, o B<forever>, que significa que se repite el resto de "
+"acción-programada para siempre si es necesario."
 
 # type: Plain text
-#: install-info.8:151
+#: start-stop-daemon.8:156
+#, fuzzy
 msgid ""
-"If there is already an entry for the Info file being installed it is "
-"replaced in situ with the new entry."
+"If the end of the schedule is reached and B<forever> is not specified, then "
+"B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
+"then any signal specified with B<--signal> is ignored."
 msgstr ""
+"Si se alcanza el final de la acción-programada y no se ha especificado "
+"B<forever> , entonces B<start-stop-daemon> termina con un estado de error "
+"2.  Si se especifica una secuencia, entonces cualquier señal especificada "
+"con B<--signal> no se tendrá en cuenta."
+
+# type: TP
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
+msgstr "B<-a>|B<--startas> I<pathname>"
 
 # type: Plain text
-#: install-info.8:154
+#: start-stop-daemon.8:164
+#, fuzzy
 msgid ""
-"If a section is specified when removing an entry the section is ignored and "
-"a warning is issued."
+"With B<--start>, start the process specified by I<pathname>.  If not "
+"specified, defaults to the argument given to B<--exec>."
 msgstr ""
+"Con B<--start>, comienza el proceso especificado por I<pathname>.  Si no se "
+"especifica, se usarán los argumentos dados con B<--exec>."
+
+# type: TP
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: install-info.8:160
+#: start-stop-daemon.8:168
+#, fuzzy
 msgid ""
-"If a section is requested when adding an entry but the file contains no "
-"section headings at all then B<install-info> will create both the requested "
-"section and a Miscellaneous section at the end of the file."
+"Print actions that would be taken and set appropriate return value, but take "
+"no action."
 msgstr ""
+"Muestra las acciones que se realizarían y devuelve el valor apropiado, pero "
+"no hace nada."
 
 # type: TP
-#: install-info.8:160
+#: start-stop-daemon.8:168
 #, fuzzy, no-wrap
-msgid "B<--infodir=>I<infodir>"
-msgstr "B<--admindir> I<directorio>"
+msgid "B<-o>, B<--oknodo>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: install-info.8:169
-msgid ""
-"Specifies that the B<dir> file is, and the installed copy of the new Info "
-"file was, is or will be located in I<infodir>.  The default is B</usr/share/"
-"info/>."
+#: start-stop-daemon.8:171
+#, fuzzy
+msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
+"Devuelve un estado 0 en vez de 1 si no se realiza (realizasen)  ninguna "
+"acción."
 
 # type: TP
-#: install-info.8:169
-#, no-wrap
-msgid "B<--align=>I<nnn>B< [deprecated]>"
-msgstr ""
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: install-info.8:178
-msgid ""
-"Specifies that the first line of the description should be indented at least "
-"I<nnn> characters; extra spaces will be added as required. If necessary "
-"because of the length of the B<dir> menu entry details it may be offset "
-"more. The default is 27."
-msgstr ""
+#: start-stop-daemon.8:174
+#, fuzzy
+msgid "Do not print informational messages; only display error messages."
+msgstr "No muestra mensajes informativos, sólo muestra mensajes de error."
 
 # type: TP
-#: install-info.8:178
-#, no-wrap
-msgid "B<--calign=>I<nnn>B< [deprecated]>"
-msgstr ""
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
+msgstr "B<-c>|B<--chuid> I<nombre-usuario>|I<uid>"
 
 # type: Plain text
-#: install-info.8:184
+#: start-stop-daemon.8:191
+#, fuzzy
 msgid ""
-"Specifies that the second and subsequent lines of the description should be "
-"indented at least I<nnn> characters. The default is 29."
+"Change to this username/uid before starting the process. You can also "
+"specify a group by appending a B<:>, then the group or gid in the same way "
+"as you would for the `chown' command (I<user>B<:>I<group>).  When using this "
+"option you must realize that the primary and supplemental groups are set as "
+"well, even if the B<--group> option is not specified. The B<--group> option "
+"is only for groups that the user isn't normally a member of (like adding per "
+"process group membership for generic users like B<nobody>)."
 msgstr ""
+"Cambia a este usuario/uid antes de empezar el proceso. Además puede "
+"especificar el grupo añadiendo B<:>, luego el grupo o el gid del mismo modo "
+"que haría con la orden `chown' (I<usuario>B<:>I<grupo>).  Debe de darse "
+"cuenta que cuando se usa esta opción el grupo primario y complementario se "
+"cambian también, incluso si no se especifica B<--group .> La opción B<--"
+"group> es sólo para grupos de los que el usuario no es miembro (como el "
+"grupo nobody )."
 
 # type: TP
-#: install-info.8:184
-#, no-wrap
-msgid "B<--maxwidth=>I<nnn>B< [deprecated]>"
-msgstr ""
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
+msgstr "B<-r>|B<--chroot> I<directorio-raíz>"
 
 # type: Plain text
-#: install-info.8:190
+#: start-stop-daemon.8:197
+#, fuzzy
 msgid ""
-"Specifies that the maximum width for the Info file is I<nnn>.  This is used "
-"when word-wrapping the descriptive text.  The default is 79."
+"Chdir and chroot to I<root> before starting the process. Please note that "
+"the pidfile is also written after the chroot."
 msgstr ""
+"Efectua chdir y chroot a I<directorio-raíz> antes de empezar el proceso. "
+"Dese cuenta que el fichero del pid también es escrito después de hacer el "
+"chroot."
+
+# type: TP
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
+msgstr "B<-d>|B<--chdir> I<directorio>"
 
 # type: Plain text
-#: install-info.8:195
+#: start-stop-daemon.8:205
+#, fuzzy
 msgid ""
-"Prevents the usual display of the new menu entry just before it is inserted, "
-"and of the messages announcing the replacement and removal of existing "
-"entries and the creation and deletion of sections."
+"Chdir to I<path> before starting the process. This is done after the chroot "
+"if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
+"daemon will chdir to the root directory before starting the process."
 msgstr ""
+"Efectua chdir a I<directorio> antes de empezar el proceso. Esto se hace "
+"después de efectuar chroot, si es que la opción B<-r>|B<--chroot> está "
+"establecida. Si no se especifica, start-stop-daemon ejecutará un chdir al "
+"directorio raíz antes de empezar el proceso."
 
-# type: Plain text
-#: install-info.8:200
-msgid "Causes B<install-info> to display its usage information and exit."
-msgstr ""
+# type: TP
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
+msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: install-info.8:205
+#: start-stop-daemon.8:217
+#, fuzzy
 msgid ""
-"Causes B<install-info> to display its version and copyright information and "
-"exit."
+"Typically used with programs that don't detach on their own. This option "
+"will force B<start-stop-daemon> to fork before starting the process, and "
+"force it into the background.  B<WARNING: start-stop-daemon> cannot check "
+"the exit status if the process fails to execute for B<any> reason. This is a "
+"last resort, and is only meant for programs that either make no sense "
+"forking on their own, or where it's not feasible to add the code for them to "
+"do this themself."
 msgstr ""
+"Usado típicamente con programas que no se separan por sí mismos. Esta opción "
+"forzará B<start-stop-daemon> a hacer fork antes de empezar el proceso, y "
+"luego dejarlo en segundo plano.  B<ATENCIÓN: start-stop-daemon> no puede "
+"comprobar el estado de salida si el proceso no puede ejecutarse por "
+"B<cualquier> razón. Esto se hace como último recurso, y sólo tiene sentido "
+"usarla en programas donde no tiene sentido que hagan fork por sí mismos, o "
+"no es factible añadir el código para que lo hagan por sí mismos."
 
 # type: TP
-#: install-info.8:205
+#: start-stop-daemon.8:217
 #, fuzzy, no-wrap
-msgid "B<--description=>I<xxx>"
-msgstr "B<-C>I<descripcióndecambios>"
+msgid "B<-N>, B<--nicelevel> I<int>"
+msgstr "B<-N>|B<--nicelevel> I<entero>"
 
 # type: Plain text
-#: install-info.8:212
-msgid ""
-"Specifies that the description to use after the menu entry in new or updated "
-"entries be I<xxx>.  The default is to use the the value specified in the "
-"Info file itself; this is found by searching for a section of the form"
-msgstr ""
+#: start-stop-daemon.8:220
+#, fuzzy
+msgid "This alters the priority of the process before starting it."
+msgstr "Altera la prioridad del proceso antes de empezarlo."
+
+# type: TP
+#: start-stop-daemon.8:220
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<señal>"
 
 # type: Plain text
-#: install-info.8:214
-msgid "B<START-INFO-DIR-ENTRY>"
-msgstr ""
+#: start-stop-daemon.8:223
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Altera la prioridad del proceso antes de empezarlo."
+
+# type: TP
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
+msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: install-info.8:216
-msgid "B<* Auto-PGP: (auto-pgp). PGP under GNU Emacs.>"
+#: start-stop-daemon.8:238
+#, fuzzy
+msgid ""
+"Used when starting a program that does not create its own pid file. This "
+"option will make B<start-stop-daemon> create the file referenced with B<--"
+"pidfile> and place the pid into it just before executing the process. Note, "
+"the file will not be removed when stopping the program.  B<NOTE:> This "
+"feature may not work in all cases. Most notably when the program being "
+"executed forks from its main process. Because of this it is usually only "
+"useful when combined with the B<--background> option."
 msgstr ""
+"Se usa cuando se quiere comenzar un programa que no crea su propio fichero "
+"de pid. Esta opción hace que B<start-stop-daemon> cree el fichero referido "
+"con B<--pidfile> y coloque el pid dentro de él justo antes de ejecutar el "
+"proceso. Dese cuenta que no se borrará cuando termine el programa.  B<NOTA:> "
+"Esta característica no funciona en todos los casos. Más notablemente cuando "
+"el programa que se ejecuta hace fork en su proceso principal.  Por esto "
+"solamente es útil cuando se combina con la opción B<--background .>"
+
+# type: TP
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: install-info.8:218
-msgid "B<END-INFO-DIR-ENTRY>"
-msgstr ""
+#: start-stop-daemon.8:241
+#, fuzzy
+msgid "Print verbose informational messages."
+msgstr "Muestra mensajes informativos detallados."
 
 # type: Plain text
-#: install-info.8:227
+#: start-stop-daemon.8:245
+#, fuzzy
 msgid ""
-"If the entry found in the Info file itself extends across several lines, "
-"each giving a menu entry, the text found in the file is used verbatim. In "
-"this case the alphabetic ordering scheme is turned off, and the entries are "
-"inserted at the top of section in question. In this case the B<--menuentry>, "
-"B<--maxwidth>, B<--align>, B<--calign> and B<--menuentry> options are "
-"ignored."
+"Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
+"previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 msgstr ""
+"Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> basada en "
+"una versión previa de Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: install-info.8:234
+#: start-stop-daemon.8:247
+#, fuzzy
 msgid ""
-"If there is no B<dir> entry in the file the program will try to find a "
-"paragraph early in the file starting B<this file documents>.  It will "
-"capitalise the first character of the remainder, and use that."
+"Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
+"Ian Jackson."
 msgstr ""
+"Página del manual de Klee Dienes E<lt>klee@mit.eduE<gt>, reformada "
+"parcialmente por Ian Jackson."
 
 # type: Plain text
-#: install-info.8:236
-msgid "It is an error for none of these methods to yield a description."
-msgstr ""
+#: update-alternatives.8:8
+#, no-wrap
+msgid "update-alternatives"
+msgstr "update-alternatives"
 
 # type: Plain text
-#: install-info.8:240
+#: update-alternatives.8:11
+#, fuzzy
 msgid ""
-"If a description argument is given when B<--remove> is specified it is "
-"ignored and a warning is issued."
-msgstr ""
-
-# type: TP
-#: install-info.8:240
-#, no-wrap
-msgid "B<--menuentry=>I<xxx>"
+"update-alternatives - maintain symbolic links determining default commands"
 msgstr ""
+"update-alternatives - mantiene enlaces simbólicos que determinan órdenes "
+"predeterminadas."
 
 # type: Plain text
-#: install-info.8:249
-msgid ""
-"Specifies that the entry in the menu should be I<xxx>.  The default is to "
-"use the the value specified in the Info file itself.  If this is not present "
-"the basename of the Info file is used (any B<.info >is deleted, and the "
-"entry is made mixed case).  See above for details of the format expected for "
-"the menu entry in the Info file."
-msgstr ""
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
+msgstr "B<update-alternatives> [I<opciones>] B<--all>"
 
 # type: Plain text
-#: install-info.8:256
+#: update-alternatives.8:21
+#, fuzzy
 msgid ""
-"When removing entries the value of the B<--menuentry> option must match the "
-"actual menu entry field in the menu item to be removed (case not "
-"significant). If B<--menuentry> is omitted no check on the menu entry is "
-"done."
+"B<update-alternatives> creates, removes, maintains and displays information "
+"about the symbolic links comprising the Debian alternatives system."
 msgstr ""
-
-# type: TP
-#: install-info.8:256
-#, fuzzy, no-wrap
-msgid "B<--keep-old>"
-msgstr "B<--old>"
+"B<update-alternatives> crea, destruye, mantiene y muestra información acerca "
+"de los enlaces simbólicos que conforman el sistema de alternativas de Debian."
 
 # type: Plain text
-#: install-info.8:260
+#: update-alternatives.8:29
+#, fuzzy
 msgid ""
-"Inhibits the replacement of existing entries and the removal of empty "
-"sections."
+"It is possible for several programs fulfilling the same or similar functions "
+"to be installed on a single system at the same time.  For example, many "
+"systems have several text editors installed at once.  This gives choice to "
+"the users of a system, allowing each to use a different editor, if desired, "
+"but makes it difficult for a program to make a good choice for an editor to "
+"invoke if the user has not specified a particular preference."
 msgstr ""
+"Es posible que varios programas que realizan la misma función o una parecida "
+"estén instalados en el sistema al mismo tiempo. Por ejemplo, muchos sistemas "
+"tienen varios editores de texto instalados al mismo tiempo, esto deja la "
+"elección de que editor de texto usar en manos del usuario, si éste lo desea, "
+"pero hace difícil que un programa elija la opción correcta si el usuario no "
+"ha especificado ninguna preferencia."
 
 # type: Plain text
-#: install-info.8:264
+#: update-alternatives.8:51
+#, fuzzy
 msgid ""
-"If the file being installed already has an entry in the directory the old "
-"entry will be left alone instead of being replaced; the default is to "
-"overwrite any old entry found with the newly generated one."
+"Debian's alternatives system aims to solve this problem.  A generic name in "
+"the filesystem is shared by all files providing interchangeable "
+"functionality.  The alternatives system and the system administrator "
+"together determine which actual file is referenced by this generic name.  "
+"For example, if the text editors B<ed>(1)  and B<nvi>(1)  are both installed "
+"on the system, the alternatives system will cause the generic name I</usr/"
+"bin/editor> to refer to I</usr/bin/nvi> by default. The system administrator "
+"can override this and cause it to refer to I</usr/bin/ed> instead, and the "
+"alternatives system will not alter this setting until explicitly requested "
+"to do so."
 msgstr ""
+"El objetivo del sistema de alternativas de Debian es resolver este "
+"problema.  Un nombre genérico en el sistema de ficheros se comparte entre "
+"todos los ficheros que tienen una funcionalidad intercambiable. El sistema "
+"de alternativas junto con el administrador del sistema determinan a qué "
+"fichero hace referencia este nombre genérico. Por ejemplo, si los editores "
+"de texto B<ed>(1)  y B<nvi>(1)  están instalados conjuntamente en el "
+"sistema, el sistema de alternativas hará que el nombre genérico I</usr/bin/"
+"editor> se refiera a I</usr/bin/nvi .> El administrador del sistema puede "
+"modificar esto y hacer que se prefiera I</usr/bin/ed> , el sistema de "
+"alternativas no modificará esto posteriormente hasta que se solicite "
+"explícitamente."
 
 # type: Plain text
-#: install-info.8:269
+#: update-alternatives.8:61
+#, fuzzy
 msgid ""
-"If B<--remove> is specified B<--keep-old> will prevent the removal of the "
-"section heading which would otherwise happen if the section is made empty by "
-"the removal."
+"The generic name is not a direct symbolic link to the selected alternative.  "
+"Instead, it is a symbolic link to a name in the I<alternatives> "
+"I<directory>, which in turn is a symbolic link to the actual file "
+"referenced.  This is done so that the system administrator's changes can be "
+"confined within the I</etc> directory: the FHS (q.v.) gives reasons why this "
+"is a Good Thing."
 msgstr ""
+"El nombre genérico no es un enlace directo a la alternativa seleccionada. En "
+"vez de esto, es un enlace simbólico a un nombre en el I<directorio> I<de> "
+"I<alternativas> , que a su vez en un enlace simbólico al fichero al que se "
+"quiere hacer referencia.  Esto se hace de este modo para que los cambios del "
+"administrador se mantengan dentro del directorio I</etc> : el FHS (q.v.) da "
+"razones de por qué esto es bueno."
 
 # type: Plain text
-#: install-info.8:272
-msgid "Enables test mode, which inhibits the update of the directory file."
+#: update-alternatives.8:73
+#, fuzzy
+msgid ""
+"When each package providing a file with a particular functionality is "
+"installed, changed or removed, B<update-alternatives> is called to update "
+"information about that file in the alternatives system.  B<update-"
+"alternatives> is usually called from the B<postinst> or B<prerm> scripts in "
+"Debian packages."
 msgstr ""
+"Cuando se instala o desinstala un paquete que provee un fichero con una "
+"funcionalidad en particular, se llama a B<update-alternatives> para "
+"actualizar la información del sistema de alternativas acerca de ese "
+"fichero.  B<update-alternatives> se llama normalmente desde los scripts "
+"B<postinst> o B<prerm> de los paquetes de Debian."
 
 # type: Plain text
-#: install-info.8:276
+#: update-alternatives.8:92
+#, fuzzy
 msgid ""
-"Enables debugging mode, in which the results of some internal processing "
-"steps are shown."
+"It is often useful for a number of alternatives to be synchronised, so that "
+"they are changed as a group; for example, when several versions of the B<vi>"
+"(1)  editor are installed, the man page referenced by I</usr/share/man/man1/"
+"vi.1> should correspond to the executable referenced by I</usr/bin/vi>.  "
+"B<update-alternatives> handles this by means of I<master> and I<slave> "
+"links; when the master is changed, any associated slaves are changed too.  A "
+"master link and its associated slaves make up a I<link> I<group>."
 msgstr ""
+"Normalmente es útil para un número de alternativas que estas sean "
+"sincronizadas de tal modo que puedan cambiarse como un grupo. Por ejemplo, "
+"cuando varias versiones del editor B<vi>(1)  están instaladas, la página del "
+"manual preferida por I</usr/share/man/man1/vi.1> debe de corresponder con el "
+"ejecutable al que hace referencia I</usr/bin/vi>.  B<update-alternatives> "
+"maneja esto en términos de enlaces I<maestro> y I<esclavo> , cuando se "
+"cambia el maestro, todos los esclavos relacionados con él también se "
+"cambian.  Un enlace maestro y sus esclavos relacionados forman un I<grupo> "
+"de I<enlaces .>"
 
 # type: Plain text
-#: install-info.8:281
+#: update-alternatives.8:100
 #, fuzzy
-msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"Each link group is, at any given time, in one of two modes: automatic or "
+"manual.  When a group is in automatic mode, the alternatives system will "
+"automatically decide, as packages are installed and removed, whether and how "
+"to update the links.  In manual mode, the alternatives system will not "
+"change the links; it will leave all the decisions to the system "
+"administrator."
+msgstr ""
+"Cada grupo de enlaces está en cualquier momento en uno de los dos modos "
+"posibles: automático o manual.  Cuando un grupo está en modo automático, el "
+"sistema de alternativas decide automáticamente a medida que se instalan o "
+"desinstalan paquetes cuándo se deben de actualizar los enlaces.  En modo "
+"manual el sistema de alternativas deja todas estas decisiones en manos del "
+"administrador del sistema."
 
 # type: Plain text
-#: install-info.8:287
+#: update-alternatives.8:109
 #, fuzzy
 msgid ""
-"Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
-"General Public Licence version 2 or later for copying conditions. There is "
-"I<no> warranty."
+"Link groups are in automatic mode when they are first introduced to the "
+"system.  If the system administrator makes changes to the system's automatic "
+"settings, this will be noticed the next time B<update-alternatives> is run "
+"on the changed link's group, and the group will automatically be switched to "
+"manual mode."
 msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> es software gratuito; "
-"Vea la Licencia Pública General de GNU en su versión 2 o superior para las "
-"condiciones de copia.  B<No> hay garantía alguna."
-
-# type: Plain text
-#: start-stop-daemon.8:1
-#, fuzzy, no-wrap
-msgid "start-stop-daemon"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+"Los grupos de enlaces se establecen en modo automático la primera vez que "
+"entran en el sistema.  Si el administrador del sistema hace cambios en la "
+"configuración automática del sistema, B<update-alternatives> se dará cuenta "
+"la próxima vez que se ejecute sobre el grupo de enlaces cambiados, y el "
+"grupo será cambiado automáticamente a modo manual."
 
 # type: Plain text
-#: start-stop-daemon.8:4
+#: update-alternatives.8:116
 #, fuzzy
-msgid "start-stop-daemon - start and stop system daemon programs"
-msgstr "start-stop-daemon - para y arranca demonios del sistema"
+msgid ""
+"Each alternative has a I<priority> associated with it.  When a link group is "
+"in automatic mode, the alternatives pointed to by members of the group will "
+"be those which have the highest priority."
+msgstr ""
+"Cada alternativa tiene una I<prioridad> asociada.  Cuando un grupo de "
+"enlaces se encuentra en modo automático, la alternativa a la que apuntan los "
+"miembros del grupo será la que tenga una prioridad más alta."
 
 # type: Plain text
-#: start-stop-daemon.8:11
+#: update-alternatives.8:132
 #, fuzzy
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
+msgid ""
+"When using the I<--config> option, B<update-alternatives> will list all of "
+"the choices for the link group of which given I<name> is the master link. "
+"The current choice is marked with a '*' and the choice with the highest "
+"priority with a '+'.  You will then be prompted for your choice regarding "
+"this link group.  Once you make a change, the link group will no longer be "
+"in I<auto> mode. You will need to use the I<--auto> option in order to "
+"return to the automatic mode."
 msgstr ""
-"B<start-stop-daemon> B<-S>|B<--start> I<opciones> [B<-->] I<argumentos>"
+"Cuando se use la opción I<--config> , B<update-alternatives> mostrará todas "
+"las posibilidades para el grupo de enlaces que tienen como maestro a "
+"I<nombre .> Entonces se elegirá una de las opciones posibles del grupo de "
+"enlaces.  Una vez que se haga algún cambio, el grupo de enlaces dejará de "
+"estar en modo I<automático .> Será necesario usar la opción I<--auto> para "
+"volver el grupo de enlaces al estado automático."
 
 # type: Plain text
-#: start-stop-daemon.8:15
+#: update-alternatives.8:136
 #, fuzzy
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
-msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<opciones>"
+msgid ""
+"If you want to configure non-interactively you can use the I<--set> option "
+"instead (see below)."
+msgstr ""
+"Si quiere realizar la configuración de un modo no interactivo puede usar la "
+"opción I<--set> en su lugar (vea más abajo)."
 
 # type: Plain text
-#: start-stop-daemon.8:18
-#, fuzzy
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+#: update-alternatives.8:147
+msgid ""
+"Different packages providing the same file need to do so B<cooperatively>.  "
+"That is - the usage of B<update-alternatives> is B<mandatory> for all "
+"involved packages in such case - it is not possible to override some file in "
+"a package that does not employ the B<update-alternatives> mechanism."
+msgstr ""
 
-# type: Plain text
-#: start-stop-daemon.8:21
-#, fuzzy
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+# type: SH
+#: update-alternatives.8:148
+#, fuzzy, no-wrap
+msgid "TERMINOLOGY"
+msgstr "TERMINOLOGÍA"
 
 # type: Plain text
-#: start-stop-daemon.8:29
+#: update-alternatives.8:153
 #, fuzzy
 msgid ""
-"B<start-stop-daemon> is used to control the creation and termination of "
-"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
-"B<--name> options, B<start-stop-daemon> can be configured to find existing "
-"instances of a running process."
+"Since the activities of B<update-alternatives> are quite involved, some "
+"specific terms will help to explain its operation."
 msgstr ""
-"B<start-stop-daemon> se usa para controlar la creación y terminación de los "
-"procesos del sistema.  Usando las opciones B<--exec>, B<--pidfile>, B<--"
-"user>, y B<--name> opciones, B<start-stop-daemon> se puede configurar para "
-"encontrar distintos procesos del mismo demonio."
+"Debido a que las actividades que realiza B<update-alternatives> están "
+"fuertemente relacionadas entre sí, la definición de algunos términos "
+"específicos ayudará a entender su funcionamiento."
+
+# type: TP
+#: update-alternatives.8:153
+#, fuzzy, no-wrap
+msgid "generic name"
+msgstr "nombre genérico"
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: update-alternatives.8:159
 #, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
+"to one of a number of files of similar function."
 msgstr ""
-"Con B<--start>, B<start-stop-daemon> comprueba la existencia del proceso "
-"especificado.  Si este proceso ya existe, B<start-stop-daemon> no hace nada, "
-"y termina con un estado de error 1 (0 si se especifica B<--oknodo> ).  Si el "
-"proceso no existe, comienza uno nuevo, usando el ejecutable especificado por "
-"B<--exec>, (o, si se especifica, por B<--startas> ).  Cualquier argumento "
-"dado en la línea de órdenes después de B<--> se pasa sin modificación alguna "
-"al programa que se va a ejecutar."
+"Un nombre, como I</usr/bin/editor>, que mediante el sistema de alternativas "
+"hace referencia a uno de los posibles ficheros con una función similar."
+
+# type: TP
+#: update-alternatives.8:159
+#, fuzzy, no-wrap
+msgid "symlink"
+msgstr "enlace"
 
 # type: Plain text
-#: start-stop-daemon.8:68
+#: update-alternatives.8:164
 #, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Without any further qualification, this means a symbolic link in the "
+"alternatives directory: one which the system administrator is expected to "
+"adjust."
 msgstr ""
-"Con B<--stop>, B<start-stop-daemon> comprueba además la existencia del "
-"proceso especificado.  Si este proceso existe, B<start-stop-daemon> envía la "
-"señal especificada por B<--signal>, y termina con un estado de error 0.  Si "
-"este proceso no existe, B<start-stop-daemon> termina con un estado de error "
-"1 (0 si se ha especificado la opción B<--oknodo> ). Si se especifica la "
-"opción B<--retry> entonces B<start-stop-daemon> comprobará que el proceso o "
-"los procesos han terminado."
+"Sólo es un enlace simbólico en el directorio de alternativas, no tiene "
+"ningún significado especial. Puede ser ajustado por el administrador."
+
+# type: TP
+#: update-alternatives.8:164
+#, fuzzy, no-wrap
+msgid "alternative"
+msgstr "alternativa"
 
 # type: Plain text
-#: start-stop-daemon.8:87
+#: update-alternatives.8:168
 #, fuzzy
 msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
+"The name of a specific file in the filesystem, which may be made accessible "
+"via a generic name using the alternatives system."
 msgstr ""
-"Dese cuenta que a menos que se especifique B<--pidfile ,> B<start-stop-"
-"daemon> se comporta similar a B<killall(1).> B<start-stop-daemon> buscará en "
-"la tabla de procesos cualquier proceso que concuerde en nombre, uid y/o gid "
-"(si se especifica). Cualquier proceso que concuerde con los parámetros "
-"prevendrá a B<--start> de empezar el demonio. Se mandará a todos los "
-"procesos la señal KILL si se especifica B<--stop.> Para los demonios que "
-"tengan hijos de larga duración que necesiten sobrevivir a un B<--stop> debe "
-"especificar un fichero-de-pid."
+"El nombre específico de un fichero en el sistema de ficheros, que, puede ser "
+"accesible a través de un nombre genérico usando el sistema de alternativas."
 
 # type: TP
-#: start-stop-daemon.8:90
+#: update-alternatives.8:168
 #, fuzzy, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
-msgstr "B<-x>|B<--exec> I<ejecutable>"
+msgid "alternatives directory"
+msgstr "directorio de alternativas"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: update-alternatives.8:173
 #, fuzzy
-msgid ""
-"Check for processes that are instances of this executable (according to B</"
-"proc/>I<pid>B</exe>)."
+msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
-"Busca distintos procesos de este ejecutable (según B</proc/>I<pid>B</exe>)."
+"El directorio que contiene los enlaces, por omisión es I</etc/alternatives>."
 
 # type: TP
-#: start-stop-daemon.8:94
+#: update-alternatives.8:173
 #, fuzzy, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
-msgstr "B<-p>|B<--pidfile> I<fichero-de-pid>"
+msgid "administrative directory"
+msgstr "directorio administrativo"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: update-alternatives.8:180
 #, fuzzy
-msgid "Check whether a process has created the file I<pid-file>."
-msgstr "Comprueba si un procesos ha creado el fichero I<fichero-de-pid>."
+msgid ""
+"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
+"alternatives>' state information."
+msgstr ""
+"El directorio que contiene la información de estado de B<update-"
+"alternatives> por omisión es I</var/lib/dpkg/alternatives>."
 
 # type: TP
-#: start-stop-daemon.8:98
+#: update-alternatives.8:180
 #, fuzzy, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
-msgstr "B<-u>|B<--user> I<nombre-usuario>|I<uid>"
+msgid "link group"
+msgstr "grupo de enlaces"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: update-alternatives.8:183
 #, fuzzy
-msgid ""
-"Check for processes owned by the user specified by I<username> or I<uid>."
+msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
-"Comprueba si existen los procesos del usuario especificado por I<nombre-"
-"usuario> o I<uid>."
+"Un conjunto de enlaces relacionados, que se pretende que sean actualizados "
+"como un grupo."
 
 # type: TP
-#: start-stop-daemon.8:104
+#: update-alternatives.8:183
 #, fuzzy, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
-msgstr "B<-g>|B<--group> I<grupo>|I<gid>"
+msgid "master link"
+msgstr "enlace maestro"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: update-alternatives.8:187
 #, fuzzy
-msgid "Change to I<group> or I<gid> when starting the process."
-msgstr "Cambia a I<grupo> o I<gid> cuando comienza el proceso."
+msgid ""
+"The link in a link group which determines how the other links in the group "
+"are configured."
+msgstr ""
+"El enlace del grupo de enlaces que determina cómo se configuran el resto de "
+"los enlaces del grupo."
 
 # type: TP
-#: start-stop-daemon.8:107
+#: update-alternatives.8:187
 #, fuzzy, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
-msgstr "B<-n>|B<--name> I<nombre-proceso>"
+msgid "slave link"
+msgstr "enlace esclavo"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: update-alternatives.8:191
 #, fuzzy
 msgid ""
-"Check for processes with the name I<process-name> (according to B</proc/"
-">I<pid>B</stat>)."
+"A link in a link group which is controlled by the setting of the master link."
 msgstr ""
-"Comprueba los procesos con el nombre I<nombre-proceso> (según B</proc/"
-">I<pid>B</stat>)."
+"Un enlace del grupo de enlaces controlado por el enlace maestro del grupo."
 
 # type: TP
-#: start-stop-daemon.8:113
+#: update-alternatives.8:191
 #, fuzzy, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
-msgstr "B<-s>|B<--signal> I<señal>"
+msgid "automatic mode"
+msgstr "modo automático Cuando un grupo de enlaces se encuentra en modo automático, el"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: update-alternatives.8:197
 #, fuzzy
 msgid ""
-"With B<--stop>, specifies the signal to send to processes being stopped "
-"(default 15)."
+"When a link group is in automatic mode, the alternatives system ensures that "
+"the links in the group point to the highest priority alternative appropriate "
+"for the group."
 msgstr ""
-"Junto con B<--stop>, especifica la señal enviada al proceso que se desea "
-"parar (15 por omisión)."
+"sistema de alternativas asegura que los enlaces del grupo apuntan a la "
+"alternativa con mayor prioridad para ese grupo."
 
 # type: TP
-#: start-stop-daemon.8:118
+#: update-alternatives.8:197
 #, fuzzy, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
-msgstr "B<-R>|B<--retry> I<tiempo-de-espera>|I<acción-programada>"
+msgid "manual mode"
+msgstr "modo manual"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: update-alternatives.8:202
 #, fuzzy
 msgid ""
-"With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
-"process(es)  do finish. It will check repeatedly whether any matching "
-"processes are running, until none are. If the processes do not exit it will "
-"then take further action as determined by the schedule."
+"When a link group is in manual mode, the alternatives system will not make "
+"any changes to the system administrator's settings."
 msgstr ""
-"Junto con B<--stop>, especifica que B<start-stop-daemon> compruebe que el "
-"proceso o los procesos han terminado.  Lo comprobará repetidas veces hasta "
-"que no haya ningún proceso que coincida. Si el proceso no termina tomará una "
-"decisión determinada por I<acción-programada .>"
+"Cuando un grupo de enlaces se encuentra en modo manual, el sistema de "
+"alternativas no hará ningún cambio en la configuración del administrador."
+
+# type: TP
+#: update-alternatives.8:204
+#, fuzzy, no-wrap
+msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
+msgstr "B<--install> I<gen enlace alt pri> [B<--slave> I<sgen senlace salt>] ..."
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: update-alternatives.8:219
 #, fuzzy
 msgid ""
-"If I<timeout> is specified instead of I<schedule> then the schedule "
-"I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
-"signal specified with B<--signal>."
+"Add a group of alternatives to the system.  I<genname> is the generic name "
+"for the master link, I<symlink> is the name of its symlink in the "
+"alternatives directory, and I<altern> is the alternative being introduced "
+"for the master link.  The arguments after B<--slave> are the generic name, "
+"symlink name in the alternatives directory and the alternative for a slave "
+"link.  Zero or more B<--slave> options, each followed by three arguments, "
+"may be specified."
 msgstr ""
-"Si se especifica I<tiempo-de-espera> en vez de I<acción-programada> entonces "
-"se usa la secuencia I<señal>B</>I<tiempo-de-espera>B</KILL/>I<tiempo-de-"
-"espera> , donde I<señal> es la señal especificada por B<--signal>."
+"Añade un grupo de alternativas al sistema.  I<gen> es el nombre genérico del "
+"enlace maestro, I<enlace> es el nombre del enlace simbólico en el directorio "
+"de alternativas, y I<alt> es la la alternativa que se va a introducir para "
+"el enlace maestro.  I<sgen>, I<senlace> y I<salt> son el nombre genérico, el "
+"enlace simbólico en el directorio de alternativas y la alternativa para el "
+"enlace esclavo.  Pueden especificarse cero o más opciones del tipo B<--"
+"slave> seguidas de sus argumentos."
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: update-alternatives.8:230
 #, fuzzy
 msgid ""
-"I<schedule> is a list of at least two items separated by slashes (B</>); "
-"each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
-"to send that signal, or I<timeout>, which means to wait that many seconds "
-"for processes to exit, or B<forever>, which means to repeat the rest of the "
-"schedule forever if necessary."
+"If the master symlink specified exists already in the alternatives system's "
+"records, the information supplied will be added as a new set of alternatives "
+"for the group.  Otherwise, a new group, set to automatic mode, will be added "
+"with this information.  If the group is in automatic mode, and the newly "
+"added alternatives' priority is higher than any other installed alternatives "
+"for this group, the symlinks will be updated to point to the newly added "
+"alternatives."
 msgstr ""
-"I<acción-programada> es una lista de al menos dos artículos separados por "
-"barras (B</>); cada artículo puede ser un B<->I<número>B<de>I<señal> o [B<->]"
-"I<nombre de señal>, que significa que se debe mandar esa señal, o I<tiempo-"
-"de-espera,> que significa que se debe esperar esos segundos para que el "
-"programa termine, o B<forever>, que significa que se repite el resto de "
-"acción-programada para siempre si es necesario."
+"Si el enlace simbólico maestro especificado ya existe en los registros del "
+"sistema de alternativas, la información suministrada se añadirá como un "
+"nuevo conjunto de alternativas para el grupo.  En caso contrario se creará "
+"un grupo nuevo, en modo automático, al que se le añadirá la información "
+"suministrada.  Si el grupo está en modo automático, y la prioridad nueva "
+"añadida es mayor que cualquier otra alternativa instalada para ese grupo, "
+"los enlaces se actualizarán para apuntar a las nuevas alternativas."
+
+# type: TP
+#: update-alternatives.8:230
+#, fuzzy, no-wrap
+msgid "B<--set> I<name path>"
+msgstr "B<--set> I<nombre camino>"
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: update-alternatives.8:239
 #, fuzzy
 msgid ""
-"If the end of the schedule is reached and B<forever> is not specified, then "
-"B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
-"then any signal specified with B<--signal> is ignored."
+"Set the program I<path> as alternative for I<name.> This is equivalent to "
+"I<--config> but is non-interactive and thus scriptable."
 msgstr ""
-"Si se alcanza el final de la acción-programada y no se ha especificado "
-"B<forever> , entonces B<start-stop-daemon> termina con un estado de error "
-"2.  Si se especifica una secuencia, entonces cualquier señal especificada "
-"con B<--signal> no se tendrá en cuenta."
+"Establece el programa I<camino> como alternativa para I<nombre.> Es "
+"equivalente a I<--config> pero de forma no interactiva, de modo que permite "
+"su inclusión en scripts."
 
 # type: TP
-#: start-stop-daemon.8:165
+#: update-alternatives.8:239
 #, fuzzy, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
-msgstr "B<-a>|B<--startas> I<pathname>"
+msgid "B<--remove> I<name path>"
+msgstr "B<--remove> I<nombre camino>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: update-alternatives.8:259
 #, fuzzy
 msgid ""
-"With B<--start>, start the process specified by I<pathname>.  If not "
-"specified, defaults to the argument given to B<--exec>."
+"Remove an alternative and all of its associated slave links.  I<name> is a "
+"name in the alternatives directory, and I<path> is an absolute filename to "
+"which I<name> could be linked. If I<name> is indeed linked to I<path>, "
+"I<name> will be updated to point to another appropriate alternative, or "
+"removed if there is no such alternative left.  Associated slave links will "
+"be updated or removed, correspondingly.  If the link is not currently "
+"pointing to I<path>, no links are changed; only the information about the "
+"alternative is removed."
 msgstr ""
-"Con B<--start>, comienza el proceso especificado por I<pathname>.  Si no se "
-"especifica, se usarán los argumentos dados con B<--exec>."
+"Borra una alternativa y todos sus enlaces esclavos asociados.  I<nombre> es "
+"el nombre en el directorio de alternativas, y I<camino> es el nombre "
+"absoluto del fichero al que se podría enlazar I<nombre .> Si I<nombre> está "
+"en realidad enlazado a I<camino>, I<nombre> se actualizará para que apunte a "
+"otra alternativa apropiada, o será eliminado si no queda ninguna alternativa "
+"restante.  Los enlaces esclavos asociados serán actualizados o eliminados "
+"correspondientemente.  Si el enlace está apuntando en ese momento a "
+"I<camino>, no se cambia ningún enlace, sólo se elimina la información acerca "
+"de la alternativa."
 
 # type: TP
-#: start-stop-daemon.8:173
-#, fuzzy, no-wrap
-msgid "B<-t>|B<--test>"
-msgstr "B<-t>|B<--test>"
+#: update-alternatives.8:259
+#, no-wrap
+msgid "B<--remove-all> I<name>"
+msgstr "B<--remove-all> I<nombre>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: update-alternatives.8:264
 #, fuzzy
 msgid ""
-"Print actions that would be taken and set appropriate return value, but take "
-"no action."
+"Remove all alternatives and all of their associated slave links.  I<name> is "
+"a name in the alternatives directory."
 msgstr ""
-"Muestra las acciones que se realizarían y devuelve el valor apropiado, pero "
-"no hace nada."
+"Elimina todas las alternativas y todos sus enlaces esclavos asociados.  "
+"I<nombre> es un nombre en el directorio de alternativas."
 
 # type: TP
-#: start-stop-daemon.8:177
-#, fuzzy, no-wrap
-msgid "B<-o>|B<--oknodo>"
-msgstr "B<-o>|B<--oknodo>"
+#: update-alternatives.8:264
+#, no-wrap
+msgid "B<--all>"
+msgstr "B<--all>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: update-alternatives.8:267
 #, fuzzy
-msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
-msgstr ""
-"Devuelve un estado 0 en vez de 1 si no se realiza (realizasen)  ninguna "
-"acción."
+msgid "Call B<--config> on all alternatives."
+msgstr "Llama a B<--config> sobre todas las alternativas."
 
 # type: TP
-#: start-stop-daemon.8:180
+#: update-alternatives.8:267
 #, fuzzy, no-wrap
-msgid "B<-q>|B<--quiet>"
-msgstr "B<-q>|B<--quiet>"
+msgid "B<--auto> I<link>"
+msgstr "B<--auto> I<enlace>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: update-alternatives.8:274
 #, fuzzy
-msgid "Do not print informational messages; only display error messages."
-msgstr "No muestra mensajes informativos, sólo muestra mensajes de error."
+msgid ""
+"Switch the master symlink I<link> to automatic mode.  In the process, this "
+"symlink and its slaves are updated to point to the highest priority "
+"installed alternatives."
+msgstr ""
+"Cambia el enlace simbólico maestro I<enlace> a modo automático.  En el "
+"proceso, este enlace simbólico y sus esclavos serán actualizados para "
+"apuntar a la alternativa instalada con una prioridad mayor."
 
 # type: TP
-#: start-stop-daemon.8:183
+#: update-alternatives.8:274
 #, fuzzy, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
-msgstr "B<-c>|B<--chuid> I<nombre-usuario>|I<uid>"
+msgid "B<--display> I<link>"
+msgstr "B<--display> I<enlace>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: update-alternatives.8:285
 #, fuzzy
 msgid ""
-"Change to this username/uid before starting the process. You can also "
-"specify a group by appending a B<:>, then the group or gid in the same way "
-"as you would for the `chown' command (I<user>B<:>I<group>).  When using this "
-"option you must realize that the primary and supplemental groups are set as "
-"well, even if the B<--group> option is not specified. The B<--group> option "
-"is only for groups that the user isn't normally a member of (like adding per "
-"process group membership for generic users like B<nobody>)."
+"Display information about the link group of which I<link> is the master "
+"link.  Information displayed includes the group's mode (auto or manual), "
+"which alternative the symlink currently points to, what other alternatives "
+"are available (and their corresponding slave alternatives), and the highest "
+"priority alternative currently installed."
 msgstr ""
-"Cambia a este usuario/uid antes de empezar el proceso. Además puede "
-"especificar el grupo añadiendo B<:>, luego el grupo o el gid del mismo modo "
-"que haría con la orden `chown' (I<usuario>B<:>I<grupo>).  Debe de darse "
-"cuenta que cuando se usa esta opción el grupo primario y complementario se "
-"cambian también, incluso si no se especifica B<--group .> La opción B<--"
-"group> es sólo para grupos de los que el usuario no es miembro (como el "
-"grupo nobody )."
+"Muestra información acerca del grupo de enlaces del cual I<enlace> es el "
+"enlace maestro.  La información mostrada incluye el modo del grupo "
+"(automático o manual), a que alternativa apunta el enlace simbólico, otras "
+"alternativas disponibles (y sus alternativas esclavas correspondientes), y "
+"la prioridad más alta instalada actualmente."
 
 # type: TP
-#: start-stop-daemon.8:200
+#: update-alternatives.8:285
 #, fuzzy, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
-msgstr "B<-r>|B<--chroot> I<directorio-raíz>"
+msgid "B<--list> I<link>"
+msgstr "B<--list> I<enlace>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: update-alternatives.8:288
 #, fuzzy
-msgid ""
-"Chdir and chroot to I<root> before starting the process. Please note that "
-"the pidfile is also written after the chroot."
-msgstr ""
-"Efectua chdir y chroot a I<directorio-raíz> antes de empezar el proceso. "
-"Dese cuenta que el fichero del pid también es escrito después de hacer el "
-"chroot."
+msgid "Display all targets of the link group."
+msgstr "Muestra todos objetivos de un grupo de enlaces."
 
 # type: TP
-#: start-stop-daemon.8:206
+#: update-alternatives.8:288
 #, fuzzy, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
-msgstr "B<-d>|B<--chdir> I<directorio>"
+msgid "B<--config> I<link>"
+msgstr "B<--config> I<enlace>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: update-alternatives.8:295
 #, fuzzy
 msgid ""
-"Chdir to I<path> before starting the process. This is done after the chroot "
-"if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
-"daemon will chdir to the root directory before starting the process."
+"Show available alternatives for a link group and allow the user to "
+"interactively select which one to use. The link group is updated and taken "
+"out of I<auto> mode."
 msgstr ""
-"Efectua chdir a I<directorio> antes de empezar el proceso. Esto se hace "
-"después de efectuar chroot, si es que la opción B<-r>|B<--chroot> está "
-"establecida. Si no se especifica, start-stop-daemon ejecutará un chdir al "
-"directorio raíz antes de empezar el proceso."
+"Muestra las alternativas disponibles para un grupo de enlaces y permite a un "
+"usuario seleccionar interactivamente cual usar. El grupo de enlaces se "
+"actualiza y se deshabilita el modo I<auto> en él."
 
 # type: TP
-#: start-stop-daemon.8:214
+#: update-alternatives.8:303
 #, fuzzy, no-wrap
-msgid "B<-b>|B<--background>"
-msgstr "B<-b>|B<--background>"
+msgid "B<--altdir>I< directory>"
+msgstr "B<--altdir> I<directorio>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: update-alternatives.8:307
 #, fuzzy
 msgid ""
-"Typically used with programs that don't detach on their own. This option "
-"will force B<start-stop-daemon> to fork before starting the process, and "
-"force it into the background.  B<WARNING: start-stop-daemon> cannot check "
-"the exit status if the process fails to execute for B<any> reason. This is a "
-"last resort, and is only meant for programs that either make no sense "
-"forking on their own, or where it's not feasible to add the code for them to "
-"do this themself."
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
 msgstr ""
-"Usado típicamente con programas que no se separan por sí mismos. Esta opción "
-"forzará B<start-stop-daemon> a hacer fork antes de empezar el proceso, y "
-"luego dejarlo en segundo plano.  B<ATENCIÓN: start-stop-daemon> no puede "
-"comprobar el estado de salida si el proceso no puede ejecutarse por "
-"B<cualquier> razón. Esto se hace como último recurso, y sólo tiene sentido "
-"usarla en programas donde no tiene sentido que hagan fork por sí mismos, o "
-"no es factible añadir el código para que lo hagan por sí mismos."
-
-# type: TP
-#: start-stop-daemon.8:226
-#, fuzzy, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
-msgstr "B<-N>|B<--nicelevel> I<entero>"
+"Especifica el directorio de alternativas cuando va a ser diferente del "
+"directorio por omisión."
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: update-alternatives.8:311
 #, fuzzy
-msgid "This alters the priority of the process before starting it."
-msgstr "Altera la prioridad del proceso antes de empezarlo."
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+"Especifica el directorio administrativo cuando va a ser diferente del "
+"directorio por omisión."
 
 # type: TP
-#: start-stop-daemon.8:229
-#, fuzzy, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
-msgstr "B<-s>|B<--signal> I<señal>"
+#: update-alternatives.8:311
+#, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: update-alternatives.8:316
 #, fuzzy
-msgid "This sets the umask of the process before starting it."
-msgstr "Altera la prioridad del proceso antes de empezarlo."
-
-# type: TP
-#: start-stop-daemon.8:232
-#, fuzzy, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
-msgstr "B<-m>|B<--make-pidfile>"
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+"Genera una salida con más información acerca de lo que B<update-"
+"alternatives> está haciendo."
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: update-alternatives.8:320
 #, fuzzy
 msgid ""
-"Used when starting a program that does not create its own pid file. This "
-"option will make B<start-stop-daemon> create the file referenced with B<--"
-"pidfile> and place the pid into it just before executing the process. Note, "
-"the file will not be removed when stopping the program.  B<NOTE:> This "
-"feature may not work in all cases. Most notably when the program being "
-"executed forks from its main process. Because of this it is usually only "
-"useful when combined with the B<--background> option."
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
 msgstr ""
-"Se usa cuando se quiere comenzar un programa que no crea su propio fichero "
-"de pid. Esta opción hace que B<start-stop-daemon> cree el fichero referido "
-"con B<--pidfile> y coloque el pid dentro de él justo antes de ejecutar el "
-"proceso. Dese cuenta que no se borrará cuando termine el programa.  B<NOTA:> "
-"Esta característica no funciona en todos los casos. Más notablemente cuando "
-"el programa que se ejecuta hace fork en su proceso principal.  Por esto "
-"solamente es útil cuando se combina con la opción B<--background .>"
-
-# type: TP
-#: start-stop-daemon.8:247
-#, fuzzy, no-wrap
-msgid "B<-v>|B<--verbose>"
-msgstr "B<-v>|B<--verbose>"
+"No genera ningún comentario a menos que ocurra algún error.  Esta opción "
+"todavía no esta implementada."
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: update-alternatives.8:324
 #, fuzzy
-msgid "Print verbose informational messages."
-msgstr "Muestra mensajes informativos detallados."
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+"No hace nada realmente, sólo mostrar lo que hubiese hecho.  Esta opción "
+"todavía no esta implementada."
 
 # type: TP
-#: start-stop-daemon.8:250
-#, fuzzy, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
+#: update-alternatives.8:326
+#, no-wrap
+msgid "I</etc/alternatives/>"
+msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: start-stop-daemon.8:253
+#: update-alternatives.8:332
 #, fuzzy
-msgid "Print help information; then exit."
-msgstr "Muestra la ayuda y luego termina."
+msgid ""
+"The default alternatives directory.  Can be overridden by the B<--altdir> "
+"option."
+msgstr ""
+"El directorio de alternativas por omisión.  Puede ser cambiado con la opción "
+"B<--altdir .>"
 
 # type: TP
-#: start-stop-daemon.8:253
-#, fuzzy, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-#, fuzzy
-msgid "Print version information; then exit."
-msgstr "Muestra la versión y luego termina."
+#: update-alternatives.8:332
+#, no-wrap
+msgid "I</var/lib/dpkg/alternatives/>"
+msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: start-stop-daemon.8:260
+#: update-alternatives.8:338
 #, fuzzy
 msgid ""
-"Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
-"previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
+"The default administration directory.  Can be overridden by the B<--"
+"admindir> option."
 msgstr ""
-"Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> basada en "
-"una versión previa de Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
+"El directorio de administración por omisión.  Puede ser modificado con la "
+"opción B<--admindir .>"
 
-# type: Plain text
-#: start-stop-daemon.8:262
-#, fuzzy
-msgid ""
-"Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
-"Ian Jackson."
-msgstr ""
-"Página del manual de Klee Dienes E<lt>klee@mit.eduE<gt>, reformada "
-"parcialmente por Ian Jackson."
+# type: IP
+#: update-alternatives.8:340
+#, no-wrap
+msgid "0"
+msgstr "0"
 
 # type: Plain text
-#: update-alternatives.8:8
-#, no-wrap
-msgid "update-alternatives"
-msgstr "update-alternatives"
+#: update-alternatives.8:342
+#, fuzzy
+msgid "The requested action was successfully performed."
+msgstr "La acción requerida fue realizada con éxito."
 
-# type: TH
-#: update-alternatives.8:8
+# type: IP
+#: update-alternatives.8:342
 #, no-wrap
-msgid "2006-11-24"
-msgstr ""
+msgid "2"
+msgstr "2"
 
 # type: Plain text
-#: update-alternatives.8:11
+#: update-alternatives.8:345
 #, fuzzy
 msgid ""
-"update-alternatives - maintain symbolic links determining default commands"
+"Problems were encountered whilst parsing the command line or performing the "
+"action."
 msgstr ""
-"update-alternatives - mantiene enlaces simbólicos que determinan órdenes "
-"predeterminadas."
+"Se encontraron problemas interpretando la línea de órdenes o realizando la "
+"acción requerida."
 
 # type: Plain text
-#: update-alternatives.8:20
+#: update-alternatives.8:355
 #, fuzzy
 msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
+"B<update-alternatives> chatters incessantly about its activities on its "
+"standard output channel.  If problems occur, B<update-alternatives> outputs "
+"error messages on its standard error channel and returns an exit status of "
+"2.  These diagnostics should be self-explanatory; if you do not find them "
+"so, please report this as a bug."
 msgstr ""
-"B<update-alternatives> [I<opciones>] B<--install> I<enlace nombre camino "
-"prioridad> [B<--slave> I<enlace nombre> I<camino>]..."
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr "B<update-alternatives> [I<opciones>] B<--remove> I<nombre camino>"
+"B<update-alternatives> informa innecesariamente acerca de sus actividades en "
+"la salida estándar.  Si ocurre algún problema B<update-alternatives> "
+"canaliza los mensajes de error a la salida de errores estándar y devuelve un "
+"estado de salida de 2.  Los diagnósticos deberían ser auto-explicativos, si "
+"a usted no se lo parecen, por favor, avise de esto como un fallo."
 
 # type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr "B<update-alternatives> [I<opciones>] B<--remove-all> I<nombre>"
+#: update-alternatives.8:361
+#, fuzzy
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+"Hay varios paquetes que proporcionan un editor de texto compatible con "
+"B<vi>, por ejemplo B<nvi>y B<vim>.  Cual se usa es controlado por el grupo "
+"de enlaces B<vi>, que incluye enlaces para el programa y la página del "
+"manual asociada."
 
 # type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
-msgstr "B<update-alternatives> [I<opciones>] B<--all>"
+#: update-alternatives.8:364
+#, fuzzy
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+"Para mostrar los paquetes disponibles que proporcionen B<vi> y su actual "
+"configuración, use opción I<--display:>"
 
 # type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr "B<update-alternatives> [I<opciones>] B<--auto> I<nombre>"
+#: update-alternatives.8:367
+#, fuzzy
+msgid "B<update-alternatives --display vi>"
+msgstr "update-alternatives --display vi"
 
 # type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr "B<update-alternatives> [I<opciones>] B<--display> I<nombre>"
+#: update-alternatives.8:371
+#, fuzzy
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+"Para elegir una implementación de B<vi> en particular, use la siguiente "
+"orden como superusuario y luego seleccione un número de la lista:"
 
 # type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr "B<update-alternatives> [I<opciones>] B<--list> I<nombre>"
+#: update-alternatives.8:374
+#, fuzzy
+msgid "B<update-alternatives --config vi>"
+msgstr "update-alternatives --config vi"
 
 # type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr "B<update-alternatives> [I<opciones>] B<--config> I<nombre>"
+#: update-alternatives.8:378
+#, fuzzy
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+"Para que la implementación de B<vi> se vuelva a elegir de forma automática, "
+"como superusuario haga:"
 
 # type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr "B<update-alternatives> [I<opciones>] B<--set> I<nombre camino>"
+#: update-alternatives.8:381
+#, fuzzy
+msgid "B<update-alternatives --auto vi>"
+msgstr "update-alternatives --auto vi"
 
 # type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:386
 #, fuzzy
 msgid ""
-"B<update-alternatives> creates, removes, maintains and displays information "
-"about the symbolic links comprising the Debian alternatives system."
+"If you find a bug, please report it using the Debian bug-tracking system, "
+"or, if that is not possible, email the author directly."
 msgstr ""
-"B<update-alternatives> crea, destruye, mantiene y muestra información acerca "
-"de los enlaces simbólicos que conforman el sistema de alternativas de Debian."
+"Si encuentra algún fallo, por favor, avise usando el sistema de seguimiento "
+"de fallos de Debian, o, si esto no es posible, mande un email directamente "
+"al autor."
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:391
 #, fuzzy
 msgid ""
-"It is possible for several programs fulfilling the same or similar functions "
-"to be installed on a single system at the same time.  For example, many "
-"systems have several text editors installed at once.  This gives choice to "
-"the users of a system, allowing each to use a different editor, if desired, "
-"but makes it difficult for a program to make a good choice for an editor to "
-"invoke if the user has not specified a particular preference."
+"If you find any discrepancy between the operation of B<update-alternatives> "
+"and this manual page, it is a bug, either in the implementation or the "
+"documentation; please report it."
 msgstr ""
-"Es posible que varios programas que realizan la misma función o una parecida "
-"estén instalados en el sistema al mismo tiempo. Por ejemplo, muchos sistemas "
-"tienen varios editores de texto instalados al mismo tiempo, esto deja la "
-"elección de que editor de texto usar en manos del usuario, si éste lo desea, "
-"pero hace difícil que un programa elija la opción correcta si el usuario no "
-"ha especificado ninguna preferencia."
+"Si encuentra alguna discrepancia entre el modo de operación de B<update-"
+"alternatives> y esta página del manual, es un fallo, bien en la "
+"implementación o bien en la documentación, por favor, avise."
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:396
 #, fuzzy
 msgid ""
-"Debian's alternatives system aims to solve this problem.  A generic name in "
-"the filesystem is shared by all files providing interchangeable "
-"functionality.  The alternatives system and the system administrator "
-"together determine which actual file is referenced by this generic name.  "
-"For example, if the text editors B<ed>(1)  and B<nvi>(1)  are both installed "
-"on the system, the alternatives system will cause the generic name I</usr/"
-"bin/editor> to refer to I</usr/bin/nvi> by default. The system administrator "
-"can override this and cause it to refer to I</usr/bin/ed> instead, and the "
-"alternatives system will not alter this setting until explicitly requested "
-"to do so."
+"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
+"software; see the GNU General Public Licence version 2 or later for copying "
+"conditions. There is NO warranty."
 msgstr ""
-"El objetivo del sistema de alternativas de Debian es resolver este "
-"problema.  Un nombre genérico en el sistema de ficheros se comparte entre "
-"todos los ficheros que tienen una funcionalidad intercambiable. El sistema "
-"de alternativas junto con el administrador del sistema determinan a qué "
-"fichero hace referencia este nombre genérico. Por ejemplo, si los editores "
-"de texto B<ed>(1)  y B<nvi>(1)  están instalados conjuntamente en el "
-"sistema, el sistema de alternativas hará que el nombre genérico I</usr/bin/"
-"editor> se refiera a I</usr/bin/nvi .> El administrador del sistema puede "
-"modificar esto y hacer que se prefiera I</usr/bin/ed> , el sistema de "
-"alternativas no modificará esto posteriormente hasta que se solicite "
-"explícitamente."
+"Update-alternatives de Debian es copyright 1995 de Ian Jackson. Es un "
+"programa libre, vea la licencia GPL de GNU versión 2 o posterior para las "
+"condiciones de copia. NO hay ninguna garantía."
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:400
 #, fuzzy
 msgid ""
-"The generic name is not a direct symbolic link to the selected alternative.  "
-"Instead, it is a symbolic link to a name in the I<alternatives> "
-"I<directory>, which in turn is a symbolic link to the actual file "
-"referenced.  This is done so that the system administrator's changes can be "
-"confined within the I</etc> directory: the FHS (q.v.) gives reasons why this "
-"is a Good Thing."
+"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
+"documentation; see the GNU General Public Licence version 2 or later for "
+"copying conditions. There is NO WARRANTY."
 msgstr ""
-"El nombre genérico no es un enlace directo a la alternativa seleccionada. En "
-"vez de esto, es un enlace simbólico a un nombre en el I<directorio> I<de> "
-"I<alternativas> , que a su vez en un enlace simbólico al fichero al que se "
-"quiere hacer referencia.  Esto se hace de este modo para que los cambios del "
-"administrador se mantengan dentro del directorio I</etc> : el FHS (q.v.) da "
-"razones de por qué esto es bueno."
+"Esta página del manual es copyright 1997/98 de Charles Briscoe-Smith.  Es "
+"documentación libre, vea la licencia GPL de GNU versión 2 o posterior para "
+"las condiciones de copia.  NO hay ninguna garantía."
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:402
 #, fuzzy
 msgid ""
-"When each package providing a file with a particular functionality is "
-"installed, changed or removed, B<update-alternatives> is called to update "
-"information about that file in the alternatives system.  B<update-"
-"alternatives> is usually called from the B<postinst> or B<prerm> scripts in "
-"Debian packages."
+"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
+"system."
 msgstr ""
-"Cuando se instala o desinstala un paquete que provee un fichero con una "
-"funcionalidad en particular, se llama a B<update-alternatives> para "
-"actualizar la información del sistema de alternativas acerca de ese "
-"fichero.  B<update-alternatives> se llama normalmente desde los scripts "
-"B<postinst> o B<prerm> de los paquetes de Debian."
+"Puede encontrar la licencia GPL de GNU en /usr/share/common-licenses/GPL en "
+"cualquier sistema Debian."
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:405
 #, fuzzy
-msgid ""
-"It is often useful for a number of alternatives to be synchronised, so that "
-"they are changed as a group; for example, when several versions of the B<vi>"
-"(1)  editor are installed, the man page referenced by I</usr/share/man/man1/"
-"vi.1> should correspond to the executable referenced by I</usr/bin/vi>.  "
-"B<update-alternatives> handles this by means of I<master> and I<slave> "
-"links; when the master is changed, any associated slaves are changed too.  A "
-"master link and its associated slaves make up a I<link> I<group>."
-msgstr ""
-"Normalmente es útil para un número de alternativas que estas sean "
-"sincronizadas de tal modo que puedan cambiarse como un grupo. Por ejemplo, "
-"cuando varias versiones del editor B<vi>(1)  están instaladas, la página del "
-"manual preferida por I</usr/share/man/man1/vi.1> debe de corresponder con el "
-"ejecutable al que hace referencia I</usr/bin/vi>.  B<update-alternatives> "
-"maneja esto en términos de enlaces I<maestro> y I<esclavo> , cuando se "
-"cambia el maestro, todos los esclavos relacionados con él también se "
-"cambian.  Un enlace maestro y sus esclavos relacionados forman un I<grupo> "
-"de I<enlaces .>"
+msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
+msgstr "B<ln>(1), FHS, el estándar sobre la jerarquía del sistema de ficheros."
 
 # type: Plain text
-#: update-alternatives.8:143
 #, fuzzy
-msgid ""
-"Each link group is, at any given time, in one of two modes: automatic or "
-"manual.  When a group is in automatic mode, the alternatives system will "
-"automatically decide, as packages are installed and removed, whether and how "
-"to update the links.  In manual mode, the alternatives system will not "
-"change the links; it will leave all the decisions to the system "
-"administrator."
-msgstr ""
-"Cada grupo de enlaces está en cualquier momento en uno de los dos modos "
-"posibles: automático o manual.  Cuando un grupo está en modo automático, el "
-"sistema de alternativas decide automáticamente a medida que se instalan o "
-"desinstalan paquetes cuándo se deben de actualizar los enlaces.  En modo "
-"manual el sistema de alternativas deja todas estas decisiones en manos del "
-"administrador del sistema."
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
 
 # type: Plain text
-#: update-alternatives.8:152
 #, fuzzy
-msgid ""
-"Link groups are in automatic mode when they are first introduced to the "
-"system.  If the system administrator makes changes to the system's automatic "
-"settings, this will be noticed the next time B<update-alternatives> is run "
-"on the changed link's group, and the group will automatically be switched to "
-"manual mode."
-msgstr ""
-"Los grupos de enlaces se establecen en modo automático la primera vez que "
-"entran en el sistema.  Si el administrador del sistema hace cambios en la "
-"configuración automática del sistema, B<update-alternatives> se dará cuenta "
-"la próxima vez que se ejecute sobre el grupo de enlaces cambiados, y el "
-"grupo será cambiado automáticamente a modo manual."
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "sección 5.2.14,"
 
 # type: Plain text
-#: update-alternatives.8:159
 #, fuzzy
-msgid ""
-"Each alternative has a I<priority> associated with it.  When a link group is "
-"in automatic mode, the alternatives pointed to by members of the group will "
-"be those which have the highest priority."
-msgstr ""
-"Cada alternativa tiene una I<prioridad> asociada.  Cuando un grupo de "
-"enlaces se encuentra en modo automático, la alternativa a la que apuntan los "
-"miembros del grupo será la que tenga una prioridad más alta."
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)."
 
 # type: Plain text
-#: update-alternatives.8:175
 #, fuzzy
-msgid ""
-"When using the I<--config> option, B<update-alternatives> will list all of "
-"the choices for the link group of which given I<name> is the master link. "
-"The current choice is marked with a '*' and the choice with the highest "
-"priority with a '+'.  You will then be prompted for your choice regarding "
-"this link group.  Once you make a change, the link group will no longer be "
-"in I<auto> mode. You will need to use the I<--auto> option in order to "
-"return to the automatic mode."
-msgstr ""
-"Cuando se use la opción I<--config> , B<update-alternatives> mostrará todas "
-"las posibilidades para el grupo de enlaces que tienen como maestro a "
-"I<nombre .> Entonces se elegirá una de las opciones posibles del grupo de "
-"enlaces.  Una vez que se haga algún cambio, el grupo de enlaces dejará de "
-"estar en modo I<automático .> Será necesario usar la opción I<--auto> para "
-"volver el grupo de enlaces al estado automático."
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> y este manual fueron escritos por Ian Jackson. Por la "
+#~ "presente, fueron puestos en el dominio público por él."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>dirnameE<gt>>]"
+#~ msgstr ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>directorioE<gt>>]"
 
 # type: Plain text
-#: update-alternatives.8:179
 #, fuzzy
-msgid ""
-"If you want to configure non-interactively you can use the I<--set> option "
-"instead (see below)."
-msgstr ""
-"Si quiere realizar la configuración de un modo no interactivo puede usar la "
-"opción I<--set> en su lugar (vea más abajo)."
+#~ msgid "Output the help screen and exit successfully."
+#~ msgstr "Muestra la pantalla de ayuda y finaliza correctamente."
 
 # type: Plain text
-#: update-alternatives.8:190
-msgid ""
-"Different packages providing the same file need to do so B<cooperatively>.  "
-"That is - the usage of B<update-alternatives> is B<mandatory> for all "
-"involved packages in such case - it is not possible to override some file in "
-"a package that does not employ the B<update-alternatives> mechanism."
-msgstr ""
+#, fuzzy
+#~ msgid "Output version and exit successfully."
+#~ msgstr "Muestra la versión y finaliza correctamente."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archivo directorio>"
 
 # type: SH
-#: update-alternatives.8:191
-#, fuzzy, no-wrap
-msgid "TERMINOLOGY"
-msgstr "TERMINOLOGÍA"
+#, fuzzy
+#~ msgid "ACTION OPTIONS"
+#~ msgstr ""
+#~ "#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "OPCIONES DE ACCIÓN\n"
+#~ "#-#-#-#-#  es.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "OPCIONES DE USO"
+
+# type: TP
+#~ msgid "B<--build>, B<-b>"
+#~ msgstr "B<--build>, B<-b>"
 
 # type: Plain text
-#: update-alternatives.8:196
 #, fuzzy
-msgid ""
-"Since the activities of B<update-alternatives> are quite involved, some "
-"specific terms will help to explain its operation."
-msgstr ""
-"Debido a que las actividades que realiza B<update-alternatives> están "
-"fuertemente relacionadas entre sí, la definición de algunos términos "
-"específicos ayudará a entender su funcionamiento."
+#~ msgid ""
+#~ "You can specify the compression level used by adding a B<-z#> option.  "
+#~ "B<dpkg-deb> will pass that option on to gzip."
+#~ msgstr ""
+#~ "Usted puede especificar el nivel de compresión usado con la opción B<-z#."
+#~ "> B<dpkg-deb> pasará ésta a gzip."
 
 # type: TP
-#: update-alternatives.8:196
-#, fuzzy, no-wrap
-msgid "generic name"
-msgstr "nombre genérico"
+#, fuzzy
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--info>, B<-I>"
 
-# type: Plain text
-#: update-alternatives.8:202
+# type: TP
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--field>, B<-f>"
+
+# type: TP
+#~ msgid "B<--contents>, B<-c>"
+#~ msgstr "B<--contents>, B<-c>"
+
+# type: TP
+#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+
+# type: TP
 #, fuzzy
-msgid ""
-"A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
-"to one of a number of files of similar function."
-msgstr ""
-"Un nombre, como I</usr/bin/editor>, que mediante el sistema de alternativas "
-"hace referencia a uno de los posibles ficheros con una función similar."
+#~ msgid "B<--fsys-tarfile>"
+#~ msgstr "B<--fsys-archivotar>"
 
 # type: TP
-#: update-alternatives.8:202
-#, fuzzy, no-wrap
-msgid "symlink"
-msgstr "enlace"
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "B<--control>, B<-e>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Muestra la información de cómo usar B<dpkg-deb>'s , con un resumen de sus "
+#~ "opciones y usos."
 
 # type: Plain text
-#: update-alternatives.8:207
 #, fuzzy
-msgid ""
-"Without any further qualification, this means a symbolic link in the "
-"alternatives directory: one which the system administrator is expected to "
-"adjust."
-msgstr ""
-"Sólo es un enlace simbólico en el directorio de alternativas, no tiene "
-"ningún significado especial. Puede ser ajustado por el administrador."
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Muestra el numero de versión de B<dpkg-deb>'s"
 
 # type: TP
-#: update-alternatives.8:207
-#, fuzzy, no-wrap
-msgid "alternative"
-msgstr "alternativa"
+#, fuzzy
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
 
 # type: Plain text
-#: update-alternatives.8:211
 #, fuzzy
-msgid ""
-"The name of a specific file in the filesystem, which may be made accessible "
-"via a generic name using the alternatives system."
-msgstr ""
-"El nombre específico de un fichero en el sistema de ficheros, que, puede ser "
-"accesible a través de un nombre genérico usando el sistema de alternativas."
+#~ msgid ""
+#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported)."
+#~ msgstr ""
+#~ "Muestra la información de licencia y garantía de B<dpkg-deb>'s (El uso de "
+#~ "la palabra americana B<--license> produce el mismo mensaje)"
+
+# type: SH
+#, fuzzy
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "OTRAS OPCIONES"
 
 # type: TP
-#: update-alternatives.8:211
-#, fuzzy, no-wrap
-msgid "alternatives directory"
-msgstr "directorio de alternativas"
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--debug>, B<-D>"
 
 # type: Plain text
-#: update-alternatives.8:216
 #, fuzzy
-msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
-msgstr ""
-"El directorio que contiene los enlaces, por omisión es I</etc/alternatives>."
+#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [opciones] --remove I<E<lt>ficheroE<gt>>"
 
-# type: TP
-#: update-alternatives.8:216
-#, fuzzy, no-wrap
-msgid "administrative directory"
-msgstr "directorio administrativo"
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#~ msgstr "B<dpkg-divert> [opciones] --list I<E<lt>patrón-globalE<gt>>"
 
 # type: Plain text
-#: update-alternatives.8:223
 #, fuzzy
-msgid ""
-"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
-"alternatives>' state information."
-msgstr ""
-"El directorio que contiene la información de estado de B<update-"
-"alternatives> por omisión es I</var/lib/dpkg/alternatives>."
+#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [opciones] --truename I<E<lt>ficheroE<gt>>"
 
-# type: TP
-#: update-alternatives.8:223
-#, fuzzy, no-wrap
-msgid "link group"
-msgstr "grupo de enlaces"
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-divert> is the utility used to set up and update the list of "
+#~ "diversions. It functions in three basic modes - adding, removing, and "
+#~ "listing diversions.  The options are B<--add>, B<--remove>, and B<--"
+#~ "list>, respectively. Additionally, it can print out the real name for a "
+#~ "diverted file with B<--truename>. Other options (listed below) may also "
+#~ "be specified."
+#~ msgstr ""
+#~ "B<dpkg-divert> es la herramienta usada para definir y actualizar la lista "
+#~ "de 'redirecciones'.  Funciona en tres modos básicos - añadir, eliminar y "
+#~ "listar redireciones.  Las opciones son --add, --remove, y --list, "
+#~ "respectivamente. Adicionalmente, puede imprimir el nombre real de un "
+#~ "archivo redirigido. Pueden especificarse otras opciones (listadas a "
+#~ "continuación)."
 
 # type: Plain text
-#: update-alternatives.8:226
 #, fuzzy
-msgid "A set of related symlinks, intended to be updated as a group."
-msgstr ""
-"Un conjunto de enlaces relacionados, que se pretende que sean actualizados "
-"como un grupo."
+#~ msgid "Output short usage instructions, and exit successfully."
+#~ msgstr ""
+#~ "Imprime la versión e instrucciones de uso breves, y finaliza normalmente."
 
-# type: TP
-#: update-alternatives.8:226
-#, fuzzy, no-wrap
-msgid "master link"
-msgstr "enlace maestro"
+# type: Plain text
+#, fuzzy
+#~ msgid "Output program name and version and exit successfully."
+#~ msgstr ""
+#~ "Imprime el nombre del programa y su versión, y finaliza correctamente."
 
 # type: Plain text
-#: update-alternatives.8:230
 #, fuzzy
-msgid ""
-"The link in a link group which determines how the other links in the group "
-"are configured."
-msgstr ""
-"El enlace del grupo de enlaces que determina cómo se configuran el resto de "
-"los enlaces del grupo."
+#~ msgid ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#~ msgstr ""
+#~ "B<dpkg-name> [-a|--no-architecture] [-o|--overwrite] [-s|--subdir "
+#~ "[directorio]] [-c|--create-dir] [-h|--help] [-v|--version] [-l|--license] "
+#~ "[-k|--symlink] [-[--] [archivos]"
 
 # type: TP
-#: update-alternatives.8:230
-#, fuzzy, no-wrap
-msgid "slave link"
-msgstr "enlace esclavo"
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<-h, --help>"
 
 # type: Plain text
-#: update-alternatives.8:234
 #, fuzzy
-msgid ""
-"A link in a link group which is controlled by the setting of the master link."
-msgstr ""
-"Un enlace del grupo de enlaces controlado por el enlace maestro del grupo."
-
-# type: TP
-#: update-alternatives.8:234
-#, fuzzy, no-wrap
-msgid "automatic mode"
-msgstr "modo automático Cuando un grupo de enlaces se encuentra en modo automático, el"
+#~ msgid "Print a usage message and exit successfully."
+#~ msgstr "Muestra las opciones de uso del programa y sale con éxito."
 
 # type: Plain text
-#: update-alternatives.8:240
 #, fuzzy
-msgid ""
-"When a link group is in automatic mode, the alternatives system ensures that "
-"the links in the group point to the highest priority alternative appropriate "
-"for the group."
-msgstr ""
-"sistema de alternativas asegura que los enlaces del grupo apuntan a la "
-"alternativa con mayor prioridad para ese grupo."
+#~ msgid ""
+#~ "Print copyright information and (a reference to GNU) license information "
+#~ "and exit successfully."
+#~ msgstr ""
+#~ "Muestra la información de copyright y una referencia a la licencia GNU."
 
 # type: TP
-#: update-alternatives.8:240
-#, fuzzy, no-wrap
-msgid "manual mode"
-msgstr "modo manual"
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
-# type: Plain text
-#: update-alternatives.8:245
+# type: TP
 #, fuzzy
-msgid ""
-"When a link group is in manual mode, the alternatives system will not make "
-"any changes to the system administrator's settings."
-msgstr ""
-"Cuando un grupo de enlaces se encuentra en modo manual, el sistema de "
-"alternativas no hará ningún cambio en la configuración del administrador."
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<patrón>...]"
 
 # type: Plain text
-#: update-alternatives.8:257
 #, fuzzy
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-"Hay varios paquetes que proporcionan un editor de texto compatible con "
-"B<vi>, por ejemplo B<nvi>y B<vim>.  Cual se usa es controlado por el grupo "
-"de enlaces B<vi>, que incluye enlaces para el programa y la página del "
-"manual asociada."
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
 
 # type: Plain text
-#: update-alternatives.8:263
 #, fuzzy
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-"Para mostrar los paquetes disponibles que proporcionen B<vi> y su actual "
-"configuración, use opción I<--display:>"
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquete paquete >...]"
 
-# type: Plain text
-#: update-alternatives.8:266
+# type: TP
 #, fuzzy
-msgid "update-alternatives --display vi"
-msgstr "update-alternatives --display vi"
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg -A> | B<--record-avail> I<fichero_paquete> ..."
 
-# type: Plain text
-#: update-alternatives.8:272
+# type: TP
 #, fuzzy
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-"Para elegir una implementación de B<vi> en particular, use la siguiente "
-"orden como superusuario y luego seleccione un número de la lista:"
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: update-alternatives.8:275
 #, fuzzy
-msgid "update-alternatives --config vi"
-msgstr "update-alternatives --config vi"
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Muestra la versión de B<dpkg>."
 
 # type: Plain text
-#: update-alternatives.8:280
 #, fuzzy
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-"Para que la implementación de B<vi> se vuelva a elegir de forma automática, "
-"como superusuario haga:"
+#~ msgid "Display version information."
+#~ msgstr "Muestra la versión de B<dpkg>."
 
 # type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr "update-alternatives --auto vi"
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
+#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#~ msgstr ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>arquitE<gt>> ] I<bindir> "
+#~ "I<fichero-override> [I<path_prefijo>] B<E<gt>> I<Packages>"
 
 # type: Plain text
-#: update-alternatives.8:290
 #, fuzzy
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-"Se debe de especificar exactamente una acción a realizar a B<update-"
-"alternatives> si se desea que realice algún trabajo significativo. Se puede "
-"especificar cualquier número de las opciones comunes junto con cualquier "
-"acción."
+#~ msgid ""
+#~ "When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for "
+#~ "all debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+#~ msgstr ""
+#~ "Cuando se especifica -aI<E<lt>arquitE<gt>>, en vez de buscar todo tipo de "
+#~ "debs, se usa un patrón basado en *_all.deb y *_arch.deb."
 
-# type: TP
-#: update-alternatives.8:291
-#, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--verbose>"
+# type: SH
+#, fuzzy
+#~ msgid "THE OVERRIDE FILE"
+#~ msgstr "EL FICHERO OVERRIDE"
 
 # type: Plain text
-#: update-alternatives.8:296
 #, fuzzy
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr ""
-"Genera una salida con más información acerca de lo que B<update-"
-"alternatives> está haciendo."
+#~ msgid ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source "
+#~ "package tools"
+#~ msgstr ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Herramientas para "
+#~ "los paquetes fuente de Debian."
 
-# type: Plain text
-#: update-alternatives.8:300
+# type: SH
 #, fuzzy
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-"No genera ningún comentario a menos que ocurra algún error.  Esta opción "
-"todavía no esta implementada."
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "OPCIONES COMUNES"
 
 # type: Plain text
-#: update-alternatives.8:304
 #, fuzzy
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-"No hace nada realmente, sólo mostrar lo que hubiese hecho.  Esta opción "
-"todavía no esta implementada."
+#~ msgid ""
+#~ "Many of these programs share options; these are described here, together "
+#~ "with the programs that accept them."
+#~ msgstr ""
+#~ "Muchos de estos programas comparten opciones; éstas se describen aquí, "
+#~ "junto con los programas que las aceptan."
 
 # type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Display the particular program's usage message, including a synopsis of "
+#~ "the options it understands.  This option is understood by all the source "
+#~ "package tools."
+#~ msgstr ""
+#~ "Muestra la versión y el modo de uso del programa, incluyendo un resumen "
+#~ "de las opciones disponibles. Esta opción es aceptada por todas las "
+#~ "herramientas para los paquetes fuente de Debian."
 
 # type: Plain text
-#: update-alternatives.8:312
 #, fuzzy
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr ""
-"Muestra la versión de B<update-alternatives> (y alguna información relativa "
-"a su uso)."
-
-# type: TP
-#: update-alternatives.8:312
-#, fuzzy, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--altdir> I<directorio>"
+#~ msgid ""
+#~ "Display the particular program's version, including copyright and license "
+#~ "information.  This option is understood by all the source package tools."
+#~ msgstr ""
+#~ "Muestra la versión y el modo de uso del programa, incluyendo un resumen "
+#~ "de las opciones disponibles. Esta opción es aceptada por todas las "
+#~ "herramientas para los paquetes fuente de Debian."
 
 # type: Plain text
-#: update-alternatives.8:316
 #, fuzzy
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-"Especifica el directorio de alternativas cuando va a ser diferente del "
-"directorio por omisión."
-
-# type: TP
-#: update-alternatives.8:316
-#, fuzzy, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir> I<directorio>"
+#~ msgid ""
+#~ "Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
+#~ "I<substvarsfile>; the default is B<debian/substvars>.  This option is "
+#~ "understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
+#~ "B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Lee (o, para B<dpkg-shlibdeps>, escribe) las variables de sustitución en "
+#~ "I<fichvarsust> ; por omisión, éste es B<debian/substvars>.  Esta opción "
+#~ "es aceptada por B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> y "
+#~ "B<dpkg-genchanges>."
 
 # type: Plain text
-#: update-alternatives.8:320
 #, fuzzy
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr ""
-"Especifica el directorio administrativo cuando va a ser diferente del "
-"directorio por omisión."
+#~ msgid ""
+#~ "Override or add an output control file field.  This option is understood "
+#~ "by B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Sobreescribe o añade un campo del fichero de control de salida.  Esta "
+#~ "opción es aceptada por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-"
+#~ "genchanges>."
 
-# type: TP
-#: update-alternatives.8:323
-#, fuzzy, no-wrap
-msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
-msgstr "B<--install> I<gen enlace alt pri> [B<--slave> I<sgen senlace salt>] ..."
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Remove an output control file field.  This option is understood by B<dpkg-"
+#~ "source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Elimina un campo del fichero de control de salida.  Esta opción es "
+#~ "aceptada por B<dpkg-source>, B<dpkg-gencontrol> y B<dpkg-genchanges>."
 
 # type: Plain text
-#: update-alternatives.8:338
 #, fuzzy
-msgid ""
-"Add a group of alternatives to the system.  I<genname> is the generic name "
-"for the master link, I<symlink> is the name of its symlink in the "
-"alternatives directory, and I<altern> is the alternative being introduced "
-"for the master link.  The arguments after B<--slave> are the generic name, "
-"symlink name in the alternatives directory and the alternative for a slave "
-"link.  Zero or more B<--slave> options, each followed by three arguments, "
-"may be specified."
-msgstr ""
-"Añade un grupo de alternativas al sistema.  I<gen> es el nombre genérico del "
-"enlace maestro, I<enlace> es el nombre del enlace simbólico en el directorio "
-"de alternativas, y I<alt> es la la alternativa que se va a introducir para "
-"el enlace maestro.  I<sgen>, I<senlace> y I<salt> son el nombre genérico, el "
-"enlace simbólico en el directorio de alternativas y la alternativa para el "
-"enlace esclavo.  Pueden especificarse cero o más opciones del tipo B<--"
-"slave> seguidas de sus argumentos."
+#~ msgid ""
+#~ "B<-b> tells B<dpkg-source> to build a source package (rather than to "
+#~ "extract one) - see below."
+#~ msgstr ""
+#~ "B<-b> le dice a B<dpkg-source> que construya un paquete fuente (en vez de "
+#~ "extraer uno) - vea más abajo."
 
 # type: Plain text
-#: update-alternatives.8:349
 #, fuzzy
-msgid ""
-"If the master symlink specified exists already in the alternatives system's "
-"records, the information supplied will be added as a new set of alternatives "
-"for the group.  Otherwise, a new group, set to automatic mode, will be added "
-"with this information.  If the group is in automatic mode, and the newly "
-"added alternatives' priority is higher than any other installed alternatives "
-"for this group, the symlinks will be updated to point to the newly added "
-"alternatives."
-msgstr ""
-"Si el enlace simbólico maestro especificado ya existe en los registros del "
-"sistema de alternativas, la información suministrada se añadirá como un "
-"nuevo conjunto de alternativas para el grupo.  En caso contrario se creará "
-"un grupo nuevo, en modo automático, al que se le añadirá la información "
-"suministrada.  Si el grupo está en modo automático, y la prioridad nueva "
-"añadida es mayor que cualquier otra alternativa instalada para ese grupo, "
-"los enlaces se actualizarán para apuntar a las nuevas alternativas."
+#~ msgid ""
+#~ "This option negates a previously set B<-W>.  It is currently only "
+#~ "understood by B<dpkg-buildpackage> and B<dpkg-source>."
+#~ msgstr ""
+#~ "Esta opción niega una opción B<-W> establecida previamente. Actualmente "
+#~ "sólo es aceptada por B<dpkg-buildpackage> y B<dpkg-source>."
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "OPCIONES DE DPKG-SOURCE"
 
 # type: TP
-#: update-alternatives.8:349
-#, fuzzy, no-wrap
-msgid "B<--set> I<name path>"
-msgstr "B<--set> I<nombre camino>"
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<-x>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<-IE<lt>nombredeficheroE<gt>>"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "OPCIONES DE DPKG-GENCONTROL"
 
 # type: Plain text
-#: update-alternatives.8:358
 #, fuzzy
-msgid ""
-"Set the program I<path> as alternative for I<name.> This is equivalent to "
-"I<--config> but is non-interactive and thus scriptable."
-msgstr ""
-"Establece el programa I<camino> como alternativa para I<nombre.> Es "
-"equivalente a I<--config> pero de forma no interactiva, de modo que permite "
-"su inclusión en scripts."
+#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#~ msgstr "B<dpkg-gencontrol> no acepta ningún argumento que no sea de opción."
 
-# type: TP
-#: update-alternatives.8:358
-#, fuzzy, no-wrap
-msgid "B<--remove> I<name path>"
-msgstr "B<--remove> I<nombre camino>"
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-SHLIBDEPS OPTIONS"
+#~ msgstr "OPCIONES DE DPKG-SHLIBDEPS"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-GENCHANGES OPTIONS"
+#~ msgstr "OPCIONES DE DPKG-GENCHANGES"
 
 # type: Plain text
-#: update-alternatives.8:378
 #, fuzzy
-msgid ""
-"Remove an alternative and all of its associated slave links.  I<name> is a "
-"name in the alternatives directory, and I<path> is an absolute filename to "
-"which I<name> could be linked. If I<name> is indeed linked to I<path>, "
-"I<name> will be updated to point to another appropriate alternative, or "
-"removed if there is no such alternative left.  Associated slave links will "
-"be updated or removed, correspondingly.  If the link is not currently "
-"pointing to I<path>, no links are changed; only the information about the "
-"alternative is removed."
-msgstr ""
-"Borra una alternativa y todos sus enlaces esclavos asociados.  I<nombre> es "
-"el nombre en el directorio de alternativas, y I<camino> es el nombre "
-"absoluto del fichero al que se podría enlazar I<nombre .> Si I<nombre> está "
-"en realidad enlazado a I<camino>, I<nombre> se actualizará para que apunte a "
-"otra alternativa apropiada, o será eliminado si no queda ninguna alternativa "
-"restante.  Los enlaces esclavos asociados serán actualizados o eliminados "
-"correspondientemente.  Si el enlace está apuntando en ese momento a "
-"I<camino>, no se cambia ningún enlace, sólo se elimina la información acerca "
-"de la alternativa."
+#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#~ msgstr ""
+#~ "B<dpkg-genchanges> no acepta ningún argumento que no sea una opción."
 
-# type: TP
-#: update-alternatives.8:378
-#, no-wrap
-msgid "B<--remove-all> I<name>"
-msgstr "B<--remove-all> I<nombre>"
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-BUILDPACKAGE OPTIONS"
+#~ msgstr "OPCIONES DE DPKG-BUILDPACKAGE"
 
 # type: Plain text
-#: update-alternatives.8:383
 #, fuzzy
-msgid ""
-"Remove all alternatives and all of their associated slave links.  I<name> is "
-"a name in the alternatives directory."
-msgstr ""
-"Elimina todas las alternativas y todos sus enlaces esclavos asociados.  "
-"I<nombre> es un nombre en el directorio de alternativas."
+#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#~ msgstr ""
+#~ "B<dpkg-buildpackage> no acepta ningún argumento que no sea una opción."
 
-# type: TP
-#: update-alternatives.8:383
-#, no-wrap
-msgid "B<--all>"
-msgstr "B<--all>"
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-DISTADDFILE ARGUMENTS"
+#~ msgstr "ARGUMENTOS DE DPKG-DISTADDFILE"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+#~ msgstr "ARGUMENTOS DE DPKG-PARSECHANGELOG"
 
 # type: Plain text
-#: update-alternatives.8:386
 #, fuzzy
-msgid "Call B<--config> on all alternatives."
-msgstr "Llama a B<--config> sobre todas las alternativas."
+#~ msgid ""
+#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
+#~ "arguments."
+#~ msgstr ""
+#~ "B<dpkg-parsechangelog> no acepta argumentos que no sean opciones comunes."
 
-# type: TP
-#: update-alternatives.8:386
-#, fuzzy, no-wrap
-msgid "B<--auto> I<link>"
-msgstr "B<--auto> I<enlace>"
+# type: SH
+#, fuzzy
+#~ msgid "VARIABLE SUBSTITUTION"
+#~ msgstr "SUSTITUCIÓN DE VARIABLES"
 
 # type: Plain text
-#: update-alternatives.8:393
 #, fuzzy
-msgid ""
-"Switch the master symlink I<link> to automatic mode.  In the process, this "
-"symlink and its slaves are updated to point to the highest priority "
-"installed alternatives."
-msgstr ""
-"Cambia el enlace simbólico maestro I<enlace> a modo automático.  En el "
-"proceso, este enlace simbólico y sus esclavos serán actualizados para "
-"apuntar a la alternativa instalada con una prioridad mayor."
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "Esto es software libre, vea la Licencia Pública General de GNU en su "
+#~ "versión 2 o superior para las condiciones de copia.  NO hay GARANTÍA.  "
+#~ "Vea B</usr/share/doc/dpkg/copyright> y B</usr/share/common-licenses/GPL> "
+#~ "para más detalles."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
 
 # type: TP
-#: update-alternatives.8:393
-#, fuzzy, no-wrap
-msgid "B<--display> I<link>"
-msgstr "B<--display> I<enlace>"
+#, fuzzy
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--split>, B<-s>"
 
-# type: Plain text
-#: update-alternatives.8:404
+# type: TP
 #, fuzzy
-msgid ""
-"Display information about the link group of which I<link> is the master "
-"link.  Information displayed includes the group's mode (auto or manual), "
-"which alternative the symlink currently points to, what other alternatives "
-"are available (and their corresponding slave alternatives), and the highest "
-"priority alternative currently installed."
-msgstr ""
-"Muestra información acerca del grupo de enlaces del cual I<enlace> es el "
-"enlace maestro.  La información mostrada incluye el modo del grupo "
-"(automático o manual), a que alternativa apunta el enlace simbólico, otras "
-"alternativas disponibles (y sus alternativas esclavas correspondientes), y "
-"la prioridad más alta instalada actualmente."
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--join>, B<-j>"
 
 # type: TP
-#: update-alternatives.8:404
-#, fuzzy, no-wrap
-msgid "B<--list> I<link>"
-msgstr "B<--list> I<enlace>"
+#, fuzzy
+#~ msgid "B<--auto>, B<-a>"
+#~ msgstr "B<--auto>, B<-a>"
 
-# type: Plain text
-#: update-alternatives.8:407
+# type: TP
 #, fuzzy
-msgid "Display all targets of the link group."
-msgstr "Muestra todos objetivos de un grupo de enlaces."
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--listq>, B<-l>"
 
 # type: TP
-#: update-alternatives.8:407
-#, fuzzy, no-wrap
-msgid "B<--config> I<link>"
-msgstr "B<--config> I<enlace>"
+#, fuzzy
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--discard>, B<-d>"
 
 # type: Plain text
-#: update-alternatives.8:414
 #, fuzzy
-msgid ""
-"Show available alternatives for a link group and allow the user to "
-"interactively select which one to use. The link group is updated and taken "
-"out of I<auto> mode."
-msgstr ""
-"Muestra las alternativas disponibles para un grupo de enlaces y permite a un "
-"usuario seleccionar interactivamente cual usar. El grupo de enlaces se "
-"actualiza y se deshabilita el modo I<auto> en él."
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Muestra el modo de uso de B<dpkg-split> , dando además un breve resumen "
+#~ "de sus opciones."
 
-# type: TP
-#: update-alternatives.8:416
-#, no-wrap
-msgid "I</etc/alternatives/>"
-msgstr "I</etc/alternatives/>"
+# type: Plain text
+#, fuzzy
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "Muestra la versión de B<dpkg-split.>"
 
 # type: Plain text
-#: update-alternatives.8:422
 #, fuzzy
-msgid ""
-"The default alternatives directory.  Can be overridden by the B<--altdir> "
-"option."
-msgstr ""
-"El directorio de alternativas por omisión.  Puede ser cambiado con la opción "
-"B<--altdir .>"
+#~ msgid ""
+#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported.)"
+#~ msgstr ""
+#~ "Muestra información acerca de la licencia de B<dpkg-split> así como de su "
+#~ "falta de garantía. (La escritura americana B<--license> también se "
+#~ "admite)."
 
 # type: TP
-#: update-alternatives.8:422
-#, no-wrap
-msgid "I</var/lib/dpkg/alternatives/>"
-msgstr "I</var/lib/dpkg/alternatives/>"
+#, fuzzy
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--npquiet>, B<-Q>"
 
 # type: Plain text
-#: update-alternatives.8:428
 #, fuzzy
-msgid ""
-"The default administration directory.  Can be overridden by the B<--"
-"admindir> option."
-msgstr ""
-"El directorio de administración por omisión.  Puede ser modificado con la "
-"opción B<--admindir .>"
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
+#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [opciones] --add E<lt>usuarioE<gt> E<lt>grupoE<gt> "
+#~ "E<lt>modoE<gt> I<E<lt>ficheroE<gt>>"
 
-# type: IP
-#: update-alternatives.8:430
-#, no-wrap
-msgid "0"
-msgstr "0"
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-statoverride> [opciones] --remove I<E<lt>ficheroE<gt>>"
 
 # type: Plain text
-#: update-alternatives.8:432
 #, fuzzy
-msgid "The requested action was successfully performed."
-msgstr "La acción requerida fue realizada con éxito."
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#~ msgstr "B<dpkg-statoverride> [opciones] --list I<[E<lt>patrón-globalE<gt>]>"
 
-# type: IP
-#: update-alternatives.8:432
-#, no-wrap
-msgid "2"
-msgstr "2"
+# type: TP
+#, fuzzy
+#~ msgid "B<--admindir>"
+#~ msgstr "I<--admindir>"
 
 # type: Plain text
-#: update-alternatives.8:435
 #, fuzzy
-msgid ""
-"Problems were encountered whilst parsing the command line or performing the "
-"action."
-msgstr ""
-"Se encontraron problemas interpretando la línea de órdenes o realizando la "
-"acción requerida."
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
 
 # type: Plain text
-#: update-alternatives.8:445
 #, fuzzy
-msgid ""
-"B<update-alternatives> chatters incessantly about its activities on its "
-"standard output channel.  If problems occur, B<update-alternatives> outputs "
-"error messages on its standard error channel and returns an exit status of "
-"2.  These diagnostics should be self-explanatory; if you do not find them "
-"so, please report this as a bug."
-msgstr ""
-"B<update-alternatives> informa innecesariamente acerca de sus actividades en "
-"la salida estándar.  Si ocurre algún problema B<update-alternatives> "
-"canaliza los mensajes de error a la salida de errores estándar y devuelve un "
-"estado de salida de 2.  Los diagnósticos deberían ser auto-explicativos, si "
-"a usted no se lo parecen, por favor, avise de esto como un fallo."
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
 
-# type: Plain text
-#: update-alternatives.8:449
+# type: TP
 #, fuzzy
-msgid ""
-"If you find a bug, please report it using the Debian bug-tracking system, "
-"or, if that is not possible, email the author directly."
-msgstr ""
-"Si encuentra algún fallo, por favor, avise usando el sistema de seguimiento "
-"de fallos de Debian, o, si esto no es posible, mande un email directamente "
-"al autor."
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: update-alternatives.8:454
 #, fuzzy
-msgid ""
-"If you find any discrepancy between the operation of B<update-alternatives> "
-"and this manual page, it is a bug, either in the implementation or the "
-"documentation; please report it."
-msgstr ""
-"Si encuentra alguna discrepancia entre el modo de operación de B<update-"
-"alternatives> y esta página del manual, es un fallo, bien en la "
-"implementación o bien en la documentación, por favor, avise."
+#~ msgid "Print help information; then exit."
+#~ msgstr "Muestra la ayuda y luego termina."
 
 # type: Plain text
-#: update-alternatives.8:459
 #, fuzzy
-msgid ""
-"Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
-"software; see the GNU General Public Licence version 2 or later for copying "
-"conditions. There is NO warranty."
-msgstr ""
-"Update-alternatives de Debian es copyright 1995 de Ian Jackson. Es un "
-"programa libre, vea la licencia GPL de GNU versión 2 o posterior para las "
-"condiciones de copia. NO hay ninguna garantía."
+#~ msgid "Print version information; then exit."
+#~ msgstr "Muestra la versión y luego termina."
 
 # type: Plain text
-#: update-alternatives.8:463
 #, fuzzy
-msgid ""
-"This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
-"documentation; see the GNU General Public Licence version 2 or later for "
-"copying conditions. There is NO WARRANTY."
-msgstr ""
-"Esta página del manual es copyright 1997/98 de Charles Briscoe-Smith.  Es "
-"documentación libre, vea la licencia GPL de GNU versión 2 o posterior para "
-"las condiciones de copia.  NO hay ninguna garantía."
+#~ msgid ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+#~ msgstr ""
+#~ "B<update-alternatives> [I<opciones>] B<--install> I<enlace nombre camino "
+#~ "prioridad> [B<--slave> I<enlace nombre> I<camino>]..."
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--remove> I<nombre camino>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--remove-all> I<nombre>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--display> I<nombre>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--list> I<nombre>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--config> I<nombre>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#~ msgstr "B<update-alternatives> [I<opciones>] B<--set> I<nombre camino>"
 
 # type: Plain text
-#: update-alternatives.8:465
 #, fuzzy
-msgid ""
-"You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
-"system."
-msgstr ""
-"Puede encontrar la licencia GPL de GNU en /usr/share/common-licenses/GPL en "
-"cualquier sistema Debian."
+#~ msgid ""
+#~ "Exactly one action must be specified if B<update-alternatives> is to "
+#~ "perform any meaningful task.  Any number of the common options may be "
+#~ "specified together with any action."
+#~ msgstr ""
+#~ "Se debe de especificar exactamente una acción a realizar a B<update-"
+#~ "alternatives> si se desea que realice algún trabajo significativo. Se "
+#~ "puede especificar cualquier número de las opciones comunes junto con "
+#~ "cualquier acción."
 
 # type: Plain text
-#: update-alternatives.8:468
 #, fuzzy
-msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
-msgstr "B<ln>(1), FHS, el estándar sobre la jerarquía del sistema de ficheros."
+#~ msgid "Tell which version of B<update-alternatives> this is."
+#~ msgstr ""
+#~ "Muestra la versión de B<update-alternatives> (y alguna información "
+#~ "relativa a su uso)."
 
 # type: TH
 #, fuzzy
diff --git a/man/po/fr.po b/man/po/fr.po
index f3caf30c..4f8556f7 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-09-30 15:16+0200\n"
 "Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -16,164 +16,178 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: TH
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "822-date"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
-msgstr "28-02-2006"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
+msgstr "24-11-2006"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Projet Debian"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "Utilitaires de dpkg"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NOM"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+#, fuzzy
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - Afficher la date au format RFC822"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
+#, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> affiche la date et l'heure courante dans le format décrit par la "
 "RFC 822, en précisant le fuseau horaire numérique, tel que recommandé dans "
 "la RFC 1123."
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> ne prend aucun paramètre ni aucune option."
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "Cette fonctionnalité devrait vraiment être intégrée à B<date>(1)."
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC 822),"
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC 1123) "
-"section 5.2.14,"
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
-msgstr "B<date>(1)."
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> et cette page de manuel ont été écrites par Ian Jackson, qui les "
-"a placé dans le domaine public."
 
 # type: TH
 #: cleanup-info.8:1
@@ -181,6 +195,15 @@ msgstr ""
 msgid "cleanup-info"
 msgstr "cleanup-info"
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "09-04-2006"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
@@ -189,16 +212,13 @@ msgstr ""
 "bogué"
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>répertoireE<gt>>]"
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<update-alternatives> [I<options>] B<--auto> I<nom>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -212,7 +232,7 @@ msgstr ""
 "les deux-points qui peuvent avoir été laissés."
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
@@ -221,7 +241,7 @@ msgstr ""
 "lignes blanches (dans les entrées seulement)."
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
@@ -230,7 +250,7 @@ msgstr ""
 "en compte). L'ordre des entrées à l'intérieur des sections est préservé."
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -243,66 +263,82 @@ msgstr ""
 "sauvegarder ce fichier avant d'utiliser ce script."
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr "Affiche un écran d'aide et se termine normalement."
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--unsafe>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr "Apporte quelques options supplémentaires qui peuvent être utiles."
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 "B<Attention : l'option « --unsafe » peut altérer un fichier qui était correct"
 "\\ !>\""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+#, fuzzy
+msgid "Show the usage message and exit."
+msgstr "Affiche un message d'aide puis quitte."
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
-msgstr "Affiche la version et se termine normalement."
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+#, fuzzy
+msgid "Show the version and exit."
+msgstr "Affiche le numéro de version puis quitte."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "I</usr/info/dir> ou I<E<lt>répertoireE<gt>/dir>"
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
@@ -311,23 +347,23 @@ msgstr ""
 "porte le même nom suivi de « .lock »."
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr "Beaucoup, sans doute."
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -342,6 +378,13 @@ msgstr ""
 msgid "deb"
 msgstr "deb"
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "28-02-2006"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -1045,352 +1088,848 @@ msgstr ""
 msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
-# type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+# type: TP
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "dpkg-statoverride"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "2007-03-07"
 msgstr "09-04-2006"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "suite dpkg"
+# type: Plain text
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
+
+# type: TP
+#: deb-override.5:22
+#, fuzzy
+msgid "override"
+msgstr "dpkg-statoverride"
 
 # type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - un gestionnaire de paquet pour Debian"
+#: deb-override.5:29
+msgid ""
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
+msgstr ""
+"Bien que l'on puisse trouver dans le fichier «\\ control\\ » la plupart des "
+"informations concernant un paquet, certaines doivent être inscrites par les "
+"tsars de la distribution plutôt que par le responsable du paquet\\ : elles "
+"ont trait à l'organisation des fichiers en vue de la publication plutôt "
+"qu'aux dépendances réelles ou à la description du paquet. Ces informations "
+"se trouvent dans le fichier «\\ override\\ »."
 
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: deb-override.5:33
+msgid ""
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
+msgstr ""
+"Les éléments du fichier «\\ override\\ » sont séparés simplement par un "
+"espace. Les commentaires commencent par un caractère B<«\\ #\\ »>."
 
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "AVERTISSEMENT"
+# type: Plain text
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgstr "I<paquet> I<priorité> I<section> [I<responsable>]"
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:44
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"Ce manuel est destiné aux utilisateurs qui souhaitent aller au-delà de la "
-"commande B<dpkg --help> pour la compréhension des options de la ligne de "
-"commande et des états des paquets."
+"I<paquet> est le nom du paquet. Les entrées du fichier «\\ override\\ » "
+"concernant des paquets qui ne sont pas dans l'arborescence des paquets "
+"binaires sont ignorées."
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:53
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"Les responsables de paquet qui veulent comprendre comment B<dpkg> installe "
-"leur paquet I<ne doivent pas> l'utiliser. Les descriptions concernant "
-"l'installation ou la désinstallation des paquets sont très insuffisantes."
+"Les éléments I<priorité> et I<section> placent le paquet dans l'arborescence"
+"\\ ; on ne devrait pas les trouver dans le fichier «\\ control\\ ». Quand le "
+"paquet se trouve dans un sous-répertoire de I<rep-de-binaires,> on le "
+"compare avec le contenu de I<section>."
 
 # type: Plain text
-#: dpkg.1:26
+#: deb-override.5:61
 msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
-"B<dpkg> est un outil pour l'installation, la création, la suppression et la "
-"gestion des paquets Debian. B<dselect>(1) est la principale interface à "
-"B<dpkg> et la plus agréable pour l'utilisateur.  B<dpkg> lui-même est "
-"entièrement contrôlé par des paramètres sur la ligne de commande. Une "
-"commande comporte exactement une action et zéro ou plusieurs options. Le "
-"paramètre «\\ action\\ » dit ce que B<dpkg> doit faire et les options "
-"modifient l'action d'une manière ou d'une autre."
+"L'élément I<responsable,> quand il existe, peut représenter soit le nom du "
+"responsable quand il s'agit d'un remplacement sans condition, soit la chaîne "
+"I<ancienresponsable> B<=E<gt>> I<nouveauresponsable> pour un changement de "
+"responsable."
 
 # type: Plain text
-#: dpkg.1:31
+#: deb-override.5:66
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"On peut aussi utiliser B<dpkg> comme une interface à B<dpkg-deb>(1). Quand "
-"B<dpkg> rencontre les actions suivantes, qui sont des actions de B<dpkg-"
-"deb>, il lance simplement B<dpkg-deb> avec les paramètres qui lui ont été "
-"fournis\\ :"
+"On peut trouver les fichiers «\\ override\\ », dont on se sert pour établir "
+"les fichiers officiels «\\ Packages\\ », dans le répertoire I<indices> des "
+"miroirs Debian."
 
 # type: Plain text
-#: dpkg.1:40
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+msgid "deb-shlibs"
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, et\n"
-"    B<--fsys-tarfile>.\n"
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "28-02-2006"
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#: deb-shlibs.5:19
+#, fuzzy
+msgid "deb-shlibs - Debian shared library information file"
 msgstr ""
-"Voyez B<dpkg-deb>(1) pour des renseignements supplémentaires sur ces actions."
+"Fichier système remplaçant les informations qui concernent les dépendances "
+"envers des bibliothèques partagées."
 
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "RENSEIGNEMENTS SUR LES PAQUETS"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-shlibs.5:26
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"B<dpkg> conserve des renseignements utiles sur les paquets disponibles.  "
-"Cette information est divisée en trois classes\\ : les états, les états de "
-"la sélection et les drapeaux. La modification de ces valeurs est "
-"principalement dévolue à B<dselect>."
-
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "ÉTATS DES PAQUETS"
 
-# type: TP
-#: dpkg.1:49
-#, no-wrap
-msgid "B<installed>"
-msgstr "B<installed>"
+# type: Plain text
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
+"E<lt>nom de la bibliothèqueE<gt> E<lt>version/nom_soE<gt> "
+"E<lt>dépendancesE<gt>"
 
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
-msgstr "Le paquet est dépaqueté et correctement configuré."
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-shlibdeps> I<options>"
 
 # type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<half-installed>"
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:56
-msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
-"L'installation du paquet a commencé mais, pour une raison quelconque, ne "
-"s'est pas terminée."
 
 # type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<not-installed>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<debian/substvars>"
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "Le paquet n'est pas installé sur le système."
-
-# type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<unpacked>"
+#: deb-substvars.5:20
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
+msgstr ""
+"Avant que B<dpkg-source>, B<dpkg-gencontrol> et B<dpkg-genchanges> "
+"n'écrivent leurs informations de contrôle (dans le fichier source de "
+"contrôle B<.dsc> pour B<dpkg-source> et sur la sortie standard pour B<dpkg-"
+"gencontrol> et B<dpkg-genchanges),> ils accomplissent quelques substitutions "
+"de variable dans le fichier de sortie."
 
 # type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "Le paquet est dépaqueté mais n'est pas configuré."
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
+"Une substitution de variable est de la forme : B<${>I<variable-nom>B<}>. Les "
+"noms de variable consistent en caractères alphanumériques, traits d'union et "
+"«\\ deux points\\ » ; ils commencent par une lettre ou un chiffre. La "
+"substitution se fait répétitivement jusqu'à ce qu'il n'en reste aucune à "
+"faire\\ ; le texte entier du champ après la substitution est réexaminé pour "
+"chercher d'autres substitutions."
 
-# type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<half-configured>"
+# type: Plain text
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
+"Quand toutes les substitutions ont été faites, chaque occurrence de la "
+"chaîne B<${}> (laquelle n'est pas une substitution autorisée) est remplacée "
+"par un signe B<$>."
 
 # type: Plain text
-#: dpkg.1:66
+#: deb-substvars.5:47
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
 msgstr ""
-"Le paquet est dépaqueté et la configuration a commencé mais, pour une "
-"quelconque raison, ne s'est pas terminée."
+"On peut définir les variables en utilisant l'option commune B<-V>. On peut "
+"aussi se servir du fichier B<debian/substvars> (ou tout autre fichier avec "
+"l'option B<-T>). Ce fichier est composé de lignes de la forme suivante\\ : "
+"I<nom>B<=>I<valeur>. Les espaces résiduels sur chaque ligne, les lignes "
+"vides et les lignes qui commencent par un symbole B<#> sont ignorés."
+
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr "En outre, les variables standard suivantes sont disponibles\\ :"
 
 # type: TP
-#: dpkg.1:66
+#: deb-substvars.5:49
 #, no-wrap
-msgid "B<config-files>"
-msgstr "B<config-files>"
+msgid "B<Arch>"
+msgstr "B<Arch>"
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "Seuls les fichiers de configuration du paquet existent sur le système."
-
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "ÉTATS DE LA SÉLECTION DES PAQUETS"
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
+msgstr ""
+"L'architecture pour laquelle on construit (tirée de B<dpkg --print-"
+"architecture>)."
 
 # type: TP
-#: dpkg.1:70
+#: deb-substvars.5:53
 #, no-wrap
-msgid "B<install>"
-msgstr "B<install>"
+msgid "B<source:Version>"
+msgstr "B<Source:Version>"
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "Le paquet est sélectionné pour être installé."
+#: deb-substvars.5:56
+msgid "The source package version."
+msgstr "La version du paquet source."
 
 # type: TP
-#: dpkg.1:73
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstall>"
+msgid "B<source:Upstream-Version>"
+msgstr "B<source:Upstream-Version>"
 
 # type: Plain text
-#: dpkg.1:77
+#: deb-substvars.5:60
 msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"Le paquet est sélectionné pour être désinstallé (c.-à-d. qu'on veut "
-"supprimer tous les fichiers à l'exception des fichiers de configuration)."
+"La version amont du paquet source, avec éventuellement l'«\\ epoch\\ » de la "
+"version debian."
 
 # type: TP
-#: dpkg.1:77
+#: deb-substvars.5:60
 #, no-wrap
-msgid "B<purge>"
-msgstr "B<purge>"
+msgid "B<binary:Version>"
+msgstr "B<binary:Version>"
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:64
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"Le paquet est sélectionné pour être purgé (c.-à-d. qu'on veut supprimer tous "
-"les fichiers même les fichiers de configuration)."
+"La version du paquet binaire (qui peut être différente de source:Version "
+"dans un binNMU par exemple)."
 
-# type: SS
-#: dpkg.1:81
+# type: TP
+#: deb-substvars.5:64
 #, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "DRAPEAUX DES PAQUETS"
+msgid "B<Source-Version>"
+msgstr "B<Source-Version>"
+
+# type: Plain text
+#: deb-substvars.5:69
+msgid ""
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
+msgstr ""
+"La version du paquet source, selon le fichier changelog. Cette variable est "
+"maintenant B<déconseillée> car sa signification est distincte de sa "
+"fonction. Utilisez plutôt B<source:Version> ou B<binary:Version>."
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:69
 #, no-wrap
-msgid "B<hold>"
-msgstr "B<hold>"
+msgid "B<Installed-Size>"
+msgstr "B<Installed-Size>"
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:78
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"B<dpkg> laisse de côté un paquet marqué B<hold>, à moins qu'il ne soit lancé "
-"avec l'option de forçage B<--force-hold>."
+"La taille de tous les fichiers installés du paquet. Cette valeur est copiée "
+"dans le champ adéquat du fichier « control » ; Quand on fixe cette variable, "
+"cela modifie la valeur de ce champ. Quand elle est indéterminée, B<dpkg-"
+"gencontrol> use de la commande B<du -k debian/tmp> pour trouver une valeur "
+"par défaut."
 
 # type: TP
-#: dpkg.1:86
+#: deb-substvars.5:78
 #, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<reinst-required>"
+msgid "B<Extra-Size>"
+msgstr "B<Extra-Size>"
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:87
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"Un paquet marqué B<reinst-required> est défectueux et demande une "
-"réinstallation. B<dpkg> ne peut supprimer de tels paquets, à moins qu'il ne "
-"soit lancé avec l'option de forçage B<--force-reinstreq>."
+"L'espace disque supplémentaire utilisé pour l'installation du paquet. Quand "
+"on fixe cette variable, on ajoute sa valeur à la valeur de la variable "
+"B<Installed-Size> (qu'elle soit définie explicitement ou calculée par "
+"défaut) avant que la variable B<Installed-Size> ne soit copiée dans le champ "
+"du fichier «\\ control\\ »."
 
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
+# type: TP
+#: deb-substvars.5:87
 #, no-wrap
-msgid "ACTIONS"
-msgstr "ACTIONS"
+msgid "B<F:>I<fieldname>"
+msgstr "B<F:>I<fieldname>"
+
+# type: Plain text
+#: deb-substvars.5:94
+msgid ""
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
+msgstr ""
+"La valeur du champ I<fieldname> affiché en sortie et qui doit être "
+"classiquement en majuscules. Quand on fixe ces variables, cela ne prend "
+"effet que là où elles sont effectivement développées."
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:94
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<fichier-paquet>..."
+msgid "B<Format>"
+msgstr "B<Format>"
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:104
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"Installe le paquet. Si l'on donne l' option B<--recursive> ou B<-R>, "
-"I<fichier-paquet> doit alors indiquer un répertoire."
+"La version du format du fichier B<.changes> produite par la version des "
+"scripts construisant le source. Quand on détermine cette variable, le "
+"contenu du champ B<Format> dans le fichier B<.changes> est aussi modifié."
 
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "L'installation comporte les étapes suivantes\\ :"
+# type: TP
+#: deb-substvars.5:104
+#, no-wrap
+msgid "B<Newline>, B<Space>, B<Tab>"
+msgstr "B<Newline>, B<Space>, B<Tab>"
 
 # type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Extraction des fichiers de contrôle du nouveau paquet."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
+msgstr "Ces variables contiennent chacune le caractère correspondant."
+
+# type: TP
+#: deb-substvars.5:107
+#, no-wrap
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr "B<shlibs:>I<dependencyfield>"
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:111
+#, fuzzy
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"B<2.> Quand une ancienne version du même paquet est déjà installée, "
-"exécution du script I<prerm> de l'ancien paquet."
+"Les variables déterminées de cette façon sont produites par B<dpkg-"
+"shlibdeps>, voyez plus haut."
+
+# type: TP
+#: deb-substvars.5:111
+#, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg:Upstream-Version>"
 
 # type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> Lancement du script I<preinst>, s'il est fourni par le paquet."
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
+msgstr "La version amont de dpkg."
+
+# type: TP
+#: deb-substvars.5:114
+#, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg:Version>"
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
+msgstr "La version complète de dpkg."
+
+# type: Plain text
+#: deb-substvars.5:120
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
+msgstr ""
+"Quand une variable est référencée mais n'est pas définie, cela produit un "
+"avertissement et une valeur nulle est assumée."
+
+# type: TP
+#: deb-substvars.5:122
+#, no-wrap
+msgid "B<debian/substvars>"
+msgstr "B<debian/substvars>"
+
+# type: Plain text
+#: deb-substvars.5:125
+msgid "List of substitution variables and values."
+msgstr "La liste des variables de substitution et leurs valeurs."
+
+# type: Plain text
+#: deb-substvars.5:129 dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
+msgstr ""
+"Le moment où a lieu le remplacement d'un champ par rapport à certaines "
+"déterminations de champ affichées sur la sortie standard est plutôt "
+"embrouillé."
+
+# type: Plain text
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+
+# type: Plain text
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr "Ces outils et cette page de manuel ont été écrits par Ian Jackson."
+
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+# type: Plain text
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
+msgstr "Copyright (C) 1995-1996 Ian Jackson"
+
+# type: Plain text
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr "Copyright (C) 2000 Wichert Akkerman"
+
+# type: Plain text
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
+msgid ""
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
+msgstr ""
+"Ce programme est un logiciel libre\\ ; voyez la «\\ GNU General Public "
+"Licence\\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
+"garantie."
+
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "dpkg"
+msgstr "dpkg"
+
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
+msgstr "09-04-2006"
+
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
+#, no-wrap
+msgid "dpkg suite"
+msgstr "suite dpkg"
+
+# type: Plain text
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - un gestionnaire de paquet pour Debian"
+
+# type: Plain text
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+# type: SH
+#: dpkg.1:9
+#, no-wrap
+msgid "WARNING"
+msgstr "AVERTISSEMENT"
+
+# type: Plain text
+#: dpkg.1:13
+msgid ""
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
+msgstr ""
+"Ce manuel est destiné aux utilisateurs qui souhaitent aller au-delà de la "
+"commande B<dpkg --help> pour la compréhension des options de la ligne de "
+"commande et des états des paquets."
+
+# type: Plain text
+#: dpkg.1:18
+msgid ""
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
+msgstr ""
+"Les responsables de paquet qui veulent comprendre comment B<dpkg> installe "
+"leur paquet I<ne doivent pas> l'utiliser. Les descriptions concernant "
+"l'installation ou la désinstallation des paquets sont très insuffisantes."
+
+# type: Plain text
+#: dpkg.1:26
+msgid ""
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
+msgstr ""
+"B<dpkg> est un outil pour l'installation, la création, la suppression et la "
+"gestion des paquets Debian. B<dselect>(1) est la principale interface à "
+"B<dpkg> et la plus agréable pour l'utilisateur.  B<dpkg> lui-même est "
+"entièrement contrôlé par des paramètres sur la ligne de commande. Une "
+"commande comporte exactement une action et zéro ou plusieurs options. Le "
+"paramètre «\\ action\\ » dit ce que B<dpkg> doit faire et les options "
+"modifient l'action d'une manière ou d'une autre."
+
+# type: Plain text
+#: dpkg.1:31
+msgid ""
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
+msgstr ""
+"On peut aussi utiliser B<dpkg> comme une interface à B<dpkg-deb>(1). Quand "
+"B<dpkg> rencontre les actions suivantes, qui sont des actions de B<dpkg-"
+"deb>, il lance simplement B<dpkg-deb> avec les paramètres qui lui ont été "
+"fournis\\ :"
+
+# type: Plain text
+#: dpkg.1:40
+#, no-wrap
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
+msgstr ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, et\n"
+"    B<--fsys-tarfile>.\n"
+
+# type: Plain text
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr ""
+"Voyez B<dpkg-deb>(1) pour des renseignements supplémentaires sur ces actions."
+
+# type: SH
+#: dpkg.1:43
+#, no-wrap
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "RENSEIGNEMENTS SUR LES PAQUETS"
+
+# type: Plain text
+#: dpkg.1:48
+msgid ""
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
+msgstr ""
+"B<dpkg> conserve des renseignements utiles sur les paquets disponibles.  "
+"Cette information est divisée en trois classes\\ : les états, les états de "
+"la sélection et les drapeaux. La modification de ces valeurs est "
+"principalement dévolue à B<dselect>."
+
+# type: SS
+#: dpkg.1:48
+#, no-wrap
+msgid "PACKAGE STATES"
+msgstr "ÉTATS DES PAQUETS"
+
+# type: TP
+#: dpkg.1:49
+#, no-wrap
+msgid "B<installed>"
+msgstr "B<installed>"
+
+# type: Plain text
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
+msgstr "Le paquet est dépaqueté et correctement configuré."
+
+# type: TP
+#: dpkg.1:52
+#, no-wrap
+msgid "B<half-installed>"
+msgstr "B<half-installed>"
+
+# type: Plain text
+#: dpkg.1:56
+msgid ""
+"The installation of the package has been started, but not completed for some "
+"reason."
+msgstr ""
+"L'installation du paquet a commencé mais, pour une raison quelconque, ne "
+"s'est pas terminée."
+
+# type: TP
+#: dpkg.1:56
+#, no-wrap
+msgid "B<not-installed>"
+msgstr "B<not-installed>"
+
+# type: Plain text
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "Le paquet n'est pas installé sur le système."
+
+# type: TP
+#: dpkg.1:59
+#, no-wrap
+msgid "B<unpacked>"
+msgstr "B<unpacked>"
+
+# type: Plain text
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "Le paquet est dépaqueté mais n'est pas configuré."
+
+# type: TP
+#: dpkg.1:62
+#, no-wrap
+msgid "B<half-configured>"
+msgstr "B<half-configured>"
+
+# type: Plain text
+#: dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
+msgstr ""
+"Le paquet est dépaqueté et la configuration a commencé mais, pour une "
+"quelconque raison, ne s'est pas terminée."
+
+# type: TP
+#: dpkg.1:66
+#, no-wrap
+msgid "B<config-files>"
+msgstr "B<config-files>"
+
+# type: Plain text
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "Seuls les fichiers de configuration du paquet existent sur le système."
+
+# type: SS
+#: dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "ÉTATS DE LA SÉLECTION DES PAQUETS"
+
+# type: TP
+#: dpkg.1:70
+#, no-wrap
+msgid "B<install>"
+msgstr "B<install>"
+
+# type: Plain text
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "Le paquet est sélectionné pour être installé."
+
+# type: TP
+#: dpkg.1:73
+#, no-wrap
+msgid "B<deinstall>"
+msgstr "B<deinstall>"
+
+# type: Plain text
+#: dpkg.1:77
+msgid ""
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
+msgstr ""
+"Le paquet est sélectionné pour être désinstallé (c.-à-d. qu'on veut "
+"supprimer tous les fichiers à l'exception des fichiers de configuration)."
+
+# type: TP
+#: dpkg.1:77
+#, no-wrap
+msgid "B<purge>"
+msgstr "B<purge>"
+
+# type: Plain text
+#: dpkg.1:81
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
+msgstr ""
+"Le paquet est sélectionné pour être purgé (c.-à-d. qu'on veut supprimer tous "
+"les fichiers même les fichiers de configuration)."
+
+# type: SS
+#: dpkg.1:81
+#, no-wrap
+msgid "PACKAGE FLAGS"
+msgstr "DRAPEAUX DES PAQUETS"
+
+# type: TP
+#: dpkg.1:82
+#, no-wrap
+msgid "B<hold>"
+msgstr "B<hold>"
+
+# type: Plain text
+#: dpkg.1:86
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
+msgstr ""
+"B<dpkg> laisse de côté un paquet marqué B<hold>, à moins qu'il ne soit lancé "
+"avec l'option de forçage B<--force-hold>."
+
+# type: TP
+#: dpkg.1:86
+#, no-wrap
+msgid "B<reinst-required>"
+msgstr "B<reinst-required>"
+
+# type: Plain text
+#: dpkg.1:91
+msgid ""
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
+msgstr ""
+"Un paquet marqué B<reinst-required> est défectueux et demande une "
+"réinstallation. B<dpkg> ne peut supprimer de tels paquets, à moins qu'il ne "
+"soit lancé avec l'option de forçage B<--force-reinstreq>."
+
+# type: SH
+#: dpkg.1:92
+#, no-wrap
+msgid "ACTIONS"
+msgstr "ACTIONS"
+
+# type: TP
+#: dpkg.1:93
+#, no-wrap
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<fichier-paquet>..."
+
+# type: Plain text
+#: dpkg.1:97
+msgid ""
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
+msgstr ""
+"Installe le paquet. Si l'on donne l' option B<--recursive> ou B<-R>, "
+"I<fichier-paquet> doit alors indiquer un répertoire."
+
+# type: Plain text
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "L'installation comporte les étapes suivantes\\ :"
+
+# type: Plain text
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Extraction des fichiers de contrôle du nouveau paquet."
+
+# type: Plain text
+#: dpkg.1:106
+msgid ""
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
+msgstr ""
+"B<2.> Quand une ancienne version du même paquet est déjà installée, "
+"exécution du script I<prerm> de l'ancien paquet."
+
+# type: Plain text
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
+msgstr "B<3.> Lancement du script I<preinst>, s'il est fourni par le paquet."
+
+# type: Plain text
+#: dpkg.1:113
+msgid ""
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
 "that if something goes wrong, they can be restored."
 msgstr ""
 "B<4.> Dépaquetage des nouveaux fichiers et, en même temps, sauvegarde des "
@@ -2220,7 +2759,7 @@ msgstr ""
 "une option de B<dpkg-deb>(1)."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
@@ -2568,7 +3107,7 @@ msgstr ""
 "commandes."
 
 # type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
@@ -2583,8 +3122,8 @@ msgstr ""
 "formaté. Seule l'action B<-l> se sert actuellement de cette variable."
 
 # type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
@@ -2736,7 +3275,10 @@ msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "L'option B<--no-act> ne donne pas assez d'informations utiles."
 
 # type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
@@ -2757,12 +3299,6 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, no-wrap
-msgid "2006-06-17"
-msgstr "17-06-2006"
-
 # type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -2773,7 +3309,8 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
 msgstr "B<dpkg-architecture> [I<options>] [I<action>]"
 
 # type: Plain text
@@ -2814,58 +3351,22 @@ msgstr ""
 "B<dpkg-architecture> affichera un avertissement si le choix ne correspond "
 "pas à la valeur par défaut."
 
-# type: TP
-#: dpkg-architecture.1:28
-#, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<-a>I<architecture-debian>"
-
-# type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
-msgstr "Fixe l'architecture Debian."
-
-# type: TP
-#: dpkg-architecture.1:31
-#, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr "B<-t>I<type-de-système-gnu>"
-
-# type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
-msgstr "Fixe le type de système GNU."
-
-# type: TP
-#: dpkg-architecture.1:34
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "B<-f>"
-msgstr "B<-f>"
-
-# type: Plain text
-#: dpkg-architecture.1:41
-msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
-msgstr ""
-"Les valeurs positionnées par les variables d'environnement ayant le même nom "
-"que celles utilisées par les scripts sont prises en compte (c'est-à-dire "
-"utilisée par B<dpkg-architecture>), sauf si cette option est présente. Ceci "
-"permet à un utilisateur de surcharger une valeur même lorsque l'appel à "
-"B<dpkg-architecture> est inclus dans un autre script (par exemple B<dpkg-"
-"buildpackage>(1))."
+msgid "COMMANDS"
+msgstr "COMMANDES"
 
 # type: TP
-#: dpkg-architecture.1:43
+#: dpkg-architecture.1:28
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 # type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:32
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
@@ -2874,13 +3375,13 @@ msgstr ""
 "I<VARIABLE=valeur>. C'est l'action par défaut."
 
 # type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:32
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<architecture-debian>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg-architecture.1:38
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -2894,13 +3395,13 @@ msgstr ""
 "contraire."
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg-architecture.1:38
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<architecture-joker>"
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg-architecture.1:44
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -2912,24 +3413,24 @@ msgstr ""
 "de retour de 0 si l'architecture correspond et de 1 dans le cas contraire."
 
 # type: TP
-#: dpkg-architecture.1:59
+#: dpkg-architecture.1:44
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<nom-de-variable>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
+#: dpkg-architecture.1:47
 msgid "Print the value of a single variable."
 msgstr "Affiche la valeur d'une seule variable."
 
 # type: TP
-#: dpkg-architecture.1:62
+#: dpkg-architecture.1:47
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg-architecture.1:51
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
@@ -2938,26 +3439,26 @@ msgstr ""
 "d'environnement avec « eval »."
 
 # type: TP
-#: dpkg-architecture.1:66
+#: dpkg-architecture.1:51
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 # type: Plain text
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:54
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 "Produit une commande similaire à celle produite par B<-s>, mais pour "
 "supprimer les variables de l'environnement."
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:54
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c> I<commande>"
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg-architecture.1:58
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
@@ -2966,25 +3467,59 @@ msgstr ""
 "positionnées aux valeurs spécifiées."
 
 # type: TP
-#: dpkg-architecture.1:73
+#: dpkg-architecture.1:58
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 # type: Plain text
-#: dpkg-architecture.1:76
+#: dpkg-architecture.1:61
 msgid "Print a list of valid architecture names."
 msgstr "Affiche une liste des architectures valables."
 
+# type: TP
+#: dpkg-architecture.1:69
+#, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<-a>I<architecture-debian>"
+
 # type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
-msgstr "Affiche un message d'aide."
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr "Fixe l'architecture Debian."
+
+# type: TP
+#: dpkg-architecture.1:72
+#, no-wrap
+msgid "B<-t>I<gnu-system-type>"
+msgstr "B<-t>I<type-de-système-gnu>"
+
+# type: Plain text
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
+msgstr "Fixe le type de système GNU."
+
+# type: TP
+#: dpkg-architecture.1:75
+#, no-wrap
+msgid "B<-f>"
+msgstr "B<-f>"
 
 # type: Plain text
 #: dpkg-architecture.1:82
-msgid "Print program version."
-msgstr "Affiche la version du programme."
+msgid ""
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
+msgstr ""
+"Les valeurs positionnées par les variables d'environnement ayant le même nom "
+"que celles utilisées par les scripts sont prises en compte (c'est-à-dire "
+"utilisée par B<dpkg-architecture>), sauf si cette option est présente. Ceci "
+"permet à un utilisateur de surcharger une valeur même lorsque l'appel à "
+"B<dpkg-architecture> est inclus dans un autre script (par exemple B<dpkg-"
+"buildpackage>(1))."
 
 # type: SH
 #: dpkg-architecture.1:83
@@ -3064,214 +3599,157 @@ msgstr ""
 "parties séparées par un tiret : processeur et système. Par exemple : i386-"
 "linux-gnu, sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
-# type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
-"B<dpkg-buildpackage> accepte l'option B<-a>, et la passe à B<dpkg-"
-"architecture>. Voici d'autres exemples :"
-
-# type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
-"CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-
-# type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-
-# type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
-msgstr ""
-"Vérifie si une architecture est identique à l'architecture actuelle ou à "
-"celle spécifiée :"
-
-# type: TP
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr "dpkg-architecture -elinux-alpha"
-
-# type: TP
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr "dpkg-architecture -amips -elinux-mips"
-
-# type: Plain text
-#: dpkg-architecture.1:117
-msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
-msgstr ""
-"Vérifie si l'architecture actuelle ou celle spécifiée avec -a correspond à "
-"un système Linux :"
-
-# type: TP
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
-msgstr "dpkg-architecture -ilinux-any"
-
-# type: TP
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr "dpkg-architecture -ai386 -ilinux-any"
-
 # type: SH
-#: dpkg-architecture.1:122
+#: dpkg-architecture.1:100
 #, no-wrap
 msgid "VARIABLES"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: Plain text
-#: dpkg-architecture.1:124
+#: dpkg-architecture.1:102
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr "Les variables suivantes sont positionnées par B<dpkg-architecture> :"
 
 # type: IP
-#: dpkg-architecture.1:124
+#: dpkg-architecture.1:102
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:126
+#: dpkg-architecture.1:104
 msgid "The Debian architecture of the build machine."
 msgstr "Architecture Debian de la machine de construction."
 
 # type: IP
-#: dpkg-architecture.1:126
+#: dpkg-architecture.1:104
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:128
+#: dpkg-architecture.1:106
 msgid "The Debian system name of the build machine."
 msgstr "Nom du système Debian de la machine de construction."
 
 # type: IP
-#: dpkg-architecture.1:128
+#: dpkg-architecture.1:106
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:130
+#: dpkg-architecture.1:108
 msgid "The Debian cpu name of the build machine."
 msgstr "Nom de processeur Debian de la machine de construction."
 
 # type: IP
-#: dpkg-architecture.1:130
+#: dpkg-architecture.1:108
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:132
+#: dpkg-architecture.1:110
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr "Type de système \\s-1GNU\\s0 de la machine de construction."
 
 # type: IP
-#: dpkg-architecture.1:132
+#: dpkg-architecture.1:110
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:134
+#: dpkg-architecture.1:112
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "Partie « processeur » de \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 # type: IP
-#: dpkg-architecture.1:134
+#: dpkg-architecture.1:112
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:136
+#: dpkg-architecture.1:114
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "Partie « système » de \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 # type: IP
-#: dpkg-architecture.1:136
+#: dpkg-architecture.1:114
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:138
+#: dpkg-architecture.1:116
 msgid "The Debian architecture of the host machine."
 msgstr "Architecture Debian de la machine hôte."
 
 # type: IP
-#: dpkg-architecture.1:138
+#: dpkg-architecture.1:116
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_OS\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:118
 msgid "The Debian system name of the host machine."
 msgstr "Nom du système Debian de la machine hôte."
 
 # type: IP
-#: dpkg-architecture.1:140
+#: dpkg-architecture.1:118
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:142
+#: dpkg-architecture.1:120
 msgid "The Debian cpu name of the host machine."
 msgstr "Nom du processeur Debian de la machine hôte."
 
 # type: IP
-#: dpkg-architecture.1:142
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:144
+#: dpkg-architecture.1:122
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr "Type de système \\s-1GNU\\s0 de la machine hôte."
 
 # type: IP
-#: dpkg-architecture.1:144
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:146
+#: dpkg-architecture.1:124
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Partie « processeur » de \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 # type: IP
-#: dpkg-architecture.1:146
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: dpkg-architecture.1:148
+#: dpkg-architecture.1:126
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Partie « système » de \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 # type: IX
-#: dpkg-architecture.1:149
+#: dpkg-architecture.1:127
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg-architecture.1:135
 msgid ""
 "The environment variables set by B<dpkg-architecture> are passed to I<debian/"
 "rules> as make variables (see make documentation). However, you should not "
@@ -3289,12 +3767,12 @@ msgstr ""
 "des compilations croisées de votre paquet :"
 
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
 msgid "Instead of:"
 msgstr "Au lieu de :"
 
 # type: Plain text
-#: dpkg-architecture.1:164
+#: dpkg-architecture.1:142
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -3304,12 +3782,12 @@ msgstr ""
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 # type: Plain text
-#: dpkg-architecture.1:167
+#: dpkg-architecture.1:145
 msgid "please use the following:"
 msgstr "Veuillez utiliser :"
 
 # type: Plain text
-#: dpkg-architecture.1:171
+#: dpkg-architecture.1:149
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -3319,13 +3797,13 @@ msgstr ""
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:173
+#: dpkg-architecture.1:151
 #, no-wrap
 msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:183
+#: dpkg-architecture.1:161
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -3339,18 +3817,18 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: dpkg-architecture.1:186
+#: dpkg-architecture.1:164
 msgid "please use:"
 msgstr "Veuillez utiliser :"
 
 # type: Plain text
-#: dpkg-architecture.1:189
+#: dpkg-architecture.1:167
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:193
+#: dpkg-architecture.1:171
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -3362,7 +3840,7 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: dpkg-architecture.1:197
+#: dpkg-architecture.1:175
 msgid ""
 "or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
 "or DEB_HOST_ARCH_OS variables."
@@ -3371,7 +3849,7 @@ msgstr ""
 "système, utilisez les variables DEB_HOST_ARCH_CPU ou DEB_HOST_ARCH_OS."
 
 # type: Plain text
-#: dpkg-architecture.1:202
+#: dpkg-architecture.1:180
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -3385,13 +3863,13 @@ msgstr ""
 "aucun nom de processeur."
 
 # type: IX
-#: dpkg-architecture.1:203
+#: dpkg-architecture.1:181
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr "COMPATIBILITÉ ARRIÈRE"
 
 # type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:187
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
 "relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
@@ -3406,7 +3884,7 @@ msgstr ""
 "temps."
 
 # type: Plain text
-#: dpkg-architecture.1:214
+#: dpkg-architecture.1:192
 msgid ""
 "Where I<debian/rules> files check these variables to decide how or what to "
 "compile, this should be updated to use the new variables and values.  You "
@@ -3419,7 +3897,7 @@ msgstr ""
 "dpkg-dev en utilisant le code suivant :"
 
 # type: Plain text
-#: dpkg-architecture.1:218
+#: dpkg-architecture.1:196
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -3429,7 +3907,7 @@ msgstr ""
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:232
+#: dpkg-architecture.1:210
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -3461,12 +3939,12 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: dpkg-architecture.1:235
+#: dpkg-architecture.1:213
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr "Et de la même façon pour DEB_BUILD_ARCH_CPU et DEB_BUILD_ARCH_OS."
 
 # type: Plain text
-#: dpkg-architecture.1:238
+#: dpkg-architecture.1:216
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
@@ -3475,7 +3953,7 @@ msgstr ""
 "architecture>, vous pouvez utiliser :"
 
 # type: Plain text
-#: dpkg-architecture.1:248
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -3497,7 +3975,7 @@ msgstr ""
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:253
+#: dpkg-architecture.1:231
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -3511,7 +3989,7 @@ msgstr ""
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: dpkg-architecture.1:257
+#: dpkg-architecture.1:235
 msgid ""
 "Put a subset of these lines at the top of your debian/rules file; these "
 "default values will be overwritten if dpkg-architecture is used."
@@ -3520,7 +3998,7 @@ msgstr ""
 "Ces valeurs par défaut seront écrasées si dpkg-architecture est utilisé."
 
 # type: Plain text
-#: dpkg-architecture.1:264
+#: dpkg-architecture.1:242
 msgid ""
 "You don't need the full set. Choose a consistent set which contains the "
 "values you use in the rules file. For example, if you only need the host "
@@ -3537,7 +4015,7 @@ msgstr ""
 "compatible avec les anciennes compilations natives)."
 
 # type: Plain text
-#: dpkg-architecture.1:267
+#: dpkg-architecture.1:245
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -3545,6 +4023,63 @@ msgstr ""
 "Les options B<-e> et B<-i> n'ont été ajoutées que relativement récemment à "
 "B<dpkg-architecture> (depuis la version 1.13.13 de dpkg)."
 
+# type: Plain text
+#: dpkg-architecture.1:249
+msgid ""
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
+msgstr ""
+"B<dpkg-buildpackage> accepte l'option B<-a>, et la passe à B<dpkg-"
+"architecture>. Voici d'autres exemples :"
+
+# type: Plain text
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr ""
+"CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+
+# type: Plain text
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+
+# type: Plain text
+#: dpkg-architecture.1:256
+msgid ""
+"Check if an architecture is equal to the current architecture or a given one:"
+msgstr ""
+"Vérifie si une architecture est identique à l'architecture actuelle ou à "
+"celle spécifiée :"
+
+# type: TP
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
+msgstr "dpkg-architecture -elinux-alpha"
+
+# type: TP
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
+msgstr "dpkg-architecture -amips -elinux-mips"
+
+# type: Plain text
+#: dpkg-architecture.1:263
+msgid ""
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
+msgstr ""
+"Vérifie si l'architecture actuelle ou celle spécifiée avec -a correspond à "
+"un système Linux :"
+
+# type: TP
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
+msgstr "dpkg-architecture -ilinux-any"
+
+# type: TP
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
+msgstr "dpkg-architecture -ai386 -ilinux-any"
+
 # type: Plain text
 #: dpkg-architecture.1:271
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
@@ -3598,2941 +4133,2848 @@ msgstr ""
 "contribué à B<dpkg>."
 
 # type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "dpkg-checkbuilddeps"
-msgstr "dpkg-checkbuilddeps"
-
 # type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
-#, no-wrap
-msgid "2006-05-23"
-msgstr "23-05-2006"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
-msgstr ""
-"dpkg-checkbuilddeps - vérifier les dépendances et les conflits de "
-"construction"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> B<-B> [I<fichier-control>]"
+#: dpkg-buildpackage.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
-msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
-msgstr ""
-"Ce programme vérifie si les dépendances et les conflits de construction "
-"listés dans le fichier control existent dans les paquets installés sur le "
-"système. S'il en existe, il les affiche et se termine avec un code de retour "
-"différent de 0."
+#: dpkg-buildpackage.1:4
+#, fuzzy
+msgid "dpkg-buildpackage - build source packages"
+msgstr "dpkg-scanpackages - créer des fichiers «\\ Packages\\ »"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
-msgstr ""
-"Normalement, le fichier I<debian/control> est lu, mais un autre fichier peut "
-"être indiqué sur la ligne de commande."
-
-# type: TP
-#: dpkg-checkbuilddeps.1:17
-#, no-wrap
-msgid "B<-B>"
-msgstr "B<-B>"
+#: dpkg-buildpackage.1:8
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg-buildpackage> [I<options>]"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
+#: dpkg-buildpackage.1:13
 msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"Ignore les lignes I<Build-Depends-Indep>. À utiliser quand aucun paquet "
-"indépendant d'une architecture ne sera construit."
+"B<dpkg-buildpackage> est un script de contrôle qui peut faciliter la "
+"construction automatique d'un paquet."
 
 # type: TP
-#: dpkg-checkbuilddeps.1:21
-#, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
-msgstr "Copyright 2001 Joey Hess"
-
-# type: UR
-#: dpkg-checkbuilddeps.1:27
-#, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:joeyh@debian.org"
-
-# type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>joeyh@debian.orgE<gt>."
-
-# type: TH
-#: dpkg-deb.1:1
+#: dpkg-buildpackage.1:15
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
-
-# type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr ""
-"dpkg-deb - outil pour la manipulation des archives (.deb) des paquets Debian"
-
-# type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<répertoire> [I<archive>|I<répertoire>]"
-
-# type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<fichier-control> ..]"
-
-# type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<champ-control> ...]"
-
-# type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-
-# type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-
-# type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
-msgstr ""
-"B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive répertoire>"
-
-# type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb> B<-e>|B< --control> I<archive répertoire>"
-
-# type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<archive>"
-
-# type: Plain text
-#: dpkg-deb.1:39
-msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
-msgstr ""
-"B<dpkg-deb> crée un paquet, dépaquette une archive ou donne des "
-"renseignements sur les archives Debian"
-
-# type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
-msgstr "B<dpkg> sert à installer ou à supprimer des paquets sur le système."
+msgid "B<-b>"
+msgstr "B<-b>"
 
 # type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-buildpackage.1:19
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
-"Il est possible d'exécuter B<dpkg-deb> en appelant B<dpkg> avec les options "
-"de B<dpkg-deb>. B<dpkg> comprend que B<dpkg-deb> est appelé et le lance."
-
-# type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
-#, no-wrap
-msgid "ACTION OPTIONS"
-msgstr "ACTION OPTIONS"
 
 # type: TP
-#: dpkg-deb.1:54
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr "B<--build>, B<-b>"
+msgid "B<-B>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-deb.1:66
+#: dpkg-buildpackage.1:23
 msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
-"Crée une archive Debian avec l'arborescence contenue dans I<répertoire>. "
-"I<répertoire> doit posséder un sous-répertoire B<DEBIAN> qui contient les "
-"fichiers de contrôle tel que le fichier «\\ control\\ » lui-même. Ce "
-"répertoire I<n'apparaît pas> dans l'archive de l'arborescence du paquet "
-"binaire\\ ; mais les fichiers qu'il contient sont mis dans la zone de "
-"contrôle du paquet binaire."
 
-# type: Plain text
-#: dpkg-deb.1:72
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
-msgstr ""
-"On peut préciser le degré de compression en ajoutant une option B<-z#>.  "
-"B<dpkg-deb> passe cette option à gzip."
+# type: TP
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:84
-msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
-msgstr ""
-"À moins de préciser B<--nocheck>, B<dpkg-deb> lit B<DEBIAN/control> et "
-"l'analyse. Il cherche les erreurs de syntaxe et d'autres problèmes existants"
-"\\ ; puis il affiche le nom du paquet binaire qu'il construit. B<dpkg-deb> "
-"vérifie aussi les permissions des scripts du responsable et des autres "
-"fichiers qu'il trouve dans le répertoire de contrôle B<DEBIAN>."
+#: dpkg-buildpackage.1:26
+#, fuzzy
+msgid "Specifies a source-only build, no binary packages need to be made."
+msgstr "Décompose en plusieurs parties un paquet binaire Debian."
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
+#, fuzzy
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"Quand aucune I<archive> n'est donnée, B<dpkg-deb> appelle le paquet "
-"I<répertoire>B<.deb>."
+"Ces options contrôlent si l'archive source originale est incluse dans "
+"l'installation produite par B<dpkg-buildpackage> et B<dpkg-genchanges> quand "
+"on construit un paquet source (les options B<-b> or B<-B> n'ont pas été "
+"utilisées)."
 
-# type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr "Si l'archive qui doit être créée existe déjà, elle est remplacée."
+# type: TP
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-buildpackage.1:40
+#, fuzzy
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
-"Quand le second argument est un répertoire, B<dpkg-deb> appelle le paquet "
-"I<paquet>B<_>I<version>B<_>I<arch>B<.deb>,B< ou bien "
-">I<paquet>B<_>I<version>B<.deb> si aucun champ B<Architecture> n'est présent "
-"dans le fichier de contrôle du paquet. Quand un répertoire cible est précisé "
-"à la place d'un fichier, l'option B<--nocheck> ne doit pas être utilisée "
-"(puisque B<dpkg-deb> a besoin de lire et d'analyser le fichier de contrôle "
-"du paquet pour connaître le nom de fichier à utiliser)."
+"Par défaut, ou quand l'option B<-si> est indiquée, les sources originales "
+"sont incluses si le numéro de version se termine par B<-0> ou B<-1>, c'est-à-"
+"dire si la partie «\\ révision Debian\\ » du numéro de version est égal à "
+"B<0> ou B<1>."
 
 # type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--info>, B<-I>"
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
-msgstr "Donne des renseignements sur une archive de paquet binaire."
+#: dpkg-buildpackage.1:43
+#, fuzzy
+msgid "Forces the inclusion of the original source."
+msgstr "L'option B<-su> dépaquète une arborescence source originelle."
 
-# type: Plain text
-#: dpkg-deb.1:117
-msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
-msgstr ""
-"Quand aucun argument I<fichier-control> n'est précisé, un résumé du contenu "
-"du paquet ainsi que son fichier «\\ control\\ » sont affichés."
+# type: TP
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-deb.1:125
-msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+#: dpkg-buildpackage.1:46
+#, fuzzy
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
-"Quand un argument I<fichier-control> est précisé, B<dpkg-deb> affiche les "
-"éléments dans l'ordre d'apparition\\ ; quand l'un des éléments n'est pas "
-"présent, il affiche un message d'erreur sur «\\ stderr\\ » et quitte avec un "
-"code égal à 2."
+"L'option B<-sa> force l'inclusion des sources originales\\ ; l'option B<-sd> "
+"force leur exclusion et inclut seulement le «\\ diff_ »."
 
 # type: TP
-#: dpkg-deb.1:125
+#: dpkg-buildpackage.1:46
 #, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--show>, B<-W>"
+msgid "B<-a>I<architecture>"
+msgstr "B<-a>I<architecture>"
 
 # type: Plain text
-#: dpkg-deb.1:132
+#: dpkg-buildpackage.1:51
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
-"Cette option donne des informations sur l'archive d'un paquet binaire selon "
-"le format spécifié par l'argument B< --showformat>. Le format par défaut "
-"affiche le nom et la version du paquet sur une seule ligne, séparés par un "
-"espace (tab)."
+"Précise l'architecture Debian pour laquelle on construit. L'architecture de "
+"la machine sur laquelle on construit est automatiquement déterminée\\ ; "
+"c'est aussi l'architecture par défaut de la machine hôte."
 
 # type: TP
-#: dpkg-deb.1:132
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
 #, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--field>, B<-f>"
-
-# type: Plain text
-#: dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
-msgstr ""
-"Extrait les renseignements du fichier «\\ control\\ » de l'archive du paquet "
-"binaire."
+msgid "B<-v>I<version>"
+msgstr "B<-v>I<version>"
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
+#, fuzzy
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
-"Quand aucun argument B<control-fichier-champ> n'est précisé, le fichier «\\ "
-"control\\ » est affiché en entier."
+"Avec B<dpkg-buildpackage>, B<dpkg-genchanges> et B<dpkg-parsechangelog> "
+"cette option force l'utilisation des informations contenues dans le fichier "
+"«\\ changelog\\ » et qui concernent toutes les versions strictement plus "
+"récentes que I<version.>"
+
+# type: TP
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B<-C>I<description-des-changements>"
 
 # type: Plain text
-#: dpkg-deb.1:148
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+#, fuzzy
 msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
-"Quand il y en a un, B<dpkg-deb> affiche ses éléments en suivant leur ordre "
-"d'apparition dans le fichier «\\ control\\ ». Quand il y a plus d'un "
-"argument B<control-fichier-field,> B<dpkg-deb> fait précéder chacun par le "
-"nom de son champ (puis par un «\\ deux-points\\ » et une espace)."
-
-# type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
-msgstr "L'absence des champs demandés ne provoque pas de message d'erreur."
+"Lit la description des changements dans le fichier I<description-des-"
+"changements> plutôt que dans le fichier «\\ changelog\\ » de l'arborescence "
+"source.  B<dpkg-buildpackage> et B<dpkg-genchanges> acceptent cette option."
 
 # type: TP
-#: dpkg-deb.1:150
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--contents>, B<-c>"
+msgid "B<-m>I<maintaineraddress>"
+msgstr "B<-m>I<adresse-du-responsable>"
 
 # type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, fuzzy
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
-"Liste seulement l'arborescence des fichiers d'une archive de paquet. C'est "
-"en fait le résultat produit par la commande B<tar> et une option "
-"d'énumération verbeuse."
+"Utilise I<adresse-du-responsable> comme nom et adresse électronique du "
+"responsable de paquet plutôt que d'utiliser les informations contenues dans "
+"le fichier «\\ control\\ » de l'arborescence source. B<dpkg-buildpackage> et "
+"B<dpkg-genchanges> acceptent cette option."
 
 # type: TP
-#: dpkg-deb.1:156
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+msgid "B<-e>I<maintaineraddress>"
+msgstr "B<-e>I<adresse-du-responsable>"
 
 # type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
+#, fuzzy
 msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
-"Extrait l'arborescence d'une archive de paquet dans le répertoire spécifié."
+"Utilise I<adresse-du-responsable> comme nom et adresse électronique du "
+"responsable de paquet pour cette mise en place, plutôt que d'utiliser les "
+"informations contenues dans le fichier «\\ changelog\\ » de l'arborescence "
+"source. B<dpkg-buildpackage> et B<dpkg-genchanges> acceptent cette option."
 
-# type: Plain text
-#: dpkg-deb.1:165
-msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
-msgstr ""
-"B<--vextract> (B<-X>) affiche la liste des fichiers au fur et à mesure "
-"qu'ils sont extraits, tandis que B<--extract> (B<-x>) ne produit pas de "
-"message, à moins qu'une erreur survienne."
+# type: TP
+#: dpkg-buildpackage.1:72
+#, no-wrap
+msgid "B<-D>"
+msgstr "B<-D>"
 
 # type: Plain text
-#: dpkg-deb.1:171
-msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+#: dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
-"Il faut remarquer que l'extraction d'un paquet dans le répertoire root I<ne "
-"produit pas> une installation correcte\\ ! Utilisez B<dpkg> pour "
-"l'installation des paquets."
+"Vérifier les dépendances de constructions et les conflits\\ ; se termine en "
+"cas de problèmes."
+
+# type: TP
+#: dpkg-buildpackage.1:75
+#, no-wrap
+msgid "B<-d>"
+msgstr "B<-d>"
 
 # type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr ""
-"I<répertoire> est créé si nécessaire (mais pas ses répertoires parents)."
+#: dpkg-buildpackage.1:78
+msgid "Do not check build dependencies and conflicts."
+msgstr "Ne pas vérifier les dépendances de constructions et les conflits."
 
 # type: TP
-#: dpkg-deb.1:174
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "B<-W>"
+msgstr "B<-W>"
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg-buildpackage.1:84
+#, fuzzy
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Extrait les données de l'arborescence d'une archive de paquet et les envoie "
-"sur la sortie standard dans le format propre à la commande B<tar>. En "
-"combinant cette option avec la commande B<tar>(1), on peut ainsi extraire un "
-"fichier précis d'une archive de paquet."
+"Cette option transforme certaines erreurs en avertissements. Seul dpkg-"
+"source l'utilise, mais B<dpkg-buildpackage> la reconnait et la transmet à "
+"B<dpkg-source>."
 
 # type: TP
-#: dpkg-deb.1:182
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "B<--control>, B<-e>"
+msgid "B<-E>"
+msgstr "B<-E>"
 
 # type: Plain text
-#: dpkg-deb.1:186
+#: dpkg-buildpackage.1:92
+#, fuzzy
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"Extrait les fichiers de contrôle d'une archive de paquet dans le répertoire "
-"spécifié."
+"Cette option transforme certaines erreurs en avertissements. Seul dpkg-"
+"source l'utilise, mais B<dpkg-buildpackage> la reconnait et la transmet à "
+"B<dpkg-source>."
+
+# type: TP
+#: dpkg-buildpackage.1:92
+#, no-wrap
+msgid "B<-nc>"
+msgstr "B<-nc>"
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
-msgstr ""
-"Quand aucun répertoire n'est précisé, on utilise un sous-répertoire "
-"B<DEBIAN> du répertoire actuel."
+#: dpkg-buildpackage.1:95
+#, fuzzy
+msgid "Do not clean the source tree (implies B<-b>)."
+msgstr "Ne pas nettoyer l'arborescence source (implique l'option -b)"
+
+# type: TP
+#: dpkg-buildpackage.1:95
+#, no-wrap
+msgid "B<-tc>"
+msgstr "B<-tc>"
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-buildpackage.1:101
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
-"Le répertoire cible est créé si nécessaire (mais pas ses répertoires "
-"parents)."
+"Nettoyage de l'arborescence (en utilisant I<commande-pour-obtenir-privilèges-"
+"de-root> B<debian/rules clean>)  après la construction du paquet."
 
 # type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
+#: dpkg-buildpackage.1:101
 #, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
+msgid "B<-r>I<gain-root-command>"
+msgstr "B<-r>I<commande-pour-obtenir-privilèges-de-root>"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
-"Affiche l'aide de B<dpkg-deb> qui résume la manière d'utiliser ses options."
-
-# type: Plain text
-#: dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Affiche le numéro de version de B<dpkg-deb>."
+"Quand B<dpkg-buildpackage> doit exécuter une partie du processus de "
+"construction en tant que root, il préfixe la commande exécutée par "
+"I<commande-pour-obtenir-privilèges-de-root>, si elle existe. I<commande-pour-"
+"obtenir-privilèges-de-root> sera le nom d'un programme présent dans le "
+"B<PATH> et ce programme prend comme argument le nom de la commande réelle à "
+"exécuter et les arguments qu'elle doit prendre. I<commande-pour-obtenir-"
+"privilèges-de-root> ne contiendra pas d'espace ni aucun « métacaractère » de "
+"l'interpréteur de commandes.  I<commande-pour-obtenir-privilèges-de-root> "
+"est classiquement B<fakeroot>, B<sudo>, B<super> ou B<really>. B<su> ne va "
+"pas, puisque ce programme demande une option B<-c> pour exécuter une commande"
+"\\ ; et même alors il ne peut qu'appeler l'interpréteur de commandes de "
+"l'utilisateur au lieu de passer directement les arguments à la commande qui "
+"doit être exécutée."
 
 # type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
+#: dpkg-buildpackage.1:127
 #, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+msgid "B<-p>I<sign-command>"
+msgstr "B<-p>I<commande-de-signature>"
 
 # type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-buildpackage.1:152
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
-"Affiche des renseignements sur le copyright de B<dpkg-deb> et l'absence de "
-"garantie. (On peut utiliser l'écriture américaine B<--license.>)"
+"Quand B<dpkg-buildpackage> doit exécuter GPG ou PGP pour signer un fichier "
+"source de contrôle (B<.dsc>) ou un fichier B<.changes>, il exécute "
+"I<commande-de-signature> (en examinant le B<PATH> si nécessaire) au lieu de "
+"B<pgp>. I<commande-de-signature> obtient tous les arguments qu'aurait obtenu "
+"B<pgp>. Si I<commande-de-signature> veut recevoir ses arguments à la manière "
+"GPG plutôt qu'à la manière PGP, on choisira l'option B<-sgpg.> I<commande-de-"
+"signature> ne contiendra pas d'espace ni aucun «\\ métacaractère\\ » de "
+"l'interpréteur de commandes."
 
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
+# type: TP
+#: dpkg-buildpackage.1:152
 #, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "AUTRES OPTIONS"
+msgid "B<-k>I<key-id>"
+msgstr "B<-k>I<key-id>"
+
+# type: Plain text
+#: dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
+msgstr "Précise une clé pour la signature des paquets."
 
 # type: TP
-#: dpkg-deb.1:211
-#, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr "B<--showformat=>I<format>"
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<-s>"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
-msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+#: dpkg-buildpackage.1:158
+#, fuzzy
+msgid "Do not sign the source package."
 msgstr ""
-"Cette option sert à spécifier le format de sortie de l'option B<--show>. Ce "
-"format sera utilisé pour chaque paquet listé."
+"Ne pas signer, respectivement, soit le paquet source, soit le fichier «\\ ."
+"changes\\ »."
+
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<-u>"
 
 # type: Plain text
-#: dpkg-deb.1:225
-msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+#: dpkg-buildpackage.1:161
+#, fuzzy
+msgid "Do not sign the .changes file."
 msgstr ""
-"Cet argument est une chaîne qui peut référencer tout champ avec la forme "
-"${I<field-name>}\\ ; une liste des champs valables peut être facilement "
-"produite avec l'option B<-I> sur le même paquet. Une explication complète "
-"des options de formatage (avec les séquences d'échappement et les espaces "
-"entre les champs) se trouve dans la page B<dpkg-query>(1), option B<--"
-"showformat>."
+"Ne pas signer, respectivement, soit le paquet source, soit le fichier «\\ ."
+"changes\\ »."
+
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, fuzzy, no-wrap
+msgid "B<-i>[I<regexp>]"
+msgstr "B<-i[E<lt>regexpE<gt>]>"
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
-msgstr "Par défaut, la valeur de ce champ est ${Package}\\et${Version}\\en."
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
+msgstr "Chaîne passée telle quelle à B<dpkg-source.>"
 
 # type: TP
-#: dpkg-deb.1:227
-#, no-wrap
-msgid "B<--new>"
-msgstr "B<--new>"
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<-n>I<nom-de-fichier>"
 
 # type: Plain text
-#: dpkg-deb.1:232
-msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
-"S'assure que B<dpkg-deb> construit une archive avec le «\\ nouveau\\ » "
-"format. C'est le comportement par défaut."
+"Fichier passé tel quel à B<dpkg-source.> Peut être plusieurs fois répétée."
 
 # type: TP
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<--old>"
-msgstr "B<--old>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir>=I<dir>"
 
 # type: Plain text
-#: dpkg-deb.1:240
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
 msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
 msgstr ""
-"Oblige B<dpkg-deb> à construire une archive avec l'«\\ ancien\\ » format. Ce "
-"format, moins facilement compris par les outils non-Debian, est maintenant "
-"dépassé. On l'utilise seulement quand on construit des paquets qui doivent "
-"être analysés par des versions de dpkg plus anciennes que la version 0.93.76 "
-"(septembre 1995), qui fut produite uniquement pour le format «\\ i386 a.out"
-"\\ »."
+"Change l'endroit où se trouve la base de données de B<dpkg>. Par défaut, "
+"c'est I</var/lib/dpkg>."
+
+# type: TP
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
+#, fuzzy, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr "B<-h>, B<--help>"
 
 # type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:185
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
-"Empêche les vérifications normales de B<dpkg-deb --build> quant au contenu "
-"proposé d'une archive. De cette façon, on peut construire n'importe quelle "
-"archive, aussi défectueuse soit-elle."
+"On devrait pouvoir mettre des espaces et des métacaractères du shell dans "
+"les arguments initiaux de I<commande-pour-obtenir-privilèges-de-root> et "
+"I<commande-de-signature>."
 
-# type: TP
-#: dpkg-deb.1:246
+# type: Plain text
+#: dpkg-buildpackage.1:192
+#, fuzzy
+msgid ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:1
 #, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--debug>, B<-D>"
+msgid "dpkg-checkbuilddeps"
+msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
-msgstr "Permet les messages de débogage. Ce n'est pas très intéressant."
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+msgstr ""
+"dpkg-checkbuilddeps - vérifier les dépendances et les conflits de "
+"construction"
 
 # type: Plain text
-#: dpkg-deb.1:254
-msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
-msgstr "B<dpkg-deb -I> I<paquet1>B<.deb> I<paquet2>B<.deb> se trompe."
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> B<-B> [I<fichier-control>]"
 
 # type: Plain text
-#: dpkg-deb.1:258
+#: dpkg-checkbuilddeps.1:14
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
-"Il n'y a pas de validation des fichiers B<.deb ;> en fait, il n'y a même pas "
-"de simple somme de contrôle."
+"Ce programme vérifie si les dépendances et les conflits de construction "
+"listés dans le fichier control existent dans les paquets installés sur le "
+"système. S'il en existe, il les affiche et se termine avec un code de retour "
+"différent de 0."
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-checkbuilddeps.1:17
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
-"N'essayez pas d'installer un logiciel avec B<dpkg-deb !> Vous devez utiliser "
-"B<dpkg> pour être sûr que tous ses fichiers sont correctement mis en place, "
-"que les scripts du paquet sont exécutés et que son contenu et son état sont "
-"enregistrés."
-
-# type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+"Normalement, le fichier I<debian/control> est lu, mais un autre fichier peut "
+"être indiqué sur la ligne de commande."
 
 # type: Plain text
-#: dpkg-deb.1:278
+#: dpkg-checkbuilddeps.1:27
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
-"B<dpkg-deb> et cette page de manuel ont été écrits par Ian Jackson. Le "
-"copyright (C) date de 1995-1996 et ils ont paru sous la licence «\\ GNU "
-"General Public Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de "
-"garantie. Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-"
-"licenses/GPL> pour des précisions."
+"Ignore les lignes I<Build-Depends-Indep>. À utiliser quand aucun paquet "
+"indépendant d'une architecture ne sera construit."
 
-# type: TH
-#: dpkg-divert.8:1
+# type: TP
+#: dpkg-checkbuilddeps.1:27
 #, no-wrap
-msgid "dpkg-divert"
-msgstr "dpkg-divert"
+msgid "B<-h>"
+msgstr "B<-h>"
 
 # type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
-msgstr ""
-"dpkg-divert - remplacer la version d'un fichier contenu dans un paquet."
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
 
-# type: Plain text
-#: dpkg-divert.8:10
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fichierE<gt>>"
+# type: UR
+#: dpkg-checkbuilddeps.1:33
+#, no-wrap
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fichierE<gt>>"
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>joeyh@debian.orgE<gt>."
+
+# type: TP
+#: dpkg-distaddfile.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-distaddfile"
+msgstr "dpkg-statoverride"
 
 # type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--list> I<E<lt>motif-de-rechercheE<gt>>"
+#: dpkg-distaddfile.1:4
+#, fuzzy
+msgid "dpkg-distaddfile - add entries to debian/files"
+msgstr ""
+"B<dpkg-distaddfile> ajoute une entrée pour un fichier dans B<debian/files.>"
 
 # type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fichierE<gt>>"
+#: dpkg-distaddfile.1:8
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg-distaddfile> [I<options>]I< fichier section priorité>"
 
 # type: Plain text
-#: dpkg-divert.8:36
-msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
-"Le «\\ détournement\\ » de fichier est un moyen d'obliger B<dpkg>(1) à "
-"installer un fichier non pas dans l'emplacement prévu mais dans un autre. "
-"Les scripts des paquets Debian se servent de la déviation pour déplacer les "
-"fichiers qui créent des conflits. Les administrateurs s'en servent, lors de "
-"l'installation d'une version plus récente d'un paquet, pour remplacer les "
-"fichiers de configuration de certains paquets, ou bien à chaque fois que des "
-"fichiers (qui ne sont pas des «\\ conffiles\\ ») doivent être préservés par "
-"dpkg."
+"B<dpkg-distaddfile> ajoute une entrée pour un fichier dans B<debian/files.>"
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-distaddfile.1:18
+#, fuzzy
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
+msgstr ""
+"B<dpkg-distaddfile> ne prend pas d'option particulière. Il prend trois "
+"arguments sans option, à savoir le nom du fichier, la section et la "
+"priorité, pour le fichier B<.changes>."
+
+# type: Plain text
+#: dpkg-distaddfile.1:26
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
-"B<dpkg-divert> sert à créer et à mettre à jour la liste des détournements. "
-"Il possède trois modes élémentaires, l'ajout, la suppression et le listage "
-"d'un détournement. Les options sont respectivement B<--add>, B<--remove> et "
-"B<--list>. De plus, il peut afficher le vrai nom d'un fichier détourné avec "
-"B<--truename>. On peut indiquer d'autres options (voyez la liste ci-dessous)."
+"Le nom du fichier sera indiqué relativement au répertoire dans lequel B<dpkg-"
+"genchanges> s'attend à trouver les fichiers, habituellement B<..>, plutôt "
+"que relativement au répertoire dans lequel est exécuté B<dpkg-distaddfile.>"
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>répertoireE<gt>>"
+msgid "B<-f>I<fileslistfile>"
+msgstr "B<-f>I<fichier/liste-des-fichiers>"
 
 # type: Plain text
-#: dpkg-divert.8:48
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
+#, fuzzy
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
-"Définit le répertoire de données de Dpkg comme I<E<lt>répertoireE<gt>> (par "
-"défaut c'est I</var/lib/dpkg>)."
+"Lit ou écrit la liste des fichiers qui doivent être mis en place dans le "
+"fichier I<fichier/liste-des-fichiers,> plutôt que dans le fichier B<debian/"
+"files.> B<dpkg-gencontrol>, B<dpkg-genchanges> et B<dpkg-distaddfile> "
+"acceptent cette option."
 
 # type: TP
-#: dpkg-divert.8:48
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<--divert>I< E<lt>détourner-dansE<gt>>"
+msgid "B<debian/files>"
+msgstr "B<debian/files>"
 
 # type: Plain text
-#: dpkg-divert.8:52
+#: dpkg-distaddfile.1:46
 msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
-"I<E<lt>détourner-dansE<gt>> est l'emplacement vers lequel les versions de "
-"I<E<lt>fichierE<gt>>, tel qu'il est donné par d'autres paquets, seront "
-"détournées."
 
-# type: TP
-#: dpkg-divert.8:52
+# type: TH
+#: dpkg-deb.1:1
 #, no-wrap
-msgid "B<--local>"
-msgstr "B<--local>"
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
+
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "17-06-2006"
+
+# type: Plain text
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr ""
+"dpkg-deb - outil pour la manipulation des archives (.deb) des paquets Debian"
+
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-divert.8:58
+#: dpkg-deb.1:13
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
-"Indique que toutes les versions de ce fichier sont détournées. Cela signifie "
-"qu'il n'y a pas d'exception et quelque soit le paquet installé, ce fichier "
-"sera détourné. Un administrateur peut par exemple installer une version "
-"modifiée localement."
+"B<dpkg-deb> crée un paquet, dépaquette une archive ou donne des "
+"renseignements sur les archives Debian"
 
-# type: TP
-#: dpkg-divert.8:58
-#, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<--package>I< E<lt>paquetE<gt>>"
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
+msgstr "B<dpkg> sert à installer ou à supprimer des paquets sur le système."
 
 # type: Plain text
-#: dpkg-divert.8:63
+#: dpkg-deb.1:27
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
-"I<E<lt>paquetE<gt>> est le nom du paquet dont la copie de "
-"I<E<lt>fichierE<gt>> ne sera pas détournée. Autrement dit, "
-"I<E<lt>fichierE<gt>> sera détourné sauf s'il appartient à "
-"I<E<lt>paquetE<gt>>."
+"Il est possible d'exécuter B<dpkg-deb> en appelant B<dpkg> avec les options "
+"de B<dpkg-deb>. B<dpkg> comprend que B<dpkg-deb> est appelé et le lance."
 
-# type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
-#, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+# type: Plain text
+#: dpkg-deb.1:29
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<répertoire> [I<archive>|I<répertoire>]"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
-msgstr "Mode silencieux, pas de bavardage."
+#: dpkg-deb.1:41
+msgid ""
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
+msgstr ""
+"Crée une archive Debian avec l'arborescence contenue dans I<répertoire>. "
+"I<répertoire> doit posséder un sous-répertoire B<DEBIAN> qui contient les "
+"fichiers de contrôle tel que le fichier «\\ control\\ » lui-même. Ce "
+"répertoire I<n'apparaît pas> dans l'archive de l'arborescence du paquet "
+"binaire\\ ; mais les fichiers qu'il contient sont mis dans la zone de "
+"contrôle du paquet binaire."
 
-# type: TP
-#: dpkg-divert.8:66
-#, no-wrap
-msgid "B<--rename>"
-msgstr "B<--rename>"
+# type: Plain text
+#: dpkg-deb.1:53
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
+msgstr ""
+"À moins de préciser B<--nocheck>, B<dpkg-deb> lit B<DEBIAN/control> et "
+"l'analyse. Il cherche les erreurs de syntaxe et d'autres problèmes existants"
+"\\ ; puis il affiche le nom du paquet binaire qu'il construit. B<dpkg-deb> "
+"vérifie aussi les permissions des scripts du responsable et des autres "
+"fichiers qu'il trouve dans le répertoire de contrôle B<DEBIAN>."
 
 # type: Plain text
-#: dpkg-divert.8:70
+#: dpkg-deb.1:60
 msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
-"Met en fait le fichier de côté. Quand le fichier de destination existe, dpkg-"
-"divert interrompt l'opération."
+"Quand aucune I<archive> n'est donnée, B<dpkg-deb> appelle le paquet "
+"I<répertoire>B<.deb>."
 
-# type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
-#, no-wrap
-msgid "B<--test>"
-msgstr "B<--test>"
+# type: Plain text
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
+msgstr "Si l'archive qui doit être créée existe déjà, elle est remplacée."
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
-msgstr "Mode de test, ne rien modifier réellement, seulement montrer."
+#: dpkg-deb.1:78
+msgid ""
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
+msgstr ""
+"Quand le second argument est un répertoire, B<dpkg-deb> appelle le paquet "
+"I<paquet>B<_>I<version>B<_>I<arch>B<.deb>,B< ou bien "
+">I<paquet>B<_>I<version>B<.deb> si aucun champ B<Architecture> n'est présent "
+"dans le fichier de contrôle du paquet. Quand un répertoire cible est précisé "
+"à la place d'un fichier, l'option B<--nocheck> ne doit pas être utilisée "
+"(puisque B<dpkg-deb> a besoin de lire et d'analyser le fichier de contrôle "
+"du paquet pour connaître le nom de fichier à utiliser)."
 
 # type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
-msgstr "Affiche quelques instructions d'aide, et se termine normalement."
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<fichier-control> ..]"
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
-msgstr "Affiche le nom du programme et sa version puis se termine normalement."
+#: dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
+msgstr "Donne des renseignements sur une archive de paquet binaire."
 
-# type: SH
-#: dpkg-divert.8:80
-#, no-wrap
-msgid "NOTES"
-msgstr "NOTES"
+# type: Plain text
+#: dpkg-deb.1:86
+msgid ""
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
+msgstr ""
+"Quand aucun argument I<fichier-control> n'est précisé, un résumé du contenu "
+"du paquet ainsi que son fichier «\\ control\\ » sont affichés."
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg-deb.1:94
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
-"Pour l'ajout, le défaut est B<--local> et B<--divert> I< E<lt>originalE<gt>."
-"distrib>. Pour la suppression, B<--package> ou B<--local> et B<--divert> "
-"doivent correspondre quand ils sont précisés."
+"Quand un argument I<fichier-control> est précisé, B<dpkg-deb> affiche les "
+"éléments dans l'ordre d'apparition\\ ; quand l'un des éléments n'est pas "
+"présent, il affiche un message d'erreur sur «\\ stderr\\ » et quitte avec un "
+"code égal à 2."
 
 # type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
-msgstr "On ne peut pas détourner des répertoires avec B<dpkg-divert>."
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg-deb.1:101
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
-"Il faut faire attention quand une bibliothèque partagée est détournée. "
-"B<ldconfig>(8) crée un lien symbolique à partir du champ DT_SONAME embarqué "
-"dans la bibliothèque. ldconfig ne connaît pas les détournements (seul dpkg "
-"le fait), et si une bibliothèque détournée possède le même SONAME que la "
-"bibliothèque non détournée, le lien symbolique peut pointer en fin de compte "
-"sur la bibliothèque détournée."
+"Cette option donne des informations sur l'archive d'un paquet binaire selon "
+"le format spécifié par l'argument B< --showformat>. Le format par défaut "
+"affiche le nom et la version du paquet sur une seule ligne, séparés par un "
+"espace (tab)."
 
 # type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<champ-control> ...]"
+
+# type: Plain text
+#: dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
 msgstr ""
-"Pour détourner toutes les copies de I</usr/bin/example> vers I</usr/bin/"
-"example.foo>, c'est-à-dire demander aux paquets qui fournissent I</usr/bin/"
-"example> de l'installer dans I</usr/bin/example.foo>, en effectuant le "
-"changement de nom si nécessaire\\ :"
+"Extrait les renseignements du fichier «\\ control\\ » de l'archive du paquet "
+"binaire."
 
 # type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
-msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+#: dpkg-deb.1:108
+msgid ""
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
+msgstr ""
+"Quand aucun argument B<control-fichier-champ> n'est précisé, le fichier «\\ "
+"control\\ » est affiché en entier."
 
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
-msgstr "Pour supprimer ce détournement\\ :"
+#: dpkg-deb.1:117
+msgid ""
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
+msgstr ""
+"Quand il y en a un, B<dpkg-deb> affiche ses éléments en suivant leur ordre "
+"d'apparition dans le fichier «\\ control\\ ». Quand il y a plus d'un "
+"argument B<control-fichier-field,> B<dpkg-deb> fait précéder chacun par le "
+"nom de son champ (puis par un «\\ deux-points\\ » et une espace)."
 
 # type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --rename --remove /usr/bin/example"
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
+msgstr "L'absence des champs demandés ne provoque pas de message d'erreur."
 
 # type: Plain text
-#: dpkg-divert.8:107
-msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
-msgstr ""
-"Pour détourner un paquet qui veut installer I</usr/bin/example> dans I</usr/"
-"bin/example.foo>, sauf votre propre paquet I<wibble>\\ :"
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 # type: Plain text
-#: dpkg-divert.8:109
+#: dpkg-deb.1:125
 msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+"Liste seulement l'arborescence des fichiers d'une archive de paquet. C'est "
+"en fait le résultat produit par la commande B<tar> et une option "
+"d'énumération verbeuse."
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
-
-# type: TP
-#: dpkg-divert.8:115
-#, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/diversions>"
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B< --control> I<archive répertoire>"
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-deb.1:129
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
-"Ce fichier contient la liste des détournements en oeuvre sur le système. Il "
-"se trouve dans le répertoire d'administration de dpkg, avec d'autres "
-"fichiers importants comme «\\ status\\ » ou «\\ available\\ »."
+"Extrait l'arborescence d'une archive de paquet dans le répertoire spécifié."
 
 # type: Plain text
-#: dpkg-divert.8:123
+#: dpkg-deb.1:135
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
-"Note : B<dpkg-divert> préserve l'ancienne copie de ce fichier, avec "
-"l'extension «\\ -old\\ », avant de la remplacer par la nouvelle."
+"Il faut remarquer que l'extraction d'un paquet dans le répertoire root I<ne "
+"produit pas> une installation correcte\\ ! Utilisez B<dpkg> pour "
+"l'installation des paquets."
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr "Copyright (C) 1995 Ian Jackson."
-
-# type: TH
-#: dpkg-name.1:6
-#, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-name"
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
+msgstr ""
+"I<répertoire> est créé si nécessaire (mais pas ses répertoires parents)."
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
-msgstr "dpkg-name - redonne aux paquets Debian leur nom complet"
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B< --control> I<archive répertoire>"
 
 # type: Plain text
-#: dpkg-name.1:22
+#: dpkg-deb.1:143
+#, fuzzy
 msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<rep>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version> [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<fichiers>]"
+"B<--vextract> (B<-X>) affiche la liste des fichiers au fur et à mesure "
+"qu'ils sont extraits, tandis que B<--extract> (B<-x>) ne produit pas de "
+"message, à moins qu'une erreur survienne."
+
+# type: Plain text
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<archive>"
 
 # type: Plain text
-#: dpkg-name.1:33
+#: dpkg-deb.1:151
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
-"Cette page de manuel documente le script sh B<dpkg-name>. Celui-ci fournit "
-"une façon simple de redonner aux paquets B<Debian> leur nom complet. Ce nom "
-"consiste en une chaîne «\\ "
-"E<lt>paquetE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb\\ » telle "
-"qu'elle est indiquée dans le fichier «\\ control\\ » du paquet. La partie "
-"E<lt>versionE<gt> du nom est composée d'informations sur la version «\\ "
-"originale\\ » qui peuvent ou non être suivies d'un trait d'union et "
-"d'informations sur la révision."
-
-# type: TP
-#: dpkg-name.1:34
-#, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<-a, --no-architecture>"
+"Extrait les données de l'arborescence d'une archive de paquet et les envoie "
+"sur la sortie standard dans le format propre à la commande B<tar>. En "
+"combinant cette option avec la commande B<tar>(1), on peut ainsi extraire un "
+"fichier précis d'une archive de paquet."
 
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
-msgstr "Le nom du fichier n'aura pas l'information sur l'architecture."
-
-# type: TP
-#: dpkg-name.1:37
-#, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<-k, --symlink>"
+#: dpkg-deb.1:151
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B< --control> I<archive répertoire>"
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
-msgstr "Faire un lien symbolique plutôt qu'une création de fichier."
+#: dpkg-deb.1:155
+msgid ""
+"Extracts the control information files from a package archive into the "
+"specified directory."
+msgstr ""
+"Extrait les fichiers de contrôle d'une archive de paquet dans le répertoire "
+"spécifié."
 
-# type: TP
-#: dpkg-name.1:40
-#, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<-o, --overwrite>"
+# type: Plain text
+#: dpkg-deb.1:159
+msgid ""
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
+msgstr ""
+"Quand aucun répertoire n'est précisé, on utilise un sous-répertoire "
+"B<DEBIAN> du répertoire actuel."
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-deb.1:162
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"Remplace des fichiers existants s'ils ont le même nom que le fichier de "
-"destination."
+"Le répertoire cible est créé si nécessaire (mais pas ses répertoires "
+"parents)."
 
 # type: TP
-#: dpkg-name.1:44
-#, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<-s, --subdir> [I<rep>]"
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
+#, fuzzy, no-wrap
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence> | B<--license>"
 
 # type: Plain text
-#: dpkg-name.1:56
-msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
-"Met les fichiers dans rep. Si le répertoire donné en argument existe, les "
-"fichiers sont déplacés dans ce répertoire\\ ; sinon le répertoire cible, "
-"extrait du champ «\\ section\\ » que contient la partie de contrôle du "
-"paquet, sera «\\ unstable/binary-E<lt>architectureE<gt>/E<lt>sectionE<gt>\\ "
-"». Quand la section est «\\ non-free\\ » ou «\\ contrib\\ », ou bien quand "
-"aucune information sur la section n'est trouvée dans le fichier «\\ control"
-"\\ », le répertoire cible est «\\ E<lt>sectionE<gt>/binary-"
-"E<lt>architectureE<gt>\\ ». Le champ «\\ section\\ » est facultatif\\ ; "
-"aussi beaucoup de paquets sont dans la zone «\\ no-section\\ ». Utilisez "
-"cette option avec soin\\ : elle est compliquée."
 
 # type: TP
-#: dpkg-name.1:56
+#: dpkg-deb.1:173
 #, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr "B<-c, --create-dir>"
+msgid "B<--showformat=>I<format>"
+msgstr "B<--showformat=>I<format>"
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
-"On peut utiliser cette option avec l'option -s. Quand un répertoire cible "
-"n'est pas trouvé, il est créé automatiquement.  B<Utilisez cette option avec "
-"soin.>"
+"Cette option sert à spécifier le format de sortie de l'option B<--show>. Ce "
+"format sera utilisé pour chaque paquet listé."
 
-# type: TP
-#: dpkg-name.1:61
-#, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<-h, --help>"
+# type: Plain text
+#: dpkg-deb.1:187
+msgid ""
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
+msgstr ""
+"Cet argument est une chaîne qui peut référencer tout champ avec la forme "
+"${I<field-name>}\\ ; une liste des champs valables peut être facilement "
+"produite avec l'option B<-I> sur le même paquet. Une explication complète "
+"des options de formatage (avec les séquences d'échappement et les espaces "
+"entre les champs) se trouve dans la page B<dpkg-query>(1), option B<--"
+"showformat>."
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
-msgstr "Affiche une aide et se termine normalement."
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr "Par défaut, la valeur de ce champ est ${Package}\\et${Version}\\en."
 
 # type: TP
-#: dpkg-name.1:64
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<-v, --version>"
+msgid "B<-z>I<compress_level>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-msgid "Print version information and exit successfully."
-msgstr "Affiche la version et se termine normalement."
+#: dpkg-deb.1:193
+msgid ""
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
+msgstr ""
 
 # type: TP
-#: dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<-l, --license>"
+#: dpkg-deb.1:193
+#, fuzzy, no-wrap
+msgid "B<-Z>I<compress_type>"
+msgstr "B<-t>I<type>"
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-deb.1:198
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
-"Affiche les informations sur le copyright et sur la licence (avec une "
-"référence à GNU), puis se termine normalement."
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-deb.1:198
 #, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
-msgstr "B<dpkg-name bar-foo.deb>"
+msgid "B<--new>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-deb.1:203
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
-"Le nom du fichier «\\ bar-foo.deb\\ » devient «\\ bar-foo_1.0-2_i386.deb\\ » "
-"ou quelque chose de similaire suivant les renseignements que contient la "
-"partie de contrôle de «\\ bar-foo.deb\\ »."
+"S'assure que B<dpkg-deb> construit une archive avec le «\\ nouveau\\ » "
+"format. C'est le comportement par défaut."
 
 # type: TP
-#: dpkg-name.1:77
+#: dpkg-deb.1:203
 #, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
-msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgid "B<--old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-deb.1:211
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
-"Cette commande redonne leur nom complet à tous les fichiers qui se trouvent "
-"dans le répertoire /root/debian et ses sous-répertoires et qui possèdent une "
-"extension «\\ deb\\ », mais supprime l'information sur l'architecture."
-
-# type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
-msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+"Oblige B<dpkg-deb> à construire une archive avec l'«\\ ancien\\ » format. Ce "
+"format, moins facilement compris par les outils non-Debian, est maintenant "
+"dépassé. On l'utilise seulement quand on construit des paquets qui doivent "
+"être analysés par des versions de dpkg plus anciennes que la version 0.93.76 "
+"(septembre 1995), qui fut produite uniquement pour le format «\\ i386 a.out"
+"\\ »."
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-deb.1:217
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
-"B<Ne faites pas ça !> L'archive sera complètement gâchée par des paquets qui "
-"ne possèdent pas d'informations sur la section. B<Ne faites pas ça !>"
+"Empêche les vérifications normales de B<dpkg-deb --build> quant au contenu "
+"proposé d'une archive. De cette façon, on peut construire n'importe quelle "
+"archive, aussi défectueuse soit-elle."
 
 # type: TP
-#: dpkg-name.1:88
-#, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+#: dpkg-deb.1:217
+#, fuzzy, no-wrap
+msgid "B<-D>, B<--debug>"
+msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
-msgstr ""
-"On peut se servir de cette commande lors de la construction d'un nouveau "
-"paquet."
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
+msgstr "Permet les messages de débogage. Ce n'est pas très intéressant."
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:226
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
-msgstr ""
-"Certains paquets ne respectent pas l'organisation "
-"E<lt>paquetE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Les paquets "
-"traités par dpkg-name la respecte. Cela n'a pas de conséquence sur la façon "
-"dont B<dselect>(1) ou B<dpkg>(1) installe les paquets, mais il se peut que "
-"d'autres systèmes d'installation aient besoin de cette organisation."
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+msgstr "B<dpkg-deb -I> I<paquet1>B<.deb> I<paquet2>B<.deb> se trompe."
 
 # type: Plain text
-#: dpkg-name.1:107
+#: dpkg-deb.1:230
 msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
-
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
+"Il n'y a pas de validation des fichiers B<.deb ;> en fait, il n'y a même pas "
+"de simple somme de contrôle."
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-deb.1:237
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
-"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> est un logiciel libre"
-"\\ ; voyez la «\\ GNU General Public Licence\\ » version 2 ou supérieure "
-"pour le copyright. Il n'y a B<pas> de garantie."
+"N'essayez pas d'installer un logiciel avec B<dpkg-deb !> Vous devez utiliser "
+"B<dpkg> pour être sûr que tous ses fichiers sont correctement mis en place, "
+"que les scripts du paquet sont exécutés et que son contenu et son état sont "
+"enregistrés."
 
 # type: Plain text
-#: dpkg-query.1:1
-#, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-query"
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
-msgstr "dpkg-query - Un outil pour interroger la base de données de dpkg"
-
-# type: TP
-#: dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-l>|B<--list> I<nom-paquet-motif> ..."
-
-# type: TP
-#: dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-W>|B<--show> I<nom-paquet-motif> ..."
-
-# type: TP
-#: dpkg-query.1:17
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg-query> B<-s>|B<--status> I<nom-paquet> ..."
-
-# type: TP
-#: dpkg-query.1:21
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<nom-paquet> ..."
-
-# type: TP
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
-msgstr "B<dpkg-query> B<-S>|B<--search> I<motif-de-recherche> ..."
+#: dpkg-deb.1:252
+msgid ""
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
+msgstr ""
+"B<dpkg-deb> et cette page de manuel ont été écrits par Ian Jackson. Le "
+"copyright (C) date de 1995-1996 et ils ont paru sous la licence «\\ GNU "
+"General Public Licence\\ », version 2 ou supérieure\\ ; il n'y a PAS de "
+"garantie. Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-"
+"licenses/GPL> pour des précisions."
 
-# type: TP
-#: dpkg-query.1:29
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<nom-paquet> ..."
+# type: TH
+#: dpkg-divert.8:1
+#, no-wrap
+msgid "dpkg-divert"
+msgstr "dpkg-divert"
 
-# type: TP
-#: dpkg-query.1:32
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg-query> B<--licence>|B<--license>"
+# type: Plain text
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
+msgstr ""
+"dpkg-divert - remplacer la version d'un fichier contenu dans un paquet."
 
 # type: Plain text
-#: dpkg-query.1:35
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg-query> B<--version>"
+#: dpkg-divert.8:9
+#, fuzzy
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-divert.8:13
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
-"B<dpkg-query> est un outil pour afficher des informations sur les paquets "
-"connus par la base de données de B<dpkg>."
 
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
-msgstr "COMMANDES"
+# type: Plain text
+#: dpkg-divert.8:23
+msgid ""
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
+msgstr ""
+"Le «\\ détournement\\ » de fichier est un moyen d'obliger B<dpkg>(1) à "
+"installer un fichier non pas dans l'emplacement prévu mais dans un autre. "
+"Les scripts des paquets Debian se servent de la déviation pour déplacer les "
+"fichiers qui créent des conflits. Les administrateurs s'en servent, lors de "
+"l'installation d'une version plus récente d'un paquet, pour remplacer les "
+"fichiers de configuration de certains paquets, ou bien à chaque fois que des "
+"fichiers (qui ne sont pas des «\\ conffiles\\ ») doivent être préservés par "
+"dpkg."
 
 # type: TP
-#: dpkg-query.1:41
-#, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<-l> | B<--list> I<nom-paquet-motif> ..."
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<[--] >I<nom-de-fichier>"
 
 # type: Plain text
-#: dpkg-query.1:50
-msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
-"Liste les paquets correspondants au motif donné. Quand on ne donne aucun "
-"I<nom-paquet-motif>, tous les paquets listés dans I</var/lib/dpkg/status> "
-"sont affichés, sauf ceux dont l'état est «\\ purge\\ ». Les métacaractères "
-"ordinaires de l'interpréteur de commandes sont autorisés dans I<nom-paquet-"
-"motif>. Il faudra sans doute mettre I<nom-paquet-motif> entre apostrophes "
-"pour éviter l'expansion des noms de fichier par l'interpréteur de commandes. "
-"Par exemple, tous les paquets dont le nom commence par «\\ libc6\\ » seront "
-"affichés par la commande\\ :"
+
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--remove>I< E<lt>fichierE<gt>>"
 
 # type: Plain text
-#: dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+#: dpkg-divert.8:31
+#, fuzzy
+msgid "Remove a diversion for I<file>."
+msgstr "Pour supprimer ce détournement\\ :"
+
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--list> [I<E<lt>exp-regE<gt>>]"
 
 # type: Plain text
-#: dpkg-query.1:60
-msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
-"On ne peut pas configurer le format de sortie de cette option. Il s'adapte "
-"automatiquement à la largeur du terminal. Ce format est destiné aux humains "
-"et la machine le lit mal. Voyez B<-W> (B<--show>) et B<--showformat> pour "
-"une possible configuration de ce format."
 
 # type: TP
-#: dpkg-query.1:60
-#, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<-W> | B<--show> I<nom-paquet-motif>..."
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-query.1:67
-msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
-msgstr ""
-"Tout comme l'option B<--list>, cette option affiche la liste des paquets qui "
-"correspondent au motif donné. La sortie peut cependant être formatée en "
-"utilisant l'option B<--showformat>. Le format de sortie par défaut est le "
-"suivant\\ : une ligne pour chaque paquet, avec le nom et la version "
-"installée, séparé par une tabulation."
+#: dpkg-divert.8:37
+#, fuzzy
+msgid "Print the real name for a diverted file."
+msgstr "Affiche la valeur d'une seule variable."
 
 # type: TP
-#: dpkg-query.1:67
-#, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<-s> | B<--status> I<nom-paquet> ..."
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir> I<répertoire>"
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-divert.8:42
+#, fuzzy
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
-"Donne l'état du paquet indiqué. C'est simplement l'affichage de l'entrée de "
-"la base de données concernant les états des paquets installés."
+"Définit le répertoire de données de Dpkg comme I<E<lt>répertoireE<gt>> (par "
+"défaut c'est I</var/lib/dpkg>)."
 
 # type: TP
-#: dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<-L> | B<--listfiles> I<paquet> ..."
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<--divert>I< E<lt>détourner-dansE<gt>>"
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-divert.8:46
+#, fuzzy
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
-"Affiche la liste des fichiers de I<paquet> installés sur le système. Il faut "
-"remarquer cependant que les fichiers créés par les scripts d'installation "
-"particuliers au paquet ne sont pas affichés."
+"I<E<lt>détourner-dansE<gt>> est l'emplacement vers lequel les versions de "
+"I<E<lt>fichierE<gt>>, tel qu'il est donné par d'autres paquets, seront "
+"détournées."
 
 # type: TP
-#: dpkg-query.1:76
+#: dpkg-divert.8:46
 #, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
-msgstr "B<-S> | B<--search> I<motif-de-recherche> ..."
+msgid "B<--local>"
+msgstr "B<--local>"
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-divert.8:52
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
-"Recherche un nom de fichier dans les paquets installés. On peut utiliser "
-"dans le motif tous les métacaractères de l'interpréteur de commandes. Cette "
-"commande ne donne pas les fichiers supplémentaires créés par les scripts du "
-"responsable de paquet, ni les alternatives."
+"Indique que toutes les versions de ce fichier sont détournées. Cela signifie "
+"qu'il n'y a pas d'exception et quelque soit le paquet installé, ce fichier "
+"sera détourné. Un administrateur peut par exemple installer une version "
+"modifiée localement."
 
 # type: TP
-#: dpkg-query.1:82
-#, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<-p> |B<--print-avail> I<paquet>"
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<--package>I< E<lt>paquetE<gt>>"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-divert.8:57
+#, fuzzy
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
-"Affiche des renseignements détaillés sur I<paquet>, tels qu'ils sont trouvés "
-"dans le fichier I</var/lib/dpkg/available>."
+"I<E<lt>paquetE<gt>> est le nom du paquet dont la copie de "
+"I<E<lt>fichierE<gt>> ne sera pas détournée. Autrement dit, "
+"I<E<lt>fichierE<gt>> sera détourné sauf s'il appartient à "
+"I<E<lt>paquetE<gt>>."
 
 # type: TP
-#: dpkg-query.1:86
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
 #, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence> | B<--license>"
-
-# type: Plain text
-#: dpkg-query.1:89
-msgid "Display licence and copyright information."
-msgstr "Affiche des renseignements sur la licence et le copyright."
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
 
 # type: Plain text
-#: dpkg-query.1:92
-msgid "Display version information."
-msgstr "Affiche des renseignements sur la version."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
+msgstr "Mode silencieux, pas de bavardage."
 
 # type: TP
-#: dpkg-query.1:94
+#: dpkg-divert.8:60
 #, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir>=I<dir>"
+msgid "B<--rename>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-divert.8:64
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
-"Change l'endroit où se trouve la base de données de B<dpkg>. Par défaut, "
-"c'est I</var/lib/dpkg>."
+"Met en fait le fichier de côté. Quand le fichier de destination existe, dpkg-"
+"divert interrompt l'opération."
 
 # type: TP
-#: dpkg-query.1:98
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
 #, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<-f> | B<--showformat=>I<format>"
+msgid "B<--test>"
+msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
-msgstr "Dans la chaîne, \\(lqB<\\e>\\(rq déspécifie le caractère"
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+msgstr "Mode de test, ne rien modifier réellement, seulement montrer."
 
-# type: Plain text
-#: dpkg-query.1:111
+# type: SH
+#: dpkg-divert.8:74
 #, no-wrap
-msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
-msgstr ""
-"    B<\\en>  nouvelle ligne\n"
-"    B<\\er>  retour chariot\n"
-"    B<\\et>  tabulation\n"
+msgid "NOTES"
+msgstr "NOTES"
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-divert.8:78
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
-"\\(lqB<\\e>\\(rq avant un caractère supprime la signification du caractère "
-"qui suit. C'est utile pour les caractères \\(lqB<\\e>\\(rq and \\(lqB<$>"
-"\\(rq."
+"Pour l'ajout, le défaut est B<--local> et B<--divert> I< E<lt>originalE<gt>."
+"distrib>. Pour la suppression, B<--package> ou B<--local> et B<--divert> "
+"doivent correspondre quand ils sont précisés."
 
 # type: Plain text
-#: dpkg-query.1:122
-msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
-msgstr ""
-"On peut indiquer un paquet en insérant des appels de variables spécifiant "
-"des champs du paquet avec la syntaxe suivante\\ : \\(lqB<${>I<field>[B<;"
-">I<width>]B<}>\\(rq. Les champs sont alignés à droite, à moins que la "
-"largeur ne soit négative, auquel cas ils sont alignés à gauche. Les champs "
-"suivants sont reconnus\\ :"
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
+msgstr "On ne peut pas détourner des répertoires avec B<dpkg-divert>."
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
+#: dpkg-divert.8:86
 msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\"\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+"Il faut faire attention quand une bibliothèque partagée est détournée. "
+"B<ldconfig>(8) crée un lien symbolique à partir du champ DT_SONAME embarqué "
+"dans la bibliothèque. ldconfig ne connaît pas les détournements (seul dpkg "
+"le fait), et si une bibliothèque détournée possède le même SONAME que la "
+"bibliothèque non détournée, le lien symbolique peut pointer en fin de compte "
+"sur la bibliothèque détournée."
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-divert.8:91
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
-"Le format par défaut est le suivant\\ : \\(lqB<${Paquet}\\et${Version}\\en>"
-"\\(rq. Tous les autres champs du fichier status, par exemple des champs "
-"définis par l'utilisateur, peuvent être demandés. Ils seront affichés mais "
-"sans aucune mise en forme et aucune vérification n'est faite. Pour obtenir "
-"le nom du responsable de dpkg et la version installée, exécutez par exemple :"
+"Pour détourner toutes les copies de I</usr/bin/example> vers I</usr/bin/"
+"example.foo>, c'est-à-dire demander aux paquets qui fournissent I</usr/bin/"
+"example> de l'installer dans I</usr/bin/example.foo>, en effectuant le "
+"changement de nom si nécessaire\\ :"
 
 # type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
-msgstr "B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 
-# type: SH
-#: dpkg-query.1:167
-#, no-wrap
-msgid "ENVIRONMENT"
-msgstr "ENVIRONNEMENT"
+# type: Plain text
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
+msgstr "Pour supprimer ce détournement\\ :"
+
+# type: Plain text
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --rename --remove /usr/bin/example"
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-divert.8:101
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
-"Fixer le nombre de colonnes influence la sortie de l'option B<--list> en "
-"modifiant la largeur d'affichage."
+"Pour détourner un paquet qui veut installer I</usr/bin/example> dans I</usr/"
+"bin/example.foo>, sauf votre propre paquet I<wibble>\\ :"
 
 # type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
-
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:wakkerma@debian.org"
+#: dpkg-divert.8:103
+msgid ""
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
+msgstr ""
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
-msgstr "dpkg-scanpackages"
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-divert.8:109
 #, no-wrap
-msgid "2006-05-10"
-msgstr "10-05-2006"
-
-# type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
-msgstr "dpkg-scanpackages - créer des fichiers «\\ Packages\\ »"
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
+#: dpkg-divert.8:114
 msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>>] [B<-m>] I<rep-de-"
-"binaires> I<fichier-d'-override> [I<chemin-à-préfixer>] B<E<gt>> I<Packages>"
+"Ce fichier contient la liste des détournements en oeuvre sur le système. Il "
+"se trouve dans le répertoire d'administration de dpkg, avec d'autres "
+"fichiers importants comme «\\ status\\ » ou «\\ available\\ »."
 
 # type: Plain text
-#: dpkg-scanpackages.1:43
+#: dpkg-divert.8:117
 msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
-"B<dpkg-scanpackages> trie une arborescence contenant des paquets binaires "
-"Debian et crée un fichier «\\ Packages\\ » qui permettra à B<apt>(8), "
-"B<dselect>(1), ou à un autre programme, de savoir quels sont les paquets "
-"installables. Ces fichiers «\\ Packages\\ » sont semblables à ceux qu'on "
-"peut trouver sur les sites d'archives Debian ou sur des cédéroms. Quand on "
-"crée un répertoire contenant des paquets qu'on veut installer sur un "
-"ensemble de machines, on peut se servir soi-même de B<dpkg-scanpackages>."
+"Note : B<dpkg-divert> préserve l'ancienne copie de ce fichier, avec "
+"l'extension «\\ -old\\ », avant de la remplacer par la nouvelle."
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
-msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
-msgstr ""
-"B<Note :> pour lire le fichier avec B<apt>, il faudra sans doute le "
-"compresser avec B<gzip>(1) et créer un fichier Packages.gz. Apt ignore les "
-"fichiers Packages non compressés, sauf pour des sources locales (B<file://>)."
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
+msgstr "Copyright (C) 1995 Ian Jackson."
+
+# type: TH
+#: dpkg-genchanges.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-genchanges"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
-msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
-msgstr ""
-"I<rep-de-binaires> est le nom de l'arborescence des paquets binaires (par "
-"exemple B<contrib/binary-i386)> que l'on veut traiter. Il vaut mieux qu'elle "
-"soit relative à la racine de l'archive Debian\\ ; ainsi chaque champ «\\ "
-"Filename\\ » dans le nouveau fichier «\\ Packages\\ » commencera par cette "
-"chaîne."
+#: dpkg-genchanges.1:4
+#, fuzzy
+msgid "dpkg-genchanges - generate Debian .changes files"
+msgstr "dpkg-scanpackages - créer des fichiers «\\ Packages\\ »"
+
+# type: Plain text
+#: dpkg-genchanges.1:8
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg-genchanges> [I<options>]"
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-genchanges.1:16
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
-"I<fichier-d'-override> est le nom du fichier qui contient les renseignements "
-"sur la manière dont le paquet s'insère dans la distribution\\ ; voir ci-"
-"dessous."
+"B<dpkg-genchanges> lit les informations à la fois dans une arborescence "
+"debian dépaquetée et déjà construite et sur les fichiers qui ont été créés"
+"\\ ; puis il crée un fichier de contrôle pour la mise en place dans "
+"l'archive Debian (c'est le fichier B<.changes>)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-genchanges.1:23
+#, fuzzy
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
-"I<chemin-à-préfixer> est une chaîne facultative qui préfixera les champs «\\ "
-"Filename\\ »."
+"Avec B<dpkg-buildpackage>, B<dpkg-genchanges> et B<dpkg-parsechangelog> "
+"cette option force l'utilisation des informations contenues dans le fichier "
+"«\\ changelog\\ » et qui concernent toutes les versions strictement plus "
+"récentes que I<version.>"
+
+# type: TP
+#: dpkg-genchanges.1:41 dpkg-source.1:137
+#, no-wrap
+msgid "B<-si>, B<-sa>, B<-sd>"
+msgstr "B<-si>, B<-sa>, B<-sd>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
+#: dpkg-genchanges.1:49
+#, fuzzy
+msgid ""
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"Si l'option B<-u> est spécifiée, la commande recherche des *.udeb au lieu de "
-"*.deb."
+"Ces options contrôlent si l'archive source originale est incluse dans "
+"l'installation produite par B<dpkg-buildpackage> et B<dpkg-genchanges> quand "
+"on construit un paquet source (les options B<-b> or B<-B> n'ont pas été "
+"utilisées)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
-"Quand B<-a>I<E<lt>archE<gt>> est spécifiée, la commande ne recherche pas "
-"tous les fichiers debs\\ ; elle utilise un motif équivalent à *_all.deb et à "
-"*_arch.deb."
+"Par défaut, ou quand l'option B<-si> est indiquée, les sources originales "
+"sont incluses si le numéro de version se termine par B<-0> ou B<-1>, c'est-à-"
+"dire si la partie «\\ révision Debian\\ » du numéro de version est égal à "
+"B<0> ou B<1>."
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
 msgstr ""
-"S'il existe plusieurs versions d'un paquet, seule la plus récente est "
-"affichée en sortie. Si les paquets ont la même version mais diffèrent par "
-"l'architecture, seul le premier trouvé est utilisé. Il est possible de "
-"modifier ce comportement avec l'option B<-m>\\ : tous les paquets trouvés "
-"seront affichés en sortie."
+"L'option B<-sa> force l'inclusion des sources originales\\ ; l'option B<-sd> "
+"force leur exclusion et inclut seulement le «\\ diff_ »."
 
-# type: SH
-#: dpkg-scanpackages.1:81
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
 #, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr "LE FICHIER « OVERRIDE »"
+msgid "B<-V>I<name>B<=>I<value>"
+msgstr "B<-V>I<nom>B<=>I<valeur>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-genchanges.1:66 dpkg-source.1:91
+#, fuzzy
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
-"Bien que l'on puisse trouver dans le fichier «\\ control\\ » la plupart des "
-"informations concernant un paquet, certaines doivent être inscrites par les "
-"tsars de la distribution plutôt que par le responsable du paquet\\ : elles "
-"ont trait à l'organisation des fichiers en vue de la publication plutôt "
-"qu'aux dépendances réelles ou à la description du paquet. Ces informations "
-"se trouvent dans le fichier «\\ override\\ »."
+"Fixe la valeur d'une variable de substitution. B<dpkg-source>, B<dpkg-"
+"gencontrol> et B<dpkg-genchanges> acceptent cette option. Voyez ci-dessous "
+"pour une discussion sur la valeur de substitution."
+
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, no-wrap
+msgid "B<-T>I<substvarsfile>"
+msgstr "B<-T>I<fichier/substvars>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:91
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
-"Les éléments du fichier «\\ override\\ » sont séparés simplement par un "
-"espace. Les commentaires commencent par un caractère B<«\\ #\\ »>."
 
-# type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
-msgstr "I<paquet> I<priorité> I<section> [I<responsable>]"
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+#, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
+msgstr "B<-D>I<champ>B<=>I<valeur>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
-msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
-"I<paquet> est le nom du paquet. Les entrées du fichier «\\ override\\ » "
-"concernant des paquets qui ne sont pas dans l'arborescence des paquets "
-"binaires sont ignorées."
 
-# type: Plain text
-#: dpkg-scanpackages.1:111
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
-msgstr ""
-"Les éléments I<priorité> et I<section> placent le paquet dans l'arborescence"
-"\\ ; on ne devrait pas les trouver dans le fichier «\\ control\\ ». Quand le "
-"paquet se trouve dans un sous-répertoire de I<rep-de-binaires,> on le "
-"compare avec le contenu de I<section>."
+# type: TP
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+#, no-wrap
+msgid "B<-U>I<field>"
+msgstr "B<-U>I<champ>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:119
-msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
-"L'élément I<responsable,> quand il existe, peut représenter soit le nom du "
-"responsable quand il s'agit d'un remplacement sans condition, soit la chaîne "
-"I<ancienresponsable> B<=E<gt>> I<nouveauresponsable> pour un changement de "
-"responsable."
+
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<-b>|B<-B>|B<-S>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
+#: dpkg-genchanges.1:101
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
 msgstr ""
-"On peut trouver les fichiers «\\ override\\ », dont on se sert pour établir "
-"les fichiers officiels «\\ Packages\\ », dans le répertoire I<indices> des "
-"miroirs Debian."
+"Avec B<dpkg-genchanges> et B<dpkg-buildpackage> les options B<-b> et B<-B> "
+"indiquent qu'on veut seulement construire un paquet binaire. L'option B<-b> "
+"indique qu'aucun fichier source n'est à construire ou à distribuer, et "
+"l'option B<-B> indique en plus qu'aucun fichier, appartenant à un paquet "
+"binaire ne dépendant pas d'une architecture, n'est à distribuer. L'option B<-"
+"S> indique que seul le source doit être installé et qu'on a pas besoin de "
+"construire un paquet binaire. Seul B<dpkg-buildpackage> se sert des options "
+"B<-b> et B<-B>. B<dpkg-genchanges> crée seulement un fichier B<.changes> "
+"pour tous les fichiers produits par la cible B<binary-*> du paquet qui est "
+"construit."
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
+# type: TP
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
 #, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTICS"
+msgid "B<-c>I<controlfile>"
+msgstr "B<-c>I<fichier/control>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
+#, fuzzy
 msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
 msgstr ""
-"B<dpkg-scanpackages> affiche les erreurs habituelles qui se comprennent "
-"d'elles-mêmes. Il affiche aussi des avertissements quand des paquets sont "
-"dans un mauvais sous-répertoire, existent en double exemplaire, ont des "
-"champs «\\ Filename\\ » dans leur fichier «\\ control\\ », sont absents du "
-"fichier «\\ override\\ » ou bien dont les substitutions de responsable ne "
-"peuvent pas s'appliquer."
-
-# type: Plain text
-#: dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+"Indique le principal fichier de contrôle des sources où trouver des "
+"renseignements. Par défaut, c'est le fichier B<debian/control>. B<dpkg-"
+"source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
 
-# type: TH
-#: dpkg-scansources.1:1
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
 #, no-wrap
-msgid "dpkg-scansources"
-msgstr "dpkg-scansources"
+msgid "B<-l>I<changelogfile>"
+msgstr "B<-l>I<fichier/changelog>"
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
+#, fuzzy
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
-"dpkg-scansources - Rechercher les fichiers « .dsc » et construire le fichier "
-"d'index « Sources »"
+"Indique le fichier d'enregistrement des changements où trouver des "
+"renseignements. Par défaut, c'est le fichier B<debian/changelog>. B<dpkg-"
+"source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
 
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-genchanges.1:115
+#, fuzzy
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
-"B<dpkg-scansources> [I<options>] I<rep-de-binaires> [I<fichier-override> "
-"[I<chemin-à-préfixer>]] B<E<gt>> I<Sources>"
+"Lit ou écrit la liste des fichiers qui doivent être mis en place dans le "
+"fichier I<fichier/liste-des-fichiers,> plutôt que dans le fichier B<debian/"
+"files.> B<dpkg-gencontrol>, B<dpkg-genchanges> et B<dpkg-distaddfile> "
+"acceptent cette option."
+
+# type: TP
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
+#, no-wrap
+msgid "B<-F>I<changelogformat>"
+msgstr "B<-F>I<format-du-changelog>"
 
 # type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
+#, fuzzy
 msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
-"B<dpkg-scansources> recherche des fichiers I<.dsc> dans le répertoire I<rep-"
-"de-binaires> indiqué. Ces fichiers sont utilisés pour créer un index de "
-"sources Debian, qui est envoyé sur la sortie standard."
+"Donne le format du fichier changelog. Par défaut, c'est une ligne spéciale, "
+"près de la fin du fichier, qui l'indique\\ ; sinon, on utilise le format "
+"classique B<debian>. B<dpkg-source>, B<dpkg-gencontrol> et B<dpkg-"
+"genchanges> acceptent cette option."
+
+# type: TP
+#: dpkg-genchanges.1:120
+#, no-wrap
+msgid "B<-u>I<uploadfilesdir>"
+msgstr "B<-u>I<répertoire-des-fichiers-à-installer>"
 
 # type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-genchanges.1:131
 msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
-"Le I<fichier-override>, s'il est indiqué, est utilisé pour fixer les "
-"priorités dans l'index créé et pour modifier le responsable donné par les "
-"fichiers I<.dsc>. Consultez B<dpkg-scanpackages>(1) pour plus de détails sur "
-"le format de ce fichier. Note : comme le fichier override est indexé par "
-"paquet binaire et non pas par paquet source, il y a un léger problème. "
-"L'implémentation actuelle utilise la priorité la plus élevée des paquets "
-"produit par un fichier I<.dsc> comme priorité du paquet source, et l'entrée "
-"du fichier override du premier paquet binaire listé dans le fichier I<.dsc> "
-"pour modifier l'information sur le responsable. Ceci pourra changer."
+"Cherche les fichiers à installer dans I<répertoire-des-fichiers-à-installer> "
+"plutôt que dans B<..> (B<dpkg-genchanges> doit trouver ces fichiers de "
+"manière à mettre leurs tailles et leurs sommes de contrôle dans le fichier "
+"B<.changes.)>"
+
+# type: TP
+#: dpkg-genchanges.1:131
+#, no-wrap
+msgid "B<-q>"
+msgstr "B<-q>"
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-genchanges.1:139
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
-"Le I<chemin-à-préfixer>, s'il est indiqué, est ajouté au début du champ "
-"Directory (« répertoire ») dans l'index des sources généré. C'est en règle "
-"générale utilisé pour que le champ Directory contienne un chemin depuis la "
-"racine de l'archive Debian."
+"B<dpkg-genchanges> affiche habituellement des messages d'information sur la "
+"sortie d'erreur standard\\ ; par exemple, combien de fichiers source du "
+"paquet sont en cours d'installation. B<-q> supprime ces messages."
 
 # type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-genchanges.1:155
+#, fuzzy
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
-"B<Note :> Si vous voulez accéder au fihier Sources généré avec B<apt>(8), "
-"vous devrez probablement compresser ce fichier avec B<gzip>(1) (pour créer "
-"un fichier Sources.gz). Apt ignore les fichiers Sources non compressés sauf "
-"pour les accès locaux (c'est-à-dire les sources B<file://>)."
-
-# type: TP
-#: dpkg-scansources.1:45 install-info.8:272
-#, no-wrap
-msgid "B<--debug>"
-msgstr "B<--debug>"
+"La liste des fichiers créés qui seront installés sur le serveur. B<dpkg-"
+"gencontrol> ajoute les noms présumés des fichiers des paquets binaires à "
+"partir des fichiers «\\ control\\ » qu'il crée\\ ; pour ajouter d'autres "
+"fichiers on peut se servir de B<dpkg-distaddfile>. B<dpkg-genchanges> lit "
+"dans ce fichier les données nécessaires à la création du fichier B<.changes>."
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
-msgstr "Active le débogage."
+#: dpkg-gencontrol.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
-msgstr "Affiche un message d'aide puis quitte."
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
+msgstr ""
 
-# type: IP
-#: dpkg-scansources.1:49
-#, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-n>, B<--no-sort>"
+# type: Plain text
+#: dpkg-gencontrol.1:8
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg-gencontrol> [I<options>]"
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-gencontrol.1:15
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
-"Ne trie pas les entrées de l'index. Elles sont d'habitude triées en fonction "
-"du nom du paquet source."
-
-# type: IP
-#: dpkg-scansources.1:52
-#, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-s>, B<--source-override> I<fichier>"
+"B<dpkg-gencontrol> lit les informations contenues dans une arborescence "
+"Debian dépaquetée et crée le fichier «\\ control\\ » d'un paquet binaire "
+"(par défaut, c'est le fichier debian/tmp/DEBIAN/control)\\ ; il ajoute aussi "
+"une entrée pour ce paquet binaire dans B<debian/files>."
 
 # type: Plain text
-#: dpkg-scansources.1:55
-msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+#: dpkg-gencontrol.1:20
+#, fuzzy
+msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
-"Utilise le I<fichier> comme fichier override des sources. B<dpkg-"
-"scansources> utilise par défaut le fichier override indiqué, en y ajoutant "
-"le suffixe I<.src>."
+"Avec B<dpkg-gencontrol,> cette option donne le numéro de version du paquet "
+"binaire qui sera crée."
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-gencontrol.1:24
+#, fuzzy
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
-"Le format des fichiers override des sources est différent des fichiers "
-"override des binaires. Il ne contient que deux champs séparés par des "
-"espaces, le premier indique le paquet source et le second, la section. Les "
-"lignes blanches et les lignes de commentaire sont ignorées comme à "
-"l'habitude. Si un paquet apparaît dans chaque fichier, le fichier des "
-"sources est prioritaire pour fixer la section."
+"Fixe la valeur d'une variable de substitution. B<dpkg-source>, B<dpkg-"
+"gencontrol> et B<dpkg-genchanges> acceptent cette option. Voyez ci-dessous "
+"pour une discussion sur la valeur de substitution."
 
-# type: Plain text
-#: dpkg-scansources.1:63
-msgid "Print the version number and exit."
-msgstr "Affiche le numéro de version puis quitte."
+# type: TP
+#: dpkg-gencontrol.1:55
+#, no-wrap
+msgid "B<-p>I<package>"
+msgstr "B<-p>I<paquet>"
 
 # type: Plain text
-#: dpkg-scansources.1:66
-msgid "B<dpkg-scanpackages>(1)."
-msgstr "B<dpkg-scanpackages>(1)."
+#: dpkg-gencontrol.1:62
+msgid ""
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
+msgstr ""
+"cette option produit les informations concernant le paquet binaire I<paquet."
+"> Si le fichier de contrôle des sources liste un seul paquet binaire, on "
+"peut omettre cette option\\ ; sinon c'est indispensable d'indiquer le paquet "
+"pour lequel on veut produire les informations."
+
+# type: TP
+#: dpkg-gencontrol.1:62
+#, no-wrap
+msgid "B<-n>I<filename>"
+msgstr "B<-n>I<nom-de-fichier>"
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
-msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: dpkg-gencontrol.1:67
+msgid ""
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
+msgstr ""
+"Le nom du paquet est I<nom-de-fichier> au lieu de l'habituel : "
+"paquet_version_arch.deb."
 
-# type: TH
-#: dpkg-source.1:2
+# type: TP
+#: dpkg-gencontrol.1:67
 #, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg-source"
+msgid "B<-is>, B<-ip>, B<-isp>"
+msgstr "B<-is>, B<-ip>, B<-isp>"
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-gencontrol.1:76
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Les outils de Debian "
-"pour les paquets source."
+"Ces options, conservées pour compatibilité avec les anciennes versions de "
+"dpkg-dev, sont maintenant déconseillées. Elles servaient à dire à dpkg-"
+"gencontrol d'inclure les champs « Section » et « Priority » dans le fichier "
+"« control ». C'est maintenant le comportement par défaut. Si vous voulez "
+"l'ancien comportement, vous pouvez utiliser l'option B<-U> pour supprimer "
+"ces champs du fichier « control »."
 
-# type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
-msgstr "B<dpkg-source> B<-x >I<fichier.dsc> [I<répertoire-de-sortie>]"
+# type: TP
+#: dpkg-gencontrol.1:76
+#, no-wrap
+msgid "B<-P>I<packagebuilddir>"
+msgstr "B<-P>I<rep-de-construction-du-paquet>"
 
 # type: Plain text
-#: dpkg-source.1:15
+#: dpkg-gencontrol.1:89
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
-"B<dpkg-source -b> [I<options>] I<répertoire> [I<répertoire-d'origine> | orig-"
-"targz |'']"
+"Cette option indique à B<dpkg-source> que le répertoire de construction du "
+"paquet est I<rep-de-construction-du-paquet> au lieu de B<debian/tmp.> Cette "
+"valeur sert à trouver la valeur par défaut de la variable de substitution "
+"B<Installed-Size> et celle du champ correspondant dans le fichier de "
+"contrôle (on utilise la commande B<du>)\\ ; elle donne aussi l'emplacement "
+"par défaut pour le fichier de sortie."
 
-# type: Plain text
-#: dpkg-source.1:18
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg-gencontrol> [I<options>]"
+# type: TP
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
+#, no-wrap
+msgid "B<-O>"
+msgstr "B<-O>"
 
 # type: Plain text
-#: dpkg-source.1:21
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-shlibdeps> I<options>"
+#: dpkg-gencontrol.1:98
+#, fuzzy
+msgid ""
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
+msgstr ""
+"Cette option provoque l'affichage du fichier de contrôle sur la sortie "
+"standard au lieu de B<debian/tmp/DEBIAN/control> (ou I<rep-de-construction-"
+"du-paquet>B</DEBIAN/control> si l'option B<-P> a été utilisée)."
 
-# type: Plain text
-#: dpkg-source.1:24
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg-genchanges> [I<options>]"
+# type: TP
+#: dpkg-gencontrol.1:106
+#, no-wrap
+msgid "B<debian/control>"
+msgstr "B<debian/control>"
 
 # type: Plain text
-#: dpkg-source.1:27
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg-buildpackage> [I<options>]"
+#: dpkg-gencontrol.1:111
+msgid ""
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
+msgstr ""
+"Le principal fichier d'information sur les sources\\ ; il donne des "
+"renseignements qui ne dépendent pas d'une version concernant le paquet "
+"source et les paquets binaires qui peuvent être créés."
 
 # type: Plain text
-#: dpkg-source.1:30
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg-distaddfile> [I<options>]I< fichier section priorité>"
+#: dpkg-gencontrol.1:118
+#, fuzzy
+msgid ""
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
+msgstr ""
+"La liste des fichiers créés qui seront installés sur le serveur. B<dpkg-"
+"gencontrol> ajoute les noms présumés des fichiers des paquets binaires à "
+"partir des fichiers «\\ control\\ » qu'il crée\\ ; pour ajouter d'autres "
+"fichiers on peut se servir de B<dpkg-distaddfile>. B<dpkg-genchanges> lit "
+"dans ce fichier les données nécessaires à la création du fichier B<.changes>."
 
-# type: Plain text
-#: dpkg-source.1:33
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg-parsechangelog> [I<options>]"
+# type: TH
+#: dpkg-name.1:6
+#, no-wrap
+msgid "dpkg-name"
+msgstr "dpkg-name"
 
 # type: Plain text
-#: dpkg-source.1:36
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
-msgstr "B<dpkg-source> empaquète ou dépaquète une archive source Debian."
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
+msgstr "dpkg-name - redonne aux paquets Debian leur nom complet"
 
 # type: Plain text
-#: dpkg-source.1:42
-msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
-msgstr ""
-"B<dpkg-gencontrol> lit les informations contenues dans une arborescence "
-"Debian dépaquetée et crée le fichier «\\ control\\ » d'un paquet binaire "
-"(par défaut, c'est le fichier debian/tmp/DEBIAN/control)\\ ; il ajoute aussi "
-"une entrée pour ce paquet binaire dans B<debian/files>."
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fichierE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-name.1:27
+#, fuzzy
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
-"B<dpkg-shlibdeps> calcule, pour les exécutables nommés dans ses arguments, "
-"les dépendances envers les bibliothèques partagées. Ces dépendances sont "
-"ajoutées au fichier B<debian/substvars> sous la forme B<shlibs:"
-">I<dependencyfield> où I<dependencyfield> est le nom du champ de «\\ "
-"dépendance\\ ». Toute autre variable après I<shlibs:> est supprimée du "
-"fichier. B<dpkg-shlibdeps> lit les informations concernant les dépendances "
-"envers les bibliothèques partagées dans les fichiers suivants\\ : B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, le fichier B<shlibs>, (fichier "
-"du paquet contenant un fichier qui, selon B<objdump,> satisfait au système "
-"de dépendance envers les bibliothèques) ou bien B</etc/dpkg/shlibs.default>. "
-"Le premier trouvé est utilisé. Consultez la charte Debian pour des "
-"précisions sur le format des fichiers qui traitent des dépendances envers "
-"les bibliothèques partagées. Ce format est le suivant\\ :"
+"Cette page de manuel documente le script sh B<dpkg-name>. Celui-ci fournit "
+"une façon simple de redonner aux paquets B<Debian> leur nom complet. Ce nom "
+"consiste en une chaîne «\\ "
+"E<lt>paquetE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb\\ » telle "
+"qu'elle est indiquée dans le fichier «\\ control\\ » du paquet. La partie "
+"E<lt>versionE<gt> du nom est composée d'informations sur la version «\\ "
+"originale\\ » qui peuvent ou non être suivies d'un trait d'union et "
+"d'informations sur la révision."
+
+# type: TP
+#: dpkg-name.1:29
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
-msgstr ""
-"E<lt>nom de la bibliothèqueE<gt> E<lt>version/nom_soE<gt> "
-"E<lt>dépendancesE<gt>"
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
+msgstr "Le nom du fichier n'aura pas l'information sur l'architecture."
+
+# type: TP
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<-k, --symlink>"
 
 # type: Plain text
-#: dpkg-source.1:76
-msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
-msgstr ""
-"B<dpkg-genchanges> lit les informations à la fois dans une arborescence "
-"debian dépaquetée et déjà construite et sur les fichiers qui ont été créés"
-"\\ ; puis il crée un fichier de contrôle pour la mise en place dans "
-"l'archive Debian (c'est le fichier B<.changes>)."
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
+msgstr "Faire un lien symbolique plutôt qu'une création de fichier."
+
+# type: TP
+#: dpkg-name.1:35
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<-o, --overwrite>"
 
 # type: Plain text
-#: dpkg-source.1:80
+#: dpkg-name.1:39
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
-"B<dpkg-buildpackage> est un script de contrôle qui peut faciliter la "
-"construction automatique d'un paquet."
+"Remplace des fichiers existants s'ils ont le même nom que le fichier de "
+"destination."
 
-# type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
-msgstr ""
-"B<dpkg-distaddfile> ajoute une entrée pour un fichier dans B<debian/files.>"
+# type: TP
+#: dpkg-name.1:39
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<-s, --subdir> [I<rep>]"
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-name.1:51
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
-"B<dpkg-parsechangelog> lit et fait l'analyse du fichier «\\ changelog\\ » "
-"d'une arborescence source dépaquetée et affiche les informations qu'il "
-"contient sur la sortie standard et sous une forme lisible par la machine."
+"Met les fichiers dans rep. Si le répertoire donné en argument existe, les "
+"fichiers sont déplacés dans ce répertoire\\ ; sinon le répertoire cible, "
+"extrait du champ «\\ section\\ » que contient la partie de contrôle du "
+"paquet, sera «\\ unstable/binary-E<lt>architectureE<gt>/E<lt>sectionE<gt>\\ "
+"». Quand la section est «\\ non-free\\ » ou «\\ contrib\\ », ou bien quand "
+"aucune information sur la section n'est trouvée dans le fichier «\\ control"
+"\\ », le répertoire cible est «\\ E<lt>sectionE<gt>/binary-"
+"E<lt>architectureE<gt>\\ ». Le champ «\\ section\\ » est facultatif\\ ; "
+"aussi beaucoup de paquets sont dans la zone «\\ no-section\\ ». Utilisez "
+"cette option avec soin\\ : elle est compliquée."
+
+# type: TP
+#: dpkg-name.1:51
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-c, --create-dir>"
 
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-name.1:56
 msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
-"Aucune de ces commandes ne permet la combinaison de plusieurs options en une "
-"seule et elles ne permettent pas d'indiquer la valeur d'une option dans un "
-"argument séparé."
+"On peut utiliser cette option avec l'option -s. Quand un répertoire cible "
+"n'est pas trouvé, il est créé automatiquement.  B<Utilisez cette option avec "
+"soin.>"
 
-# type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
+# type: TP
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<-v, --version>"
+
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<-l, --license>"
+
+# type: TP
+#: dpkg-name.1:67
 #, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "OPTIONS COMMUNES"
+msgid "B<dpkg-name bar-foo.deb>"
+msgstr "B<dpkg-name bar-foo.deb>"
 
 # type: Plain text
-#: dpkg-source.1:96
+#: dpkg-name.1:72
 msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
-"Beaucoup de ces programmes partagent les options qui sont décrites ici\\ ; "
-"on décrit en même temps les programmes qui les acceptent."
+"Le nom du fichier «\\ bar-foo.deb\\ » devient «\\ bar-foo_1.0-2_i386.deb\\ » "
+"ou quelque chose de similaire suivant les renseignements que contient la "
+"partie de contrôle de «\\ bar-foo.deb\\ »."
 
 # type: TP
-#: dpkg-source.1:96
+#: dpkg-name.1:72
 #, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-h>, B<--help>"
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-name.1:77
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
-"Affiche le message d'aide associé au programme\\ : il comprend un résumé des "
-"options acceptées. Tous les outils pour les paquets source comprennent cette "
-"option."
+"Cette commande redonne leur nom complet à tous les fichiers qui se trouvent "
+"dans le répertoire /root/debian et ses sous-répertoires et qui possèdent une "
+"extension «\\ deb\\ », mais supprime l'information sur l'architecture."
+
+# type: TP
+#: dpkg-name.1:77
+#, no-wrap
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-name.1:83
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
-"Affiche la version du programme\\ ; le message comprend des informations sur "
-"la licence et le copyright. Tous les outils pour les paquets source "
-"comprennent cette option."
+"B<Ne faites pas ça !> L'archive sera complètement gâchée par des paquets qui "
+"ne possèdent pas d'informations sur la section. B<Ne faites pas ça !>"
 
 # type: TP
-#: dpkg-source.1:106
+#: dpkg-name.1:83
 #, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<-v>I<version>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 
 # type: Plain text
-#: dpkg-source.1:114
-msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
 msgstr ""
-"Avec B<dpkg-buildpackage>, B<dpkg-genchanges> et B<dpkg-parsechangelog> "
-"cette option force l'utilisation des informations contenues dans le fichier "
-"«\\ changelog\\ » et qui concernent toutes les versions strictement plus "
-"récentes que I<version.>"
+"On peut se servir de cette commande lors de la construction d'un nouveau "
+"paquet."
 
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-name.1:96
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
-"Avec B<dpkg-gencontrol,> cette option donne le numéro de version du paquet "
-"binaire qui sera crée."
+"Certains paquets ne respectent pas l'organisation "
+"E<lt>paquetE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Les paquets "
+"traités par dpkg-name la respecte. Cela n'a pas de conséquence sur la façon "
+"dont B<dselect>(1) ou B<dpkg>(1) installe les paquets, mais il se peut que "
+"d'autres systèmes d'installation aient besoin de cette organisation."
 
-# type: TP
-#: dpkg-source.1:119
-#, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B<-C>I<description-des-changements>"
+# type: Plain text
+#: dpkg-name.1:104
+msgid ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
+msgstr ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-name.1:111
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
-"Lit la description des changements dans le fichier I<description-des-"
-"changements> plutôt que dans le fichier «\\ changelog\\ » de l'arborescence "
-"source.  B<dpkg-buildpackage> et B<dpkg-genchanges> acceptent cette option."
+"Copyright 1995,1996 Erick Branderhorst. B<dpkg-name> est un logiciel libre"
+"\\ ; voyez la «\\ GNU General Public Licence\\ » version 2 ou supérieure "
+"pour le copyright. Il n'y a B<pas> de garantie."
 
-# type: TP
-#: dpkg-source.1:126
-#, no-wrap
-msgid "B<-m>I<maintaineraddress>"
-msgstr "B<-m>I<adresse-du-responsable>"
+# type: Plain text
+#: dpkg-parsechangelog.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg-parsechangelog> [I<options>]"
+
+# type: Plain text
+#: dpkg-parsechangelog.1:4
+#, fuzzy
+msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgstr "dpkg-scanpackages - créer des fichiers «\\ Packages\\ »"
+
+# type: Plain text
+#: dpkg-parsechangelog.1:8
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg-parsechangelog> [I<options>]"
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-parsechangelog.1:14
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
-"Utilise I<adresse-du-responsable> comme nom et adresse électronique du "
-"responsable de paquet plutôt que d'utiliser les informations contenues dans "
-"le fichier «\\ control\\ » de l'arborescence source. B<dpkg-buildpackage> et "
-"B<dpkg-genchanges> acceptent cette option."
+"B<dpkg-parsechangelog> lit et fait l'analyse du fichier «\\ changelog\\ » "
+"d'une arborescence source dépaquetée et affiche les informations qu'il "
+"contient sur la sortie standard et sous une forme lisible par la machine."
 
 # type: TP
-#: dpkg-source.1:134
-#, no-wrap
-msgid "B<-e>I<maintaineraddress>"
-msgstr "B<-e>I<adresse-du-responsable>"
+#: dpkg-parsechangelog.1:26
+#, fuzzy, no-wrap
+msgid "B<-L>I<libdir>"
+msgstr "B<-U>I<champ>"
 
 # type: Plain text
-#: dpkg-source.1:142
-msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
-"Utilise I<adresse-du-responsable> comme nom et adresse électronique du "
-"responsable de paquet pour cette mise en place, plutôt que d'utiliser les "
-"informations contenues dans le fichier «\\ changelog\\ » de l'arborescence "
-"source. B<dpkg-buildpackage> et B<dpkg-genchanges> acceptent cette option."
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-parsechangelog.1:41
 #, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-si>, B<-sa>, B<-sd>"
+msgid "B<debian/changelog>"
+msgstr "B<debian/changelog>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-parsechangelog.1:47
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
-"Ces options contrôlent si l'archive source originale est incluse dans "
-"l'installation produite par B<dpkg-buildpackage> et B<dpkg-genchanges> quand "
-"on construit un paquet source (les options B<-b> or B<-B> n'ont pas été "
-"utilisées)."
+"Le fichier d'enregistrement des modifications\\ ; on s'en sert pour "
+"connaître les informations qui dépendent d'une version du paquet source, par "
+"exemple l'urgence ou la distribution d'une installation sur le serveur, les "
+"modifications faites depuis telle édition et le numéro de la version source "
+"lui-même."
 
 # type: Plain text
-#: dpkg-source.1:158
-msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
-msgstr ""
-"Par défaut, ou quand l'option B<-si> est indiquée, les sources originales "
-"sont incluses si le numéro de version se termine par B<-0> ou B<-1>, c'est-à-"
-"dire si la partie «\\ révision Debian\\ » du numéro de version est égal à "
-"B<0> ou B<1>."
+#: dpkg-query.1:1
+#, no-wrap
+msgid "dpkg-query"
+msgstr "dpkg-query"
+
+# type: Plain text
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
+msgstr "dpkg-query - Un outil pour interroger la base de données de dpkg"
+
+# type: Plain text
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-query.1:12
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
-"L'option B<-sa> force l'inclusion des sources originales\\ ; l'option B<-sd> "
-"force leur exclusion et inclut seulement le «\\ diff_ »."
+"B<dpkg-query> est un outil pour afficher des informations sur les paquets "
+"connus par la base de données de B<dpkg>."
 
 # type: TP
-#: dpkg-source.1:163
-#, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
-msgstr "B<-V>I<nom>B<=>I<valeur>"
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<-l> | B<--list> I<nom-paquet-motif> ..."
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-query.1:23
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
-"Fixe la valeur d'une variable de substitution. B<dpkg-source>, B<dpkg-"
-"gencontrol> et B<dpkg-genchanges> acceptent cette option. Voyez ci-dessous "
-"pour une discussion sur la valeur de substitution."
+"Liste les paquets correspondants au motif donné. Quand on ne donne aucun "
+"I<nom-paquet-motif>, tous les paquets listés dans I</var/lib/dpkg/status> "
+"sont affichés, sauf ceux dont l'état est «\\ purge\\ ». Les métacaractères "
+"ordinaires de l'interpréteur de commandes sont autorisés dans I<nom-paquet-"
+"motif>. Il faudra sans doute mettre I<nom-paquet-motif> entre apostrophes "
+"pour éviter l'expansion des noms de fichier par l'interpréteur de commandes. "
+"Par exemple, tous les paquets dont le nom commence par «\\ libc6\\ » seront "
+"affichés par la commande\\ :"
 
-# type: TP
-#: dpkg-source.1:169
+# type: Plain text
+#: dpkg-query.1:27
 #, no-wrap
-msgid "B<-T>I<substvarsfile>"
-msgstr "B<-T>I<fichier/substvars>"
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 
 # type: Plain text
-#: dpkg-source.1:179
+#: dpkg-query.1:33
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
-"Lit (ou, écrit, pour B<dpkg-shlibdeps),> les variables de substitution dans "
-"le fichier I<fichier/substvars>; Par défaut c'est le fichier B<debian/"
-"substvars.> B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> et dpkg-"
-"genchanges acceptent cette option."
+"On ne peut pas configurer le format de sortie de cette option. Il s'adapte "
+"automatiquement à la largeur du terminal. Ce format est destiné aux humains "
+"et la machine le lit mal. Voyez B<-W> (B<--show>) et B<--showformat> pour "
+"une possible configuration de ce format."
 
 # type: TP
-#: dpkg-source.1:179
-#, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
-msgstr "B<-D>I<champ>B<=>I<valeur>"
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<-W> | B<--show> I<nom-paquet-motif>..."
 
 # type: Plain text
-#: dpkg-source.1:184
+#: dpkg-query.1:40
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
-"Remplace ou ajoute en sortie un champ dans le fichier de contrôle. B<dpkg-"
-"source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+"Tout comme l'option B<--list>, cette option affiche la liste des paquets qui "
+"correspondent au motif donné. La sortie peut cependant être formatée en "
+"utilisant l'option B<--showformat>. Le format de sortie par défaut est le "
+"suivant\\ : une ligne pour chaque paquet, avec le nom et la version "
+"installée, séparé par une tabulation."
 
 # type: TP
-#: dpkg-source.1:184
-#, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<-U>I<champ>"
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-s> | B<--status> I<nom-paquet> ..."
 
 # type: Plain text
-#: dpkg-source.1:189
+#: dpkg-query.1:44
 msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
-"Supprime en sortie un champ dans le fichier de contrôle. B<dpkg-source>, "
-"B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+"Donne l'état du paquet indiqué. C'est simplement l'affichage de l'entrée de "
+"la base de données concernant les états des paquets installés."
 
 # type: TP
-#: dpkg-source.1:189
-#, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr "B<-b>|B<-B>|B<-S>"
-
-# type: Plain text
-#: dpkg-source.1:212
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
-"Avec B<dpkg-genchanges> et B<dpkg-buildpackage> les options B<-b> et B<-B> "
-"indiquent qu'on veut seulement construire un paquet binaire. L'option B<-b> "
-"indique qu'aucun fichier source n'est à construire ou à distribuer, et "
-"l'option B<-B> indique en plus qu'aucun fichier, appartenant à un paquet "
-"binaire ne dépendant pas d'une architecture, n'est à distribuer. L'option B<-"
-"S> indique que seul le source doit être installé et qu'on a pas besoin de "
-"construire un paquet binaire. Seul B<dpkg-buildpackage> se sert des options "
-"B<-b> et B<-B>. B<dpkg-genchanges> crée seulement un fichier B<.changes> "
-"pour tous les fichiers produits par la cible B<binary-*> du paquet qui est "
-"construit."
+#: dpkg-query.1:44
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<-L> | B<--listfiles> I<paquet> ..."
 
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-query.1:49
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
-"L'option B<-b> indique à B<dpkg-source> de construire un paquet source "
-"(plutôt que d'en extraire un), voyez ci-dessous."
+"Affiche la liste des fichiers de I<paquet> installés sur le système. Il faut "
+"remarquer cependant que les fichiers créés par les scripts d'installation "
+"particuliers au paquet ne sont pas affichés."
 
 # type: TP
-#: dpkg-source.1:217
-#, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "B<-c>I<fichier/control>"
+#: dpkg-query.1:49
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<-S> | B<--search> I<motif-de-recherche> ..."
 
 # type: Plain text
-#: dpkg-source.1:224
+#: dpkg-query.1:55
 msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
-"Indique le principal fichier de contrôle des sources où trouver des "
-"renseignements. Par défaut, c'est le fichier B<debian/control>. B<dpkg-"
-"source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+"Recherche un nom de fichier dans les paquets installés. On peut utiliser "
+"dans le motif tous les métacaractères de l'interpréteur de commandes. Cette "
+"commande ne donne pas les fichiers supplémentaires créés par les scripts du "
+"responsable de paquet, ni les alternatives."
 
 # type: TP
-#: dpkg-source.1:224
-#, no-wrap
-msgid "B<-l>I<changelogfile>"
-msgstr "B<-l>I<fichier/changelog>"
+#: dpkg-query.1:55
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-p> |B<--print-avail> I<paquet>"
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-query.1:59
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
-"Indique le fichier d'enregistrement des changements où trouver des "
-"renseignements. Par défaut, c'est le fichier B<debian/changelog>. B<dpkg-"
-"source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+"Affiche des renseignements détaillés sur I<paquet>, tels qu'ils sont trouvés "
+"dans le fichier I</var/lib/dpkg/available>."
 
 # type: TP
-#: dpkg-source.1:231
-#, no-wrap
-msgid "B<-f>I<fileslistfile>"
-msgstr "B<-f>I<fichier/liste-des-fichiers>"
+#: dpkg-query.1:74
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-f> | B<--showformat=>I<format>"
 
 # type: Plain text
-#: dpkg-source.1:237
-msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
-msgstr ""
-"Lit ou écrit la liste des fichiers qui doivent être mis en place dans le "
-"fichier I<fichier/liste-des-fichiers,> plutôt que dans le fichier B<debian/"
-"files.> B<dpkg-gencontrol>, B<dpkg-genchanges> et B<dpkg-distaddfile> "
-"acceptent cette option."
-
-# type: TP
-#: dpkg-source.1:237
-#, no-wrap
-msgid "B<-F>I<changelogformat>"
-msgstr "B<-F>I<format-du-changelog>"
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+msgstr "Dans la chaîne, \\(lqB<\\e>\\(rq déspécifie le caractère"
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-query.1:87
+#, no-wrap
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
-"Donne le format du fichier changelog. Par défaut, c'est une ligne spéciale, "
-"près de la fin du fichier, qui l'indique\\ ; sinon, on utilise le format "
-"classique B<debian>. B<dpkg-source>, B<dpkg-gencontrol> et B<dpkg-"
-"genchanges> acceptent cette option."
-
-# type: TP
-#: dpkg-source.1:244
-#, no-wrap
-msgid "B<-W>"
-msgstr "B<-W>"
+"    B<\\en>  nouvelle ligne\n"
+"    B<\\er>  retour chariot\n"
+"    B<\\et>  tabulation\n"
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-query.1:92
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
-"Cette option transforme certaines erreurs en avertissements. Seul dpkg-"
-"source l'utilise, mais B<dpkg-buildpackage> la reconnait et la transmet à "
-"B<dpkg-source>."
-
-# type: TP
-#: dpkg-source.1:251
-#, no-wrap
-msgid "B<-E>"
-msgstr "B<-E>"
+"\\(lqB<\\e>\\(rq avant un caractère supprime la signification du caractère "
+"qui suit. C'est utile pour les caractères \\(lqB<\\e>\\(rq and \\(lqB<$>"
+"\\(rq."
 
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-query.1:98
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
-"Cette option annule une précédente option B<-W>. Elle n'est actuellement "
-"comprise que par B<dpkg-buildpackage> et B<dpkg-source>."
+"On peut indiquer un paquet en insérant des appels de variables spécifiant "
+"des champs du paquet avec la syntaxe suivante\\ : \\(lqB<${>I<field>[B<;"
+">I<width>]B<}>\\(rq. Les champs sont alignés à droite, à moins que la "
+"largeur ne soit négative, auquel cas ils sont alignés à gauche. Les champs "
+"suivants sont reconnus\\ :"
 
-# type: SH
-#: dpkg-source.1:257
+# type: Plain text
+#: dpkg-query.1:129
 #, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "LES OPTIONS DE DPKG-SOURCE"
+msgid ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
+msgstr ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\"\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-query.1:137
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
-"Quand on fournit les options communes B<-c> et B<-l> avec des chemins "
-"relatifs, on considère qu'ils sont relatifs au répertoire le plus élevé de "
-"l'arborescence source."
+"Le format par défaut est le suivant\\ : \\(lqB<${Paquet}\\et${Version}\\en>"
+"\\(rq. Tous les autres champs du fichier status, par exemple des champs "
+"définis par l'utilisateur, peuvent être demandés. Ils seront affichés mais "
+"sans aucune mise en forme et aucune vérification n'est faite. Pour obtenir "
+"le nom du responsable de dpkg et la version installée, exécutez par exemple :"
 
-# type: TP
-#: dpkg-source.1:262
+# type: Plain text
+#: dpkg-query.1:141
 #, no-wrap
-msgid "B<-x>"
-msgstr "B<-x>"
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+msgstr "B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 
-# type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
-msgstr ""
-"Cette option sert à extraire un paquet source. On doit donner un seul "
-"argument sans option\\ : le nom du fichier de contrôle des sources Debian "
-"(B<.dsc>).  Un deuxième argument sans option peut être donné pour indiquer "
-"le répertoire où extraire le paquet source, cela ne doit pas exister. Quand "
-"aucun répertoire n'est indiqué, le paquet source est extrait dans le "
-"répertoire I<source>-I<version-> du répertoire courant."
+# type: SH
+#: dpkg-query.1:143
+#, no-wrap
+msgid "ENVIRONMENT"
+msgstr "ENVIRONNEMENT"
 
 # type: Plain text
-#: dpkg-source.1:280
+#: dpkg-query.1:148
 msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
-"Aucune option n'est utile avec B<dpkg-source-x>.  B<dpkg-source> lit, dans "
-"le fichier de contrôle, les noms des fichiers qui composent le paquet source"
-"\\ ; il suppose qu'ils sont dans le même répertoire que le fichier B<.dsc.>"
+"Fixer le nombre de colonnes influence la sortie de l'option B<--list> en "
+"modifiant la largeur d'affichage."
 
 # type: Plain text
-#: dpkg-source.1:288
-msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
-msgstr ""
-"Les fichiers extraits du paquet auront le même système de propriété et de "
-"permission que s'ils avaient été simplement créés -- les répertoires et les "
-"fichiers exécutables auront un système de permission égal à 0777 et les "
-"simples fichiers, 0666\\ ; ces deux systèmes étant modifiés par le masque de "
-"celui qui fait l'extraction\\ ; Si le répertoire parent est «\\ setgid\\ », "
-"les répertoires extraits le seront aussi et tous les fichiers et répertoires "
-"hériteront du système de propriété de ce groupe."
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr "Copyright 2001 Wichert Akkerman"
 
-# type: TP
-#: dpkg-source.1:288
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
-msgid "B<-b>"
-msgstr "B<-b>"
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: dpkg-source.1:303
-msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
-msgstr ""
-"Construire : empaqueter une arborescence. Un ou deux arguments, sans "
-"options, seront fournis. Le premier représente le nom du répertoire qui "
-"contient l'arborescence non empaquetée. Si l'on donne un second argument, ce "
-"sera le nom du répertoire source original ou bien le nom du fichier «\\ tar"
-"\\ » ou bien une chaîne vide si le paquet est «\\ debian pure souche\\ » et "
-"n'a donc pas de fichiers «\\ diffs\\ » concernant sa «\\ debianisation\\ ». "
-"S'il n'y a pas de second argument, et selon les autres arguments donnés, "
-"B<dpkg-source> cherche le fichier « tar » des sources originelles "
-"I<paquet>B<_>I<version-originelle>B<.orig.tar.gz> ou bien le répertoire "
-"source originel I<répertoire>B<.orig> ou bien une chaîne vide (pas de source "
-"originel, et donc pas de « diffs »)."
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
-# type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr "B<-i[E<lt>regexpE<gt>]>"
+msgid "dpkg-scanpackages"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
-msgstr ""
-"On peut donner une expression rationnelle Perl correspondant aux fichiers "
-"qui doivent être éliminés de la liste des fichiers pour le «\\ diff\\ ». "
-"Cette liste est créée par une commande «\\ find\\ ». L'option B<-i> toute "
-"seule, élimine les fichiers de contrôle et les répertoires des systèmes les "
-"plus connus de contrôle de version, les fichiers d'échange et de sauvegarde "
-"et les répertoire utilisés par Libtool."
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
+msgstr "dpkg-scanpackages - créer des fichiers «\\ Packages\\ »"
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-scanpackages.1:28
+#, fuzzy
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
-"C'est très utile pour supprimer les fichiers superflus qui sont inclus dans "
-"le .diff.gz (p. ex. «\\ debian/BUGS_TODO/*\\ » ou «\\ debian/RCS/*,v\\ »). "
-"Quand on suit avec un CVS distant un paquet que l'on maintient, et qu'on a "
-"pas la possibilité d'enregistrer les fichiers debian de contrôle ou "
-"d'étiqueter I<cvs-buildpackage(1)>, il faut faire un «\\ checkout/update\\ » "
-"supplémentaire dans un répertoire tenu vierge pour créer le fichier orig.tar."
-"gz. Les fichiers «\\ CVS/Entries\\ » de ce répertoire contiennent des dates "
-"qui diffèrent de celles du répertoire de travail\\ ; cela provoque indûment "
-"leur inclusion dans chaque .diff.gz créé, à moins d'utiliser l'option B<-i>."
-
-# type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
-#, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<-IE<lt>fichierE<gt>>"
+"B<dpkg-scansources> [I<options>] I<rep-de-binaires> [I<fichier-override> "
+"[I<chemin-à-préfixer>]] B<E<gt>> I<Sources>"
 
 # type: Plain text
-#: dpkg-source.1:330
+#: dpkg-scanpackages.1:41
 msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
-"Avec cette option, le fichier est passé à l'option --exclude de tar quand on "
-"veut créer un fichier .orig.tar.gz ou .tar.gz. Par exemple, -ICVS fera que "
-"tar sautera les répertoires du CVS quand il doit créer un fichier .tar.gz. "
-"On peut répéter cette option pour exclure plusieurs fichiers."
-
-# type: TP
-#: dpkg-source.1:330
-#, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>"
+"B<dpkg-scanpackages> trie une arborescence contenant des paquets binaires "
+"Debian et crée un fichier «\\ Packages\\ » qui permettra à B<apt>(8), "
+"B<dselect>(1), ou à un autre programme, de savoir quels sont les paquets "
+"installables. Ces fichiers «\\ Packages\\ » sont semblables à ceux qu'on "
+"peut trouver sur les sites d'archives Debian ou sur des cédéroms. Quand on "
+"crée un répertoire contenant des paquets qu'on veut installer sur un "
+"ensemble de machines, on peut se servir soi-même de B<dpkg-scanpackages>."
 
 # type: Plain text
-#: dpkg-source.1:345
+#: dpkg-scanpackages.1:51
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
-"Quand on spécifie B<-sk> ou B<-sp,> B<dpkg-source> s'attend à ce que le "
-"source originel soit un fichier «\\ tar\\ »\\ ; par défaut, c'est le fichier "
-"I<paquet>B<_>I<version-originelle>B<.orig.tar.gz>.B< Il le laisse en place "
-"en tant que fichier «\\ tar\\ » ou le copie dans le répertoire en cours s'il "
-"n'y est pas déjà. Quand on utilise -sp> au lieu de B<-sk,> il le supprime "
-"ensuite."
+"B<Note :> pour lire le fichier avec B<apt>, il faudra sans doute le "
+"compresser avec B<gzip>(1) et créer un fichier Packages.gz. Apt ignore les "
+"fichiers Packages non compressés, sauf pour des sources locales (B<file://>)."
 
 # type: Plain text
-#: dpkg-source.1:357
+#: dpkg-scanpackages.1:58
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
-"Quand on spécifie B<-su> ou B<-sr>, le source originel est attendu comme un "
-"répertoire\\ ; par défaut, c'est le répertoire I<paquet>B<->I<version-"
-"originelle>B<.orig> et B<dpkg-source> crée une nouvelle archive du source "
-"originel. Quand on utilise B<-sr>, B<dpkg-source> supprime ce répertoire "
-"après usage."
+"I<rep-de-binaires> est le nom de l'arborescence des paquets binaires (par "
+"exemple B<contrib/binary-i386)> que l'on veut traiter. Il vaut mieux qu'elle "
+"soit relative à la racine de l'archive Debian\\ ; ainsi chaque champ «\\ "
+"Filename\\ » dans le nouveau fichier «\\ Packages\\ » commencera par cette "
+"chaîne."
 
 # type: Plain text
-#: dpkg-source.1:368
+#: dpkg-scanpackages.1:62
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
-"Quand on utilise B<-ss>, B<dpkg-source> s'attend à ce que le source originel "
-"soit disponible à la fois comme un répertoire et comme un fichier «\\ tar\\ "
-"». Il se sert du répertoire pour créer le «\\ diff\\ », mais se sert du "
-"fichier «\\ tar\\ » pour créer le fichier B<.dsc>. On doit faire attention "
-"avec cette option. Si le répertoire et le fichier «\\ tar\\ » ne "
-"correspondent pas, une mauvaise archive source en résulte."
+"I<fichier-d'-override> est le nom du fichier qui contient les renseignements "
+"sur la manière dont le paquet s'insère dans la distribution\\ ; voir ci-"
+"dessous."
 
 # type: Plain text
-#: dpkg-source.1:377
+#: dpkg-scanpackages.1:65
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
-"Quand on utilise B<-sn>, B<dpkg-source> ne cherche pas de source originel, "
-"et ne crée pas de «\\ diff\\ ». Le second argument, s'il existe, doit être "
-"une chaîne vide. Cela sert pour les paquets Debian pure souche qui n'ont pas "
-"un source originel distinct et donc, pas de fichier «\\ diff\\ » de "
-"debianisation."
+"I<chemin-à-préfixer> est une chaîne facultative qui préfixera les champs «\\ "
+"Filename\\ »."
 
 # type: Plain text
-#: dpkg-source.1:406
+#: dpkg-scanpackages.1:69
+#, fuzzy
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
-"Quand on utilise B<-sa> ou B<-sA,> B<dpkg-source> cherche un source originel "
-"soit sous forme de fichier «\\ tar\\ », soit sous forme de répertoire -- le "
-"deuxième argument, s'il existe, ou bien une chaîne vide (cela revient à "
-"utiliser l'option B<-sn)>. Quand un fichier «\\ tar\\ » existe, il est "
-"dépaqueté et B<dpkg-source> crée un fichier «\\ diff\\ »\\ ; ensuite il "
-"supprime le fichier «\\ tar\\ » (cela revient à utiliser l'option B<-sp)>"
-"\\ ; quand un répertoire est trouvé, il est dépaqueté et B<dpkg-source> crée "
-"le source originel et supprime ensuite ce répertoire (cela revient à "
-"utiliser l'option B<-sr)>\\ ; quand ni l'un ni l'autre n'est trouvé, B<dpkg-"
-"source> suppose que le paquet ne possède pas de fichier «\\ diff\\ » de "
-"debianisation, mais seulement une simple archive source (cela revient à "
-"utiliser l'option B<-sn>). Quand les deux sont trouvés, B<dpkg-source> "
-"ignore le répertoire et le remplace si l'option B<-sA> a été spécifiée (cela "
-"revient à utiliser l'option B<-sP)>\\ ; ou bien il provoque une erreur si "
-"l'option B<-sa> a été spécifiée. L'option par défaut est B<-sA>."
+"S'il existe plusieurs versions d'un paquet, seule la plus récente est "
+"affichée en sortie. Si les paquets ont la même version mais diffèrent par "
+"l'architecture, seul le premier trouvé est utilisé. Il est possible de "
+"modifier ce comportement avec l'option B<-m>\\ : tous les paquets trouvés "
+"seront affichés en sortie."
+
+# type: TP
+#: dpkg-scanpackages.1:71
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--udeb>"
+msgstr "B<-us>, B<-uc>"
+
+# type: Plain text
+#: dpkg-scanpackages.1:74
+#, fuzzy
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
+msgstr ""
+"Si l'option B<-u> est spécifiée, la commande recherche des *.udeb au lieu de "
+"*.deb."
+
+# type: TP
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<path>"
 
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-scanpackages.1:78
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
-"Les options B<-sa>, B<-sp>, B<-sk>, B<-su> et B<-sr> ne remplacent pas les "
-"fichiers «\\ tar\\ » ou les répertoires existants. Pour cela, il faut "
-"utiliser les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
 
 # type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr "B<-sp>,B<-su>,B<-sn> avec B<-x>"
+#: dpkg-scanpackages.1:78
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
-"Dans tous ces cas, l'arborescence existante d'un source originel est "
-"supprimée."
+
+# type: SH
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
+#, no-wrap
+msgid "DIAGNOSTICS"
+msgstr "DIAGNOSTICS"
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-scanpackages.1:94
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
-"Quand on utilise l'option B<-sp> lors d'une extraction, le source originel "
-"(s'il existe) est laissé en tant que fichier «\\ tar\\ ». S'il n'est pas "
-"déjà dans le répertoire en cours ou si ce répertoire contient un fichier "
-"différent, le fichier «\\ tar\\ » est copié dans ce répertoire. C'est le "
-"comportement par défaut."
+"B<dpkg-scanpackages> affiche les erreurs habituelles qui se comprennent "
+"d'elles-mêmes. Il affiche aussi des avertissements quand des paquets sont "
+"dans un mauvais sous-répertoire, existent en double exemplaire, ont des "
+"champs «\\ Filename\\ » dans leur fichier «\\ control\\ », sont absents du "
+"fichier «\\ override\\ » ou bien dont les substitutions de responsable ne "
+"peuvent pas s'appliquer."
 
 # type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
-msgstr "L'option B<-su> dépaquète une arborescence source originelle."
+#: dpkg-scanpackages.1:99
+#, fuzzy
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+
+# type: TH
+#: dpkg-scansources.1:1
+#, no-wrap
+msgid "dpkg-scansources"
+msgstr "dpkg-scansources"
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-scansources.1:4
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
-"L'option B<-sn> assure que le source originel ne sera ni copié dans le "
-"répertoire en cours, ni dépaqueté. Une arborescence source originelle "
-"présente dans le répertoire en cours est toujours supprimée."
+"dpkg-scansources - Rechercher les fichiers « .dsc » et construire le fichier "
+"d'index « Sources »"
 
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-scansources.1:13
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
-"Toutes les options B<-sX> s'excluent mutuellement. Si vous en indiquez "
-"plusieurs, seule la dernière sera prise en compte."
+"B<dpkg-scansources> [I<options>] I<rep-de-binaires> [I<fichier-override> "
+"[I<chemin-à-préfixer>]] B<E<gt>> I<Sources>"
 
-# type: SH
-#: dpkg-source.1:435
-#, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "LES OPTIONS POUR DPKG-GENCONTROL"
+# type: Plain text
+#: dpkg-scansources.1:18
+msgid ""
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
+msgstr ""
+"B<dpkg-scansources> recherche des fichiers I<.dsc> dans le répertoire I<rep-"
+"de-binaires> indiqué. Ces fichiers sont utilisés pour créer un index de "
+"sources Debian, qui est envoyé sur la sortie standard."
 
 # type: Plain text
-#: dpkg-source.1:438
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-msgstr "B<dpkg-gencontrol> ne prend pas d'argument sans option."
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
+msgstr ""
+"Le I<fichier-override>, s'il est indiqué, est utilisé pour fixer les "
+"priorités dans l'index créé et pour modifier le responsable donné par les "
+"fichiers I<.dsc>. Consultez B<dpkg-scanpackages>(1) pour plus de détails sur "
+"le format de ce fichier. Note : comme le fichier override est indexé par "
+"paquet binaire et non pas par paquet source, il y a un léger problème. "
+"L'implémentation actuelle utilise la priorité la plus élevée des paquets "
+"produit par un fichier I<.dsc> comme priorité du paquet source, et l'entrée "
+"du fichier override du premier paquet binaire listé dans le fichier I<.dsc> "
+"pour modifier l'information sur le responsable. Ceci pourra changer."
 
-# type: TP
-#: dpkg-source.1:438
-#, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<-p>I<paquet>"
+# type: Plain text
+#: dpkg-scansources.1:33
+msgid ""
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
+msgstr ""
+"Le I<chemin-à-préfixer>, s'il est indiqué, est ajouté au début du champ "
+"Directory (« répertoire ») dans l'index des sources généré. C'est en règle "
+"générale utilisé pour que le champ Directory contienne un chemin depuis la "
+"racine de l'archive Debian."
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-scansources.1:44
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
-"cette option produit les informations concernant le paquet binaire I<paquet."
-"> Si le fichier de contrôle des sources liste un seul paquet binaire, on "
-"peut omettre cette option\\ ; sinon c'est indispensable d'indiquer le paquet "
-"pour lequel on veut produire les informations."
+"B<Note :> Si vous voulez accéder au fihier Sources généré avec B<apt>(8), "
+"vous devrez probablement compresser ce fichier avec B<gzip>(1) (pour créer "
+"un fichier Sources.gz). Apt ignore les fichiers Sources non compressés sauf "
+"pour les accès locaux (c'est-à-dire les sources B<file://>)."
 
-# type: TP
-#: dpkg-source.1:445
+# type: IP
+#: dpkg-scansources.1:46
 #, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<-n>I<nom-de-fichier>"
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-n>, B<--no-sort>"
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-scansources.1:49
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
-"Le nom du paquet est I<nom-de-fichier> au lieu de l'habituel : "
-"paquet_version_arch.deb."
+"Ne trie pas les entrées de l'index. Elles sont d'habitude triées en fonction "
+"du nom du paquet source."
 
-# type: TP
-#: dpkg-source.1:450
+# type: IP
+#: dpkg-scansources.1:49
 #, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
-msgstr "B<-is>, B<-ip>, B<-isp>"
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-s>, B<--source-override> I<fichier>"
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-scansources.1:52
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
-"Ces options, conservées pour compatibilité avec les anciennes versions de "
-"dpkg-dev, sont maintenant déconseillées. Elles servaient à dire à dpkg-"
-"gencontrol d'inclure les champs « Section » et « Priority » dans le fichier "
-"« control ». C'est maintenant le comportement par défaut. Si vous voulez "
-"l'ancien comportement, vous pouvez utiliser l'option B<-U> pour supprimer "
-"ces champs du fichier « control »."
-
-# type: TP
-#: dpkg-source.1:459
-#, no-wrap
-msgid "B<-P>I<packagebuilddir>"
-msgstr "B<-P>I<rep-de-construction-du-paquet>"
+"Utilise le I<fichier> comme fichier override des sources. B<dpkg-"
+"scansources> utilise par défaut le fichier override indiqué, en y ajoutant "
+"le suffixe I<.src>."
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-scansources.1:58
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
-"Cette option indique à B<dpkg-source> que le répertoire de construction du "
-"paquet est I<rep-de-construction-du-paquet> au lieu de B<debian/tmp.> Cette "
-"valeur sert à trouver la valeur par défaut de la variable de substitution "
-"B<Installed-Size> et celle du champ correspondant dans le fichier de "
-"contrôle (on utilise la commande B<du>)\\ ; elle donne aussi l'emplacement "
-"par défaut pour le fichier de sortie."
+"Le format des fichiers override des sources est différent des fichiers "
+"override des binaires. Il ne contient que deux champs séparés par des "
+"espaces, le premier indique le paquet source et le second, la section. Les "
+"lignes blanches et les lignes de commentaire sont ignorées comme à "
+"l'habitude. Si un paquet apparaît dans chaque fichier, le fichier des "
+"sources est prioritaire pour fixer la section."
 
 # type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
+#: dpkg-scansources.1:58 install-info.8:272
 #, no-wrap
-msgid "B<-O>"
-msgstr "B<-O>"
+msgid "B<--debug>"
+msgstr "B<--debug>"
+
+# type: Plain text
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
+msgstr "Active le débogage."
+
+# type: Plain text
+#: dpkg-scansources.1:68
+#, fuzzy
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<dpkg-scanpackages>(1)."
+
+# type: Plain text
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+
+# type: Plain text
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
+#, fuzzy, no-wrap
+msgid "dpkg-shlibdeps"
+msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-shlibdeps.1:10
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
-"Cette option provoque l'affichage du fichier de contrôle sur la sortie "
-"standard au lieu de B<debian/tmp/DEBIAN/control> (ou I<rep-de-construction-"
-"du-paquet>B</DEBIAN/control> si l'option B<-P> a été utilisée)."
 
-# type: SH
-#: dpkg-source.1:482
-#, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
-msgstr "LES OPTIONS POUR DPKG-SHLIBDEPS"
+# type: Plain text
+#: dpkg-shlibdeps.1:35
+#, fuzzy
+msgid ""
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
+msgstr ""
+"B<dpkg-shlibdeps> calcule, pour les exécutables nommés dans ses arguments, "
+"les dépendances envers les bibliothèques partagées. Ces dépendances sont "
+"ajoutées au fichier B<debian/substvars> sous la forme B<shlibs:"
+">I<dependencyfield> où I<dependencyfield> est le nom du champ de «\\ "
+"dépendance\\ ». Toute autre variable après I<shlibs:> est supprimée du "
+"fichier. B<dpkg-shlibdeps> lit les informations concernant les dépendances "
+"envers les bibliothèques partagées dans les fichiers suivants\\ : B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, le fichier B<shlibs>, (fichier "
+"du paquet contenant un fichier qui, selon B<objdump,> satisfait au système "
+"de dépendance envers les bibliothèques) ou bien B</etc/dpkg/shlibs.default>. "
+"Le premier trouvé est utilisé. Consultez la charte Debian pour des "
+"précisions sur le format des fichiers qui traitent des dépendances envers "
+"les bibliothèques partagées. Ce format est le suivant\\ :"
 
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-shlibdeps.1:41
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
@@ -6541,13 +6983,13 @@ msgstr ""
 "exécutables, comme si on avait simplement donné B<-e>I<exécutable>."
 
 # type: TP
-#: dpkg-source.1:487
+#: dpkg-shlibdeps.1:41
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<exécutable>"
 
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-shlibdeps.1:45
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
@@ -6556,13 +6998,13 @@ msgstr ""
 "partagées que demande I<exécutable.>"
 
 # type: TP
-#: dpkg-source.1:491
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr "B<-d>I<champ-dépendance>"
 
 # type: Plain text
-#: dpkg-source.1:497
+#: dpkg-shlibdeps.1:51
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -6573,7 +7015,7 @@ msgstr ""
 "dans la variable B<shlibs:>I<champ-dépendance>.)"
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-shlibdeps.1:61
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -6584,7 +7026,7 @@ msgstr ""
 "Par défaut, champ-dépendance> vaut B<Depends>."
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-shlibdeps.1:69
 msgid ""
 "If the same dependency entry (or set of alternatives) appears in more than "
 "one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
@@ -6598,724 +7040,499 @@ msgstr ""
 "shlibdeps> supprime automatiquement les dépendances dans tous les champs "
 "sauf celui qui représente les dépendances les plus importantes."
 
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
-msgstr "B<-p>I<préfixe-pour-le-nom-des-variables>"
-
-# type: Plain text
-#: dpkg-source.1:526
-msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
-msgstr ""
-"Les variables de substitution commenceront par I<préfixe-pour-le-nom-des-"
-"variables>B<:> au lieu de B<shlibs:>. De même, toute variable de "
-"substitution commençant par I<préfixe-pour-le-nom-des-variables>B<:> (au "
-"lieu de B<shlib:>) est enlevée du fichier de substitution des variables."
-
-# type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
-msgstr "B<-L>I<fichier-local-shlibs>"
-
-# type: Plain text
-#: dpkg-source.1:534
-msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
-msgstr ""
-"B<dpkg-shlibdeps> lira les informations de remplacement concernant les "
-"dépendances envers les bibliothèques partagées dans I<fichier-local-shlibs> "
-"au lieu de B<debian/shlibs.local>."
-
-# type: Plain text
-#: dpkg-source.1:540
-msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
-msgstr ""
-"Les définitions des variables de substitution seront affichées sur la sortie "
-"standard, plutôt qu'ajoutées dans le fichier de substitution des variables "
-"qui est par défaut debian/substvars."
-
-# type: TP
-#: dpkg-source.1:540
-#, no-wrap
-msgid "B<-t>I<type>"
-msgstr "B<-t>I<type>"
-
-# type: Plain text
-#: dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
-msgstr ""
-"B<dpkg-shlibdeps> préfèrera les informations sur les dépendances des "
-"bibliothèques partagées qui sont étiquetées pour un type de paquet donné.  "
-"Si aucune information de type n'est donnée, il n'utilisera pas "
-"d'information.  Par défaut, le type de paquet est \"deb\". On peut créer une "
-"étiquette pour ces informations en les préfixant par le nom du type, un deux-"
-"points et un espace."
-
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr "LES OPTIONS DE DPKG-GENCHANGES"
-
-# type: Plain text
-#: dpkg-source.1:552
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
-msgstr "B<dpkg-genchanges> ne prend pas d'argument sans option."
-
-# type: TP
-#: dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr "B<-u>I<répertoire-des-fichiers-à-installer>"
-
-# type: Plain text
-#: dpkg-source.1:563
-msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
-msgstr ""
-"Cherche les fichiers à installer dans I<répertoire-des-fichiers-à-installer> "
-"plutôt que dans B<..> (B<dpkg-genchanges> doit trouver ces fichiers de "
-"manière à mettre leurs tailles et leurs sommes de contrôle dans le fichier "
-"B<.changes.)>"
-
-# type: TP
-#: dpkg-source.1:563
-#, no-wrap
-msgid "B<-q>"
-msgstr "B<-q>"
-
-# type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
-msgstr ""
-"B<dpkg-genchanges> affiche habituellement des messages d'information sur la "
-"sortie d'erreur standard\\ ; par exemple, combien de fichiers source du "
-"paquet sont en cours d'installation. B<-q> supprime ces messages."
-
-# type: SH
-#: dpkg-source.1:571
-#, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
-msgstr "LES OPTIONS DE DPKG-BUILDPACKAGE"
-
-# type: Plain text
-#: dpkg-source.1:574
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr "B<dpkg-buildpackage> ne prend pas d'argument sans option."
-
-# type: TP
-#: dpkg-source.1:574
-#, no-wrap
-msgid "B<-k>I<key-id>"
-msgstr "B<-k>I<key-id>"
-
-# type: Plain text
-#: dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
-msgstr "Précise une clé pour la signature des paquets."
-
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
-msgstr "B<-r>I<commande-pour-obtenir-privilèges-de-root>"
-
-# type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
-msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
-msgstr ""
-"Quand B<dpkg-buildpackage> doit exécuter une partie du processus de "
-"construction en tant que root, il préfixe la commande exécutée par "
-"I<commande-pour-obtenir-privilèges-de-root>, si elle existe. I<commande-pour-"
-"obtenir-privilèges-de-root> sera le nom d'un programme présent dans le "
-"B<PATH> et ce programme prend comme argument le nom de la commande réelle à "
-"exécuter et les arguments qu'elle doit prendre. I<commande-pour-obtenir-"
-"privilèges-de-root> ne contiendra pas d'espace ni aucun « métacaractère » de "
-"l'interpréteur de commandes.  I<commande-pour-obtenir-privilèges-de-root> "
-"est classiquement B<fakeroot>, B<sudo>, B<super> ou B<really>. B<su> ne va "
-"pas, puisque ce programme demande une option B<-c> pour exécuter une commande"
-"\\ ; et même alors il ne peut qu'appeler l'interpréteur de commandes de "
-"l'utilisateur au lieu de passer directement les arguments à la commande qui "
-"doit être exécutée."
-
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
-msgstr "B<-p>I<commande-de-signature>"
-
-# type: Plain text
-#: dpkg-source.1:628
-msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
-msgstr ""
-"Quand B<dpkg-buildpackage> doit exécuter GPG ou PGP pour signer un fichier "
-"source de contrôle (B<.dsc>) ou un fichier B<.changes>, il exécute "
-"I<commande-de-signature> (en examinant le B<PATH> si nécessaire) au lieu de "
-"B<pgp>. I<commande-de-signature> obtient tous les arguments qu'aurait obtenu "
-"B<pgp>. Si I<commande-de-signature> veut recevoir ses arguments à la manière "
-"GPG plutôt qu'à la manière PGP, on choisira l'option B<-sgpg.> I<commande-de-"
-"signature> ne contiendra pas d'espace ni aucun «\\ métacaractère\\ » de "
-"l'interpréteur de commandes."
-
-# type: TP
-#: dpkg-source.1:628
-#, no-wrap
-msgid "B<-tc>"
-msgstr "B<-tc>"
-
-# type: Plain text
-#: dpkg-source.1:634
-msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
-msgstr ""
-"Nettoyage de l'arborescence (en utilisant I<commande-pour-obtenir-privilèges-"
-"de-root> B<debian/rules clean>)  après la construction du paquet."
-
-# type: TP
-#: dpkg-source.1:634
-#, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<-us>, B<-uc>"
-
-# type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
-msgstr ""
-"Ne pas signer, respectivement, soit le paquet source, soit le fichier «\\ ."
-"changes\\ »."
-
-# type: TP
-#: dpkg-source.1:637
-#, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<-a>I<architecture>"
-
-# type: Plain text
-#: dpkg-source.1:642
-msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
-msgstr ""
-"Précise l'architecture Debian pour laquelle on construit. L'architecture de "
-"la machine sur laquelle on construit est automatiquement déterminée\\ ; "
-"c'est aussi l'architecture par défaut de la machine hôte."
-
-# type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
-msgstr "Chaîne passée telle quelle à B<dpkg-source.>"
-
-# type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
-msgstr ""
-"Fichier passé tel quel à B<dpkg-source.> Peut être plusieurs fois répétée."
-
-# type: TP
-#: dpkg-source.1:651
-#, no-wrap
-msgid "B<-D>"
-msgstr "B<-D>"
-
-# type: Plain text
-#: dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
-msgstr ""
-"Vérifier les dépendances de constructions et les conflits\\ ; se termine en "
-"cas de problèmes."
-
-# type: TP
-#: dpkg-source.1:654
-#, no-wrap
-msgid "B<-d>"
-msgstr "B<-d>"
-
-# type: Plain text
-#: dpkg-source.1:657
-msgid "Do not check build dependencies and conflicts."
-msgstr "Ne pas vérifier les dépendances de constructions et les conflits."
-
-# type: TP
-#: dpkg-source.1:657
-#, no-wrap
-msgid "B<-nc>"
-msgstr "B<-nc>"
-
-# type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
-msgstr "Ne pas nettoyer l'arborescence source (implique l'option -b)"
-
-# type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
-msgstr "LES ARGUMENTS DE DPKG-DISTADDFILE"
-
-# type: Plain text
-#: dpkg-source.1:666
-msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
-msgstr ""
-"B<dpkg-distaddfile> ne prend pas d'option particulière. Il prend trois "
-"arguments sans option, à savoir le nom du fichier, la section et la "
-"priorité, pour le fichier B<.changes>."
-
-# type: Plain text
-#: dpkg-source.1:674
-msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
-msgstr ""
-"Le nom du fichier sera indiqué relativement au répertoire dans lequel B<dpkg-"
-"genchanges> s'attend à trouver les fichiers, habituellement B<..>, plutôt "
-"que relativement au répertoire dans lequel est exécuté B<dpkg-distaddfile.>"
-
-# type: SH
-#: dpkg-source.1:674
+# type: TP
+#: dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
-msgstr "LES ARGUMENTS DE DPKG-PARSECHANGELOG"
+msgid "B<-p>I<varnameprefix>"
+msgstr "B<-p>I<préfixe-pour-le-nom-des-variables>"
 
 # type: Plain text
-#: dpkg-source.1:677
+#: dpkg-shlibdeps.1:80
+#, fuzzy
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
-"B<dpkg-parsechangelog> ne prend ni d'option particulière ni d'argument sans "
-"option."
-
-# type: SH
-#: dpkg-source.1:677
-#, no-wrap
-msgid "VARIABLE SUBSTITUTION"
-msgstr "LA SUBSTITUTION DE VARIABLE"
+"Les variables de substitution commenceront par I<préfixe-pour-le-nom-des-"
+"variables>B<:> au lieu de B<shlibs:>. De même, toute variable de "
+"substitution commençant par I<préfixe-pour-le-nom-des-variables>B<:> (au "
+"lieu de B<shlib:>) est enlevée du fichier de substitution des variables."
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-shlibdeps.1:86
+#, fuzzy
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
-"Avant que B<dpkg-source>, B<dpkg-gencontrol> et B<dpkg-genchanges> "
-"n'écrivent leurs informations de contrôle (dans le fichier source de "
-"contrôle B<.dsc> pour B<dpkg-source> et sur la sortie standard pour B<dpkg-"
-"gencontrol> et B<dpkg-genchanges),> ils accomplissent quelques substitutions "
-"de variable dans le fichier de sortie."
+"Les définitions des variables de substitution seront affichées sur la sortie "
+"standard, plutôt qu'ajoutées dans le fichier de substitution des variables "
+"qui est par défaut debian/substvars."
+
+# type: TP
+#: dpkg-shlibdeps.1:86
+#, no-wrap
+msgid "B<-t>I<type>"
+msgstr "B<-t>I<type>"
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:93
+#, fuzzy
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
-"Une substitution de variable est de la forme : B<${>I<variable-nom>B<}>. Les "
-"noms de variable consistent en caractères alphanumériques, traits d'union et "
-"«\\ deux points\\ » ; ils commencent par une lettre ou un chiffre. La "
-"substitution se fait répétitivement jusqu'à ce qu'il n'en reste aucune à "
-"faire\\ ; le texte entier du champ après la substitution est réexaminé pour "
-"chercher d'autres substitutions."
+"B<dpkg-shlibdeps> préfèrera les informations sur les dépendances des "
+"bibliothèques partagées qui sont étiquetées pour un type de paquet donné.  "
+"Si aucune information de type n'est donnée, il n'utilisera pas "
+"d'information.  Par défaut, le type de paquet est \"deb\". On peut créer une "
+"étiquette pour ces informations en les préfixant par le nom du type, un deux-"
+"points et un espace."
+
+# type: TP
+#: dpkg-shlibdeps.1:93
+#, no-wrap
+msgid "B<-L>I<localshlibsfile>"
+msgstr "B<-L>I<fichier-local-shlibs>"
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:99
+#, fuzzy
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
-"Quand toutes les substitutions ont été faites, chaque occurrence de la "
-"chaîne B<${}> (laquelle n'est pas une substitution autorisée) est remplacée "
-"par un signe B<$>."
+"B<dpkg-shlibdeps> lira les informations de remplacement concernant les "
+"dépendances envers les bibliothèques partagées dans I<fichier-local-shlibs> "
+"au lieu de B<debian/shlibs.local>."
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-shlibdeps.1:105
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
-"On peut définir les variables en utilisant l'option commune B<-V>. On peut "
-"aussi se servir du fichier B<debian/substvars> (ou tout autre fichier avec "
-"l'option B<-T>). Ce fichier est composé de lignes de la forme suivante\\ : "
-"I<nom>B<=>I<valeur>. Les espaces résiduels sur chaque ligne, les lignes "
-"vides et les lignes qui commencent par un symbole B<#> sont ignorés."
-
-# type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
-msgstr "En outre, les variables standard suivantes sont disponibles\\ :"
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<Arch>"
-msgstr "B<Arch>"
+msgid "B<debian/shlibs.local>"
+msgstr "B<debian/shlibs.local>"
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
-"L'architecture pour laquelle on construit (tirée de B<dpkg --print-"
-"architecture>)."
+"Fichier particulier à un paquet remplaçant les informations qui concernent "
+"les dépendances envers des bibliothèques partagées."
 
 # type: TP
-#: dpkg-source.1:720
+#: dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<source:Version>"
-msgstr "B<Source:Version>"
+msgid "B</etc/dpkg/shlibs.override>"
+msgstr "B</etc/dpkg/shlibs.override>"
 
 # type: Plain text
-#: dpkg-source.1:723
-msgid "The source package version."
-msgstr "La version du paquet source."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
+msgstr ""
+"Fichier système remplaçant les informations qui concernent les dépendances "
+"envers des bibliothèques partagées."
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:123
 #, no-wrap
-msgid "B<source:Upstream-Version>"
-msgstr "B<source:Upstream-Version>"
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr "B</etc/dpkg/shlibs.default>"
 
 # type: Plain text
-#: dpkg-source.1:727
-msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
-"La version amont du paquet source, avec éventuellement l'«\\ epoch\\ » de la "
-"version debian."
+"Fichier système par défaut concernant les informations de dépendances envers "
+"des bibliothèques partagées."
 
 # type: TP
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:129
+#, fuzzy
+msgid "B<deb-shlibs>(5)."
+msgstr "B<debian/shlibs.local>"
+
+# type: TH
+#: dpkg-source.1:2
 #, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<binary:Version>"
+msgid "dpkg-source"
+msgstr "dpkg-source"
+
+# type: Plain text
+#: dpkg-source.1:6
+#, fuzzy
+msgid "dpkg-source, - Debian source package tools"
+msgstr "B<dpkg-source> empaquète ou dépaquète une archive source Debian."
+
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:731
+#: dpkg-source.1:15
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
+msgstr "B<dpkg-source> empaquète ou dépaquète une archive source Debian."
+
+# type: Plain text
+#: dpkg-source.1:19
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
-"La version du paquet binaire (qui peut être différente de source:Version "
-"dans un binNMU par exemple)."
+"Aucune de ces commandes ne permet la combinaison de plusieurs options en une "
+"seule et elles ne permettent pas d'indiquer la valeur d'une option dans un "
+"argument séparé."
 
-# type: TP
-#: dpkg-source.1:731
-#, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<Source-Version>"
+# type: Plain text
+#: dpkg-source.1:21
+#, fuzzy, no-wrap
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
+msgstr "B<dpkg-source> B<-x >I<fichier.dsc> [I<répertoire-de-sortie>]"
 
 # type: Plain text
-#: dpkg-source.1:736
+#: dpkg-source.1:31
+#, fuzzy
 msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
-"La version du paquet source, selon le fichier changelog. Cette variable est "
-"maintenant B<déconseillée> car sa signification est distincte de sa "
-"fonction. Utilisez plutôt B<source:Version> ou B<binary:Version>."
+"Cette option sert à extraire un paquet source. On doit donner un seul "
+"argument sans option\\ : le nom du fichier de contrôle des sources Debian "
+"(B<.dsc>).  Un deuxième argument sans option peut être donné pour indiquer "
+"le répertoire où extraire le paquet source, cela ne doit pas exister. Quand "
+"aucun répertoire n'est indiqué, le paquet source est extrait dans le "
+"répertoire I<source>-I<version-> du répertoire courant."
 
-# type: TP
-#: dpkg-source.1:736
-#, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<Installed-Size>"
+# type: Plain text
+#: dpkg-source.1:37
+#, fuzzy
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
+msgstr ""
+"Aucune option n'est utile avec B<dpkg-source-x>.  B<dpkg-source> lit, dans "
+"le fichier de contrôle, les noms des fichiers qui composent le paquet source"
+"\\ ; il suppose qu'ils sont dans le même répertoire que le fichier B<.dsc.>"
 
 # type: Plain text
-#: dpkg-source.1:745
+#: dpkg-source.1:45
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
-"La taille de tous les fichiers installés du paquet. Cette valeur est copiée "
-"dans le champ adéquat du fichier « control » ; Quand on fixe cette variable, "
-"cela modifie la valeur de ce champ. Quand elle est indéterminée, B<dpkg-"
-"gencontrol> use de la commande B<du -k debian/tmp> pour trouver une valeur "
-"par défaut."
+"Les fichiers extraits du paquet auront le même système de propriété et de "
+"permission que s'ils avaient été simplement créés -- les répertoires et les "
+"fichiers exécutables auront un système de permission égal à 0777 et les "
+"simples fichiers, 0666\\ ; ces deux systèmes étant modifiés par le masque de "
+"celui qui fait l'extraction\\ ; Si le répertoire parent est «\\ setgid\\ », "
+"les répertoires extraits le seront aussi et tous les fichiers et répertoires "
+"hériteront du système de propriété de ce groupe."
 
-# type: TP
-#: dpkg-source.1:745
-#, no-wrap
-msgid "B<Extra-Size>"
-msgstr "B<Extra-Size>"
+# type: Plain text
+#: dpkg-source.1:45
+#, fuzzy, no-wrap
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-source -b> [I<options>] I<répertoire> [I<répertoire-d'origine> | orig-targz |'']"
 
 # type: Plain text
-#: dpkg-source.1:754
+#: dpkg-source.1:60
+#, fuzzy
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
-"L'espace disque supplémentaire utilisé pour l'installation du paquet. Quand "
-"on fixe cette variable, on ajoute sa valeur à la valeur de la variable "
-"B<Installed-Size> (qu'elle soit définie explicitement ou calculée par "
-"défaut) avant que la variable B<Installed-Size> ne soit copiée dans le champ "
-"du fichier «\\ control\\ »."
-
-# type: TP
-#: dpkg-source.1:754
-#, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<F:>I<fieldname>"
+"Construire : empaqueter une arborescence. Un ou deux arguments, sans "
+"options, seront fournis. Le premier représente le nom du répertoire qui "
+"contient l'arborescence non empaquetée. Si l'on donne un second argument, ce "
+"sera le nom du répertoire source original ou bien le nom du fichier «\\ tar"
+"\\ » ou bien une chaîne vide si le paquet est «\\ debian pure souche\\ » et "
+"n'a donc pas de fichiers «\\ diffs\\ » concernant sa «\\ debianisation\\ ». "
+"S'il n'y a pas de second argument, et selon les autres arguments donnés, "
+"B<dpkg-source> cherche le fichier « tar » des sources originelles "
+"I<paquet>B<_>I<version-originelle>B<.orig.tar.gz> ou bien le répertoire "
+"source originel I<répertoire>B<.orig> ou bien une chaîne vide (pas de source "
+"originel, et donc pas de « diffs »)."
 
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-source.1:75
+#, fuzzy
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
-"La valeur du champ I<fieldname> affiché en sortie et qui doit être "
-"classiquement en majuscules. Quand on fixe ces variables, cela ne prend "
-"effet que là où elles sont effectivement développées."
+"Quand on fournit les options communes B<-c> et B<-l> avec des chemins "
+"relatifs, on considère qu'ils sont relatifs au répertoire le plus élevé de "
+"l'arborescence source."
 
-# type: TP
-#: dpkg-source.1:761
-#, no-wrap
-msgid "B<Format>"
-msgstr "B<Format>"
+# type: Plain text
+#: dpkg-source.1:82
+#, fuzzy
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
+msgstr ""
+"Quand on fournit les options communes B<-c> et B<-l> avec des chemins "
+"relatifs, on considère qu'ils sont relatifs au répertoire le plus élevé de "
+"l'arborescence source."
 
 # type: Plain text
-#: dpkg-source.1:771
-msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
 msgstr ""
-"La version du format du fichier B<.changes> produite par la version des "
-"scripts construisant le source. Quand on détermine cette variable, le "
-"contenu du champ B<Format> dans le fichier B<.changes> est aussi modifié."
-
-# type: TP
-#: dpkg-source.1:771
-#, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
-msgstr "B<Newline>, B<Space>, B<Tab>"
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
-msgstr "Ces variables contiennent chacune le caractère correspondant."
-
-# type: TP
-#: dpkg-source.1:774
-#, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
-msgstr "B<shlibs:>I<dependencyfield>"
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:118
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
-"Les variables déterminées de cette façon sont produites par B<dpkg-"
-"shlibdeps>, voyez plus haut."
+"On peut donner une expression rationnelle Perl correspondant aux fichiers "
+"qui doivent être éliminés de la liste des fichiers pour le «\\ diff\\ ». "
+"Cette liste est créée par une commande «\\ find\\ ». L'option B<-i> toute "
+"seule, élimine les fichiers de contrôle et les répertoires des systèmes les "
+"plus connus de contrôle de version, les fichiers d'échange et de sauvegarde "
+"et les répertoire utilisés par Libtool."
 
-# type: TP
-#: dpkg-source.1:779
-#, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg:Upstream-Version>"
+# type: Plain text
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
+msgstr ""
+"C'est très utile pour supprimer les fichiers superflus qui sont inclus dans "
+"le .diff.gz (p. ex. «\\ debian/BUGS_TODO/*\\ » ou «\\ debian/RCS/*,v\\ »). "
+"Quand on suit avec un CVS distant un paquet que l'on maintient, et qu'on a "
+"pas la possibilité d'enregistrer les fichiers debian de contrôle ou "
+"d'étiqueter I<cvs-buildpackage(1)>, il faut faire un «\\ checkout/update\\ » "
+"supplémentaire dans un répertoire tenu vierge pour créer le fichier orig.tar."
+"gz. Les fichiers «\\ CVS/Entries\\ » de ce répertoire contiennent des dates "
+"qui diffèrent de celles du répertoire de travail\\ ; cela provoque indûment "
+"leur inclusion dans chaque .diff.gz créé, à moins d'utiliser l'option B<-i>."
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
-msgstr "La version amont de dpkg."
+#: dpkg-source.1:137
+msgid ""
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
+msgstr ""
+"Avec cette option, le fichier est passé à l'option --exclude de tar quand on "
+"veut créer un fichier .orig.tar.gz ou .tar.gz. Par exemple, -ICVS fera que "
+"tar sautera les répertoires du CVS quand il doit créer un fichier .tar.gz. "
+"On peut répéter cette option pour exclure plusieurs fichiers."
 
 # type: TP
-#: dpkg-source.1:782
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg:Version>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>"
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
-msgstr "La version complète de dpkg."
+#: dpkg-source.1:173
+msgid ""
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
+msgstr ""
+"Quand on spécifie B<-sk> ou B<-sp,> B<dpkg-source> s'attend à ce que le "
+"source originel soit un fichier «\\ tar\\ »\\ ; par défaut, c'est le fichier "
+"I<paquet>B<_>I<version-originelle>B<.orig.tar.gz>.B< Il le laisse en place "
+"en tant que fichier «\\ tar\\ » ou le copie dans le répertoire en cours s'il "
+"n'y est pas déjà. Quand on utilise -sp> au lieu de B<-sk,> il le supprime "
+"ensuite."
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:185
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
-"Quand une variable est référencée mais n'est pas définie, cela produit un "
-"avertissement et une valeur nulle est assumée."
-
-# type: TP
-#: dpkg-source.1:789
-#, no-wrap
-msgid "B<debian/control>"
-msgstr "B<debian/control>"
+"Quand on spécifie B<-su> ou B<-sr>, le source originel est attendu comme un "
+"répertoire\\ ; par défaut, c'est le répertoire I<paquet>B<->I<version-"
+"originelle>B<.orig> et B<dpkg-source> crée une nouvelle archive du source "
+"originel. Quand on utilise B<-sr>, B<dpkg-source> supprime ce répertoire "
+"après usage."
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:196
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
-"Le principal fichier d'information sur les sources\\ ; il donne des "
-"renseignements qui ne dépendent pas d'une version concernant le paquet "
-"source et les paquets binaires qui peuvent être créés."
-
-# type: TP
-#: dpkg-source.1:794
-#, no-wrap
-msgid "B<debian/changelog>"
-msgstr "B<debian/changelog>"
+"Quand on utilise B<-ss>, B<dpkg-source> s'attend à ce que le source originel "
+"soit disponible à la fois comme un répertoire et comme un fichier «\\ tar\\ "
+"». Il se sert du répertoire pour créer le «\\ diff\\ », mais se sert du "
+"fichier «\\ tar\\ » pour créer le fichier B<.dsc>. On doit faire attention "
+"avec cette option. Si le répertoire et le fichier «\\ tar\\ » ne "
+"correspondent pas, une mauvaise archive source en résulte."
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:205
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
-"Le fichier d'enregistrement des modifications\\ ; on s'en sert pour "
-"connaître les informations qui dépendent d'une version du paquet source, par "
-"exemple l'urgence ou la distribution d'une installation sur le serveur, les "
-"modifications faites depuis telle édition et le numéro de la version source "
-"lui-même."
-
-# type: TP
-#: dpkg-source.1:800
-#, no-wrap
-msgid "B<debian/files>"
-msgstr "B<debian/files>"
+"Quand on utilise B<-sn>, B<dpkg-source> ne cherche pas de source originel, "
+"et ne crée pas de «\\ diff\\ ». Le second argument, s'il existe, doit être "
+"une chaîne vide. Cela sert pour les paquets Debian pure souche qui n'ont pas "
+"un source originel distinct et donc, pas de fichier «\\ diff\\ » de "
+"debianisation."
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:234
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
-"La liste des fichiers créés qui seront installés sur le serveur. B<dpkg-"
-"gencontrol> ajoute les noms présumés des fichiers des paquets binaires à "
-"partir des fichiers «\\ control\\ » qu'il crée\\ ; pour ajouter d'autres "
-"fichiers on peut se servir de B<dpkg-distaddfile>. B<dpkg-genchanges> lit "
-"dans ce fichier les données nécessaires à la création du fichier B<.changes>."
-
-# type: TP
-#: dpkg-source.1:813
-#, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<debian/substvars>"
+"Quand on utilise B<-sa> ou B<-sA,> B<dpkg-source> cherche un source originel "
+"soit sous forme de fichier «\\ tar\\ », soit sous forme de répertoire -- le "
+"deuxième argument, s'il existe, ou bien une chaîne vide (cela revient à "
+"utiliser l'option B<-sn)>. Quand un fichier «\\ tar\\ » existe, il est "
+"dépaqueté et B<dpkg-source> crée un fichier «\\ diff\\ »\\ ; ensuite il "
+"supprime le fichier «\\ tar\\ » (cela revient à utiliser l'option B<-sp)>"
+"\\ ; quand un répertoire est trouvé, il est dépaqueté et B<dpkg-source> crée "
+"le source originel et supprime ensuite ce répertoire (cela revient à "
+"utiliser l'option B<-sr)>\\ ; quand ni l'un ni l'autre n'est trouvé, B<dpkg-"
+"source> suppose que le paquet ne possède pas de fichier «\\ diff\\ » de "
+"debianisation, mais seulement une simple archive source (cela revient à "
+"utiliser l'option B<-sn>). Quand les deux sont trouvés, B<dpkg-source> "
+"ignore le répertoire et le remplace si l'option B<-sA> a été spécifiée (cela "
+"revient à utiliser l'option B<-sP)>\\ ; ou bien il provoque une erreur si "
+"l'option B<-sa> a été spécifiée. L'option par défaut est B<-sA>."
 
 # type: Plain text
-#: dpkg-source.1:816
-msgid "List of substitution variables and values."
-msgstr "La liste des variables de substitution et leurs valeurs."
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
+msgstr ""
+"Les options B<-sa>, B<-sp>, B<-sk>, B<-su> et B<-sr> ne remplacent pas les "
+"fichiers «\\ tar\\ » ou les répertoires existants. Pour cela, il faut "
+"utiliser les options B<-sA>, B<-sP>, B<-sK>, B<-sU> et B<-sR.>"
 
 # type: TP
-#: dpkg-source.1:816
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B<debian/shlibs.local>"
-msgstr "B<debian/shlibs.local>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+msgstr "B<-sp>,B<-su>,B<-sn> avec B<-x>"
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
-"Fichier particulier à un paquet remplaçant les informations qui concernent "
-"les dépendances envers des bibliothèques partagées."
-
-# type: TP
-#: dpkg-source.1:819
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
-msgstr "B</etc/dpkg/shlibs.override>"
+"Dans tous ces cas, l'arborescence existante d'un source originel est "
+"supprimée."
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
-"Fichier système remplaçant les informations qui concernent les dépendances "
-"envers des bibliothèques partagées."
+"Quand on utilise l'option B<-sp> lors d'une extraction, le source originel "
+"(s'il existe) est laissé en tant que fichier «\\ tar\\ ». S'il n'est pas "
+"déjà dans le répertoire en cours ou si ce répertoire contient un fichier "
+"différent, le fichier «\\ tar\\ » est copié dans ce répertoire. C'est le "
+"comportement par défaut."
 
-# type: TP
-#: dpkg-source.1:822
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
-msgstr "B</etc/dpkg/shlibs.default>"
+# type: Plain text
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
+msgstr "L'option B<-su> dépaquète une arborescence source originelle."
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:258
+msgid ""
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
-"Fichier système par défaut concernant les informations de dépendances envers "
-"des bibliothèques partagées."
+"L'option B<-sn> assure que le source originel ne sera ni copié dans le "
+"répertoire en cours, ni dépaqueté. Une arborescence source originelle "
+"présente dans le répertoire en cours est toujours supprimée."
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:263
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
-msgstr ""
-"Le moment où a lieu le remplacement d'un champ par rapport à certaines "
-"déterminations de champ affichées sur la sortie standard est plutôt "
-"embrouillé."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
+msgstr ""
+"Toutes les options B<-sX> s'excluent mutuellement. Si vous en indiquez "
+"plusieurs, seule la dernière sera prise en compte."
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:274
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -7327,47 +7544,11 @@ msgstr ""
 "paquet et les numéros de version."
 
 # type: Plain text
-#: dpkg-source.1:839
-msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
-msgstr ""
-"On devrait pouvoir mettre des espaces et des métacaractères du shell dans "
-"les arguments initiaux de I<commande-pour-obtenir-privilèges-de-root> et "
-"I<commande-de-signature>."
-
-# type: Plain text
-#: dpkg-source.1:845
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+#: dpkg-source.1:279
+#, fuzzy
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
 
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr "Ces outils et cette page de manuel ont été écrits par Ian Jackson."
-
-# type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr "Copyright (C) 1995-1996 Ian Jackson"
-
-# type: Plain text
-#: dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr "Copyright (C) 2000 Wichert Akkerman"
-
-# type: Plain text
-#: dpkg-source.1:857
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"C'est un logiciel libre\\ ; voyez la «\\ GNU General Public Licence\\ » "
-"version 2 ou supérieure pour le copyright. Il n'y a B<pas> de garantie. "
-"Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-licenses/GPL> "
-"pour des précisions."
-
 # type: TH
 #: dpkg-split.1:2
 #, no-wrap
@@ -7380,37 +7561,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-split - outil de décomposition/recomposition des paquets Debian"
 
 # type: Plain text
-#: dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-split> B<-s>|B<--split> I<archive-complète> [I<préfixe>]"
-
-# type: Plain text
-#: dpkg-split.1:13
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg-split> B<-j>|B<--join> I<partie> ..."
-
-# type: Plain text
-#: dpkg-split.1:17
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-split> B<-I>|B<--info> I<partie> ..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< fichier-complet partie>"
-
-# type: Plain text
-#: dpkg-split.1:24
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg-split> B<-l>|B<--listq>"
-
-# type: Plain text
-#: dpkg-split.1:28
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquet> ...]"
+#: dpkg-split.1:10
+#, fuzzy
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -7422,7 +7579,7 @@ msgstr ""
 "les disquettes."
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -7431,7 +7588,7 @@ msgstr ""
 "et B<--info>."
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -7444,7 +7601,7 @@ msgstr ""
 "listq> et B<--discard> permettent la gestion de cette file."
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -7453,19 +7610,19 @@ msgstr ""
 "produisent des messages sur la sortie standard\\ ; On peut tranquillement "
 "les ignorer."
 
-# type: TP
-#: dpkg-split.1:49
-#, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--split>, B<-s>"
+# type: Plain text
+#: dpkg-split.1:33
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-split> B<-s>|B<--split> I<archive-complète> [I<préfixe>]"
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr "Décompose en plusieurs parties un paquet binaire Debian."
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -7476,7 +7633,7 @@ msgstr ""
 "(les deux sont des décimaux)."
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -7484,14 +7641,14 @@ msgstr ""
 "Quand on ne donne pas de I<préfixe,> le nom du fichier I<archive-complète> "
 "est utilisé, en incluant le répertoire et en supprimant tout B<.deb> restant."
 
-# type: TP
-#: dpkg-split.1:68
-#, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--join>, B<-j>"
+# type: Plain text
+#: dpkg-split.1:52
+#, fuzzy, no-wrap
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-split> B<-j>|B<--join> I<partie> ..."
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -7500,7 +7657,7 @@ msgstr ""
 "tel qu'il était avant la décomposition."
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -7511,7 +7668,7 @@ msgstr ""
 "dans la liste des arguments\\ ; mais il est inutile de les ordonner."
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -7523,19 +7680,25 @@ msgstr ""
 "B<dpkg-split --split>."
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 "Le nom des parties n'est pas significatif pour le processus de recomposition."
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 "Par défaut, le fichier produit s'appelle\\ : I<paquet>B<->I<version>B<.deb>."
 
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-split> B<-I>|B<--info> I<partie> ..."
+
+# type: Plain text
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -7545,21 +7708,21 @@ msgstr ""
 "par tous. Les arguments ne représentant pas la partie d'un fichier binaire "
 "le disent aussi sur la sortie standard."
 
-# type: TP
-#: dpkg-split.1:92
-#, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--auto>, B<-a>"
+# type: Plain text
+#: dpkg-split.1:76
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< fichier-complet partie>"
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 "Met en file automatiquement les parties en vue de la recomposition d'un "
 "paquet."
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
@@ -7568,7 +7731,7 @@ msgstr ""
 "même paquet qui se trouvent (si elles existent) dans la file."
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -7580,7 +7743,7 @@ msgstr ""
 "erreur)."
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -7589,7 +7752,7 @@ msgstr ""
 "fichier I<fichier-complet> n'est pas créé."
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
@@ -7599,7 +7762,7 @@ msgstr ""
 "autre erreur, c'est un code de sortie égal à 2."
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -7610,18 +7773,18 @@ msgstr ""
 "fichier attendre."
 
 # type: TP
-#: dpkg-split.1:127
-#, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--listq>, B<-l>"
+#: dpkg-split.1:111
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--listq>"
+msgstr "B<-l, --license>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr "Liste le contenu d'une file de paquets à recomposer."
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -7631,14 +7794,14 @@ msgstr ""
 "le nom du fichier, les parties présentes dans la file et le nombre total "
 "d'octets conservés."
 
-# type: TP
-#: dpkg-split.1:134
-#, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--discard>, B<-d>"
+# type: Plain text
+#: dpkg-split.1:118
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paquet> ...]"
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -7647,7 +7810,7 @@ msgstr ""
 "en attente des autres parties composant le paquet."
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
@@ -7655,37 +7818,14 @@ msgstr ""
 "Quand aucun I<paquet> n'est donné, la file est vidée\\ ; si un paquet est "
 "donné, seules les parties de ce paquet sont détruites."
 
-# type: Plain text
-#: dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-"Affiche un message de B<dpkg-split> donnant un résumé de ses options et de "
-"leur utilisation."
-
-# type: Plain text
-#: dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "Affiche le numéro de version de B<dpkg-split>."
-
-# type: Plain text
-#: dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-"Affiche les renseignements sur le copyright et l'absence de garantie.  "
-"(L'orthographe américaine\\ : B<--license> est acceptée.)"
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< répertoire>"
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -7695,33 +7835,34 @@ msgstr ""
 "var/lib/dpkg>."
 
 # type: TP
-#: dpkg-split.1:166
-#, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr "B<--partsize>|B<-S>I< kbytes>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
+#, fuzzy
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 "Indique, en kilooctets (1024 octets), la taille maximum d'une partie lors "
 "d'une décomposition. Par défaut, la taille maximum est de 450 ko."
 
 # type: TP
-#: dpkg-split.1:170
-#, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+#: dpkg-split.1:147
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<--output>|B<-O>I< fichier-complet>"
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr "Indique le nom du fichier à produire pour une recomposition."
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -7731,13 +7872,13 @@ msgstr ""
 "file automatiques (B<--auto>)."
 
 # type: TP
-#: dpkg-split.1:178
-#, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--npquiet>, B<-Q>"
+#: dpkg-split.1:155
+#, fuzzy, no-wrap
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -7752,20 +7893,20 @@ msgstr ""
 "décomposés."
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 "Oblige le nom des fichiers produits par B<--split> à se conformer à msdos."
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -7777,7 +7918,7 @@ msgstr ""
 "caractères sont abandonnés."
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
@@ -7786,13 +7927,13 @@ msgstr ""
 "forme\\ : I<prefixN>B<of>I<M>B<.deb> sont créés."
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "CODE DE SORTIE"
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -7804,7 +7945,7 @@ msgstr ""
 "paquet binaire."
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
@@ -7813,7 +7954,7 @@ msgstr ""
 "signale que le fichier I<partie> n'est pas une partie d'un paquet binaire."
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -7824,7 +7965,7 @@ msgstr ""
 "est défectueux, ou bien une erreur d'utilisation, etc."
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
@@ -7833,7 +7974,7 @@ msgstr ""
 "paquets Debian."
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -7842,7 +7983,7 @@ msgstr ""
 "la file à moins d'aller voir soi-même dans le répertoire de la file."
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -7851,7 +7992,7 @@ msgstr ""
 "paquet binaire ou non."
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -7862,13 +8003,13 @@ msgstr ""
 "n'est pas présente dans les fichiers produits."
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
@@ -7876,7 +8017,7 @@ msgstr ""
 "recomposition automatique."
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -7888,12 +8029,12 @@ msgstr ""
 "fichier."
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
 "Copyright (C) 1995-1996 by him and released under the GNU General Public "
@@ -7925,25 +8066,12 @@ msgstr "dpkg-statoverride - annuler la propri
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>utilisateurE<gt> "
-"E<lt>groupeE<gt> E<lt>modeE<gt> E<lt>fichierE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fichierE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>exp-regE<gt>]>"
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg-architecture> [I<options>] [I<action>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -7962,7 +8090,7 @@ msgstr ""
 "groupe donné."
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -7972,19 +8100,20 @@ msgstr ""
 "listage des dérogations."
 
 # type: TP
-#: dpkg-statoverride.8:34
-#, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#: dpkg-statoverride.8:25
+#, fuzzy, no-wrap
+msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< E<lt>utilisateurE<gt> E<lt>groupeE<gt> E<lt>modeE<gt> E<lt>fichierE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
+#, fuzzy
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 "Ajoute une dérogation pour B<E<lt>fichierE<gt>>. B<E<lt>fichierE<gt>> n'a "
 "pas besoin d'exister quand cette commande est utilisée\\ ; la dérogation est "
@@ -7994,37 +8123,33 @@ msgstr ""
 "exemple, B<#0> ou B<#65534>)."
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
+#, fuzzy
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 "Si --update est demandée et si B<E<lt>fichierE<gt>> existe, le fichier "
 "obtient un nouveau propriétaire et un nouveau mode."
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--remove>I< E<lt>fichierE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
+#, fuzzy
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 "Supprime une dérogation pour B<E<lt>fichierE<gt>>, le statut de "
 "B<E<lt>fichierE<gt>> est inchangé."
 
 # type: TP
-#: dpkg-statoverride.8:48
-#, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+#: dpkg-statoverride.8:39
+#, fuzzy, no-wrap
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<E<lt>exp-regE<gt>>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
@@ -8035,14 +8160,23 @@ msgstr ""
 "pas de dérogation, ou quand aucune ne correspond au motif, B<dpkg-"
 "statoverride> se termine avec un code de sortie égal à 1."
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+"Change le répertoire de la base de données de dpkg, où se trouve aussi le "
+"fichier statoverride. Par défaut, c'est I</var/lib/dpkg>."
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
@@ -8051,13 +8185,13 @@ msgstr ""
 "C'est nécessaire pour annuler une précédente dérogation."
 
 # type: TP
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -8065,43 +8199,18 @@ msgstr ""
 "fichier existe."
 
 # type: Plain text
-#: dpkg-statoverride.8:64
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Moins de bavardage sur ce qui est fait."
 
-# type: Plain text
-#: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr "Affiche un message d'aide."
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr "Affiche la version du programme et le copyright."
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr "B<--admindir>"
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
-msgstr ""
-"Change le répertoire de la base de données de dpkg, où se trouve aussi le "
-"fichier statoverride. Par défaut, c'est I</var/lib/dpkg>."
-
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -8112,7 +8221,7 @@ msgstr ""
 "fichiers importants comme «\\ status\\ » ou «\\ available\\ »."
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
@@ -8121,7 +8230,7 @@ msgstr ""
 "-old, avant de le remplacer par un nouveau."
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
 
@@ -8197,6 +8306,12 @@ msgstr ""
 "de ce fichier est soit une option (identique à une option en ligne de "
 "commande mais sans tiret), soit un commentaire, commençant par B<#>."
 
+# type: TP
+#: dselect.1:52
+#, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir>I< E<lt>répertoireE<gt>>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -8422,6 +8537,11 @@ msgstr ""
 "Affiche les informations sur le copyright et sur la licence (avec une "
 "référence à GNU), puis se termine normalement."
 
+# type: Plain text
+#: dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr "Affiche la version et se termine normalement."
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -9595,27 +9715,13 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr "start-stop-daemon - lance ou arrête des démons système"
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr "B<start-stop-daemon> B<-S>|--start I<options> [B<-->] I<arguments>"
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
 
 # type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -9628,15 +9734,41 @@ msgstr ""
 "exemplaires présents d'un processus en fonctionnement."
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:36
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
+msgstr ""
+"Veuillez noter qu'à moins de spécifier B<--pidfile>, le programme B<start-"
+"stop-daemon> se comporte comme B<killall>(1). B<start-stop-daemon> recherche "
+"dans le tableau des processus tout processus qui correspond au nom, uid ou "
+"gid du processus (si indiqué). Toute correspondance empêchera B<--start> de "
+"démarrer le démon. Tous les processus qui correspondent recevront le signal "
+"KILL si B<--stop> est indiqué. Pour les démons avec des processus enfant à "
+"longue vie et qui doivent survivre à un B<--stop> vous devez donner un «\\ "
+"pidfile\\ »."
+
+# type: Plain text
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|--start I<options> [B<-->] I<arguments>"
+
+# type: Plain text
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 "Avec l'action B<--start,> B<start-stop-daemon> vérifie l'existence d'un "
 "processus particulier. Quand existe un tel processus, B<start-stop-daemon> "
@@ -9646,15 +9778,22 @@ msgstr ""
 "B<--startas> si cette option est précisée. Tout argument donné après B<--> "
 "sur la ligne de commande est passé tel quel au programme qui doit être lancé."
 
+# type: IP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-n>, B<--no-sort>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 "Avec l'action B<--stop>, B<start-stop-daemon> vérifie aussi l'existence d'un "
 "processus particulier. Quand un tel processus existe B<start-stop-daemon> "
@@ -9664,34 +9803,38 @@ msgstr ""
 "B<--retry> est indiquée, B<start-stop-daemon> recherche si le processus "
 "s'est bien terminé."
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-h>, B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
-msgstr ""
-"Veuillez noter qu'à moins de spécifier B<--pidfile>, le programme B<start-"
-"stop-daemon> se comporte comme B<killall>(1). B<start-stop-daemon> recherche "
-"dans le tableau des processus tout processus qui correspond au nom, uid ou "
-"gid du processus (si indiqué). Toute correspondance empêchera B<--start> de "
-"démarrer le démon. Tous les processus qui correspondent recevront le signal "
-"KILL si B<--stop> est indiqué. Pour les démons avec des processus enfant à "
-"longue vie et qui doivent survivre à un B<--stop> vous devez donner un «\\ "
-"pidfile\\ »."
+#: start-stop-daemon.8:76
+#, fuzzy
+msgid "Show usage information and exit."
+msgstr "Affiche un message d'aide."
+
+# type: TP
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Affiche la version du programme et le copyright."
 
 # type: TP
-#: start-stop-daemon.8:90
-#, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<exécutable>"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -9700,25 +9843,25 @@ msgstr ""
 "proc/>I<pid>B</exe>)."
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 "Cherche les processus dont les identifiants sont précisés dans I<pid-file.>"
 
 # type: TP
-#: start-stop-daemon.8:98
-#, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>|B<--user> I<nomdutilisateur>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -9726,24 +9869,24 @@ msgstr ""
 "I<nomdutilisateur> ou I<uid.>"
 
 # type: TP
-#: start-stop-daemon.8:104
-#, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>|B<--group> I<group>|I<gid>"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Modifie le I<group> ou le I<gid> au début du processus."
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<nomdeprocessus>"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -9752,13 +9895,13 @@ msgstr ""
 ">I<pid>B</stat>I< ).>"
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<signal>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -9767,13 +9910,13 @@ msgstr ""
 "doit être arrêté (par défaut\\ : signal 15)."
 
 # type: TP
-#: start-stop-daemon.8:118
-#, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>|B<--retry> I<durée>|I<action-prévue>"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -9787,7 +9930,7 @@ msgstr ""
 "l'action-prévue."
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -9798,7 +9941,7 @@ msgstr ""
 "signal indiqué par B<--signal.>"
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -9814,7 +9957,7 @@ msgstr ""
 "demande de répéter constamment le reste de action-prévue, si nécessaire."
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -9826,13 +9969,13 @@ msgstr ""
 "ignoré."
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "I<-a | --startas chemin/nom>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -9841,13 +9984,13 @@ msgstr ""
 "rien n'est précisé, c'est par défaut l'argument donné à B<--exec.>"
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -9856,39 +9999,39 @@ msgstr ""
 "retour, mais ne fait rien."
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Retourne un code de sortie égal à 0 au lieu de 1 si rien n'est ou ne sera "
 "fait."
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 "N'affiche pas de messages d'information ; affiche seulement les messages "
 "d'erreur."
 
 # type: TP
-#: start-stop-daemon.8:183
-#, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c> |B<--chuid> I<utilisateur>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -9909,13 +10052,13 @@ msgstr ""
 "processus des utilisateurs génériques comme B<nobody>)."
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -9925,13 +10068,13 @@ msgstr ""
 "racine."
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<path>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -9943,13 +10086,13 @@ msgstr ""
 "répertoire racine avant de commencer le processus."
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -9969,36 +10112,36 @@ msgstr ""
 "transformable pour leur ajouter cette fonctionnalité."
 
 # type: TP
-#: start-stop-daemon.8:226
-#, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+#: start-stop-daemon.8:217
+#, fuzzy, no-wrap
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<int>"
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "Cela modifie la priorité du processus avant qu'il ne soit lancé."
 
 # type: TP
-#: start-stop-daemon.8:229
-#, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+#: start-stop-daemon.8:220
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>|B<--umask> I<mask>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 "Cela modifie le masque utilisateur du processus avant qu'il ne soit lancé."
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -10018,40 +10161,18 @@ msgstr ""
 "habituellement utile que combinée avec l'option B<--background.>"
 
 # type: TP
-#: start-stop-daemon.8:247
-#, no-wrap
-msgid "B<-v>|B<--verbose>"
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "Affiche des messages prolixes en renseignements."
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr "Affiche une aide et se termine."
-
-# type: TP
-#: start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr "Affiche le numéro de version et se termine."
-
 # type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -10060,7 +10181,7 @@ msgstr ""
 "d'une version faite par Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -10074,12 +10195,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
-# type: TH
-#: update-alternatives.8:8
-#, no-wrap
-msgid "2006-11-24"
-msgstr "24-11-2006"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -10089,56 +10204,13 @@ msgstr ""
 "par défaut de certaines commandes"
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-"B<update-alternatives> [I<options>] B<--install> I<gen lien altern priorité> "
-"[B<--slave> I<altern>]..."
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr "B<update-alternatives> [I<options>] B<--remove> I<nom chemin>"
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<nom>"
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr "B<update-alternatives> [I<options>] B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--auto> I<nom>"
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--display> I<nom>"
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--list> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--config> I<nom>"
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr "B<update-alternatives> [I<options>] B<--set> I<nom chemin>"
-
-# type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -10148,7 +10220,7 @@ msgstr ""
 "alternatives\\ »."
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -10166,7 +10238,7 @@ msgstr ""
 "l'utilisateur n'a pas fait de choix précis."
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -10192,7 +10264,7 @@ msgstr ""
 "explicitement de le faire."
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -10209,7 +10281,7 @@ msgstr ""
 "le FHS (lisez-le) donne de Bonnes Raisons de faire ainsi."
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -10224,7 +10296,7 @@ msgstr ""
 "scripts B<postinst> et B<prerm> des paquets Debian."
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -10244,7 +10316,7 @@ msgstr ""
 "et ses liens secondaires associés composent un I<groupe> de I<liens.>"
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -10262,7 +10334,7 @@ msgstr ""
 "décisions."
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -10277,7 +10349,7 @@ msgstr ""
 "groupe en mode manuel."
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -10288,7 +10360,7 @@ msgstr ""
 "celle qui possède la priorité la plus élevée."
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -10307,7 +10379,7 @@ msgstr ""
 "pour revenir au mode automatique."
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
@@ -10316,7 +10388,7 @@ msgstr ""
 "l'option I<--set> (voyez ci-dessous)."
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -10325,13 +10397,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIE"
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -10340,13 +10412,13 @@ msgstr ""
 "quelques termes qui faciliteront l'explication."
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr "nom générique"
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -10356,13 +10428,13 @@ msgstr ""
 "fonctions similaires."
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr "lien symbolique"
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -10373,13 +10445,13 @@ msgstr ""
 "établir."
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr "alternative"
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -10388,26 +10460,26 @@ msgstr ""
 "accessible, via un nom générique, avec le système des «\\ alternatives\\ »."
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr "répertoire des alternatives "
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 "C'est le répertoire qui contient les liens symboliques\\ ; il s'agit par "
 "défaut de I</etc/alternatives.>"
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr "répertoire administratif"
 
 # type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -10416,26 +10488,26 @@ msgstr ""
 "alternatives.> Il s'agit par défaut de I</var/lib/dpkg/alternatives.>"
 
 # type: TP
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr "groupe de liens"
 
 # type: Plain text
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 "C'est un ensemble de liens symboliques corrélés, de manière qu'on puisse les "
 "mettre à jour en une seule fois."
 
 # type: TP
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr "lien principal"
 
 # type: Plain text
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
@@ -10444,13 +10516,13 @@ msgstr ""
 "les autres liens du groupe."
 
 # type: TP
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr "lien secondaire («\\ slave\\ »)"
 
 # type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
 msgstr ""
@@ -10458,13 +10530,13 @@ msgstr ""
 "principal."
 
 # type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr "mode automatique"
 
 # type: Plain text
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -10475,13 +10547,13 @@ msgstr ""
 "l'alternative possédant la priorité la plus élevée dans ce groupe."
 
 # type: TP
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr "mode manuel "
 
 # type: Plain text
-#: update-alternatives.8:245
+#: update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -10489,149 +10561,14 @@ msgstr ""
 "Quand un groupe de liens est en mode manuel, le système des «\\ alternatives"
 "\\ » ne modifie pas le paramétrage de l' administrateur système."
 
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-"Plusieurs paquets fournissent un éditeur de texte compatible avec B<vi>, par "
-"exemple B<nvi> et B<vim>. Celui qui sera utilisé est déterminé par le groupe "
-"de liens B<vi>, qui comprend des liens pour le programme lui-même et sa page "
-"de manuel."
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-"Pour afficher les paquets disponibles qui fournissent B<vi> et son "
-"paramétrage actuel, on peut utiliser l'action I<--display :>"
-
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr "update-alternatives --display vi"
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-"Pour choisir une implémentation particulière de B<vi> on peut utiliser cette "
-"commande en tant que super-utilisateur et choisir un nombre dans la liste :"
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr "update-alternatives --config vi"
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-"Pour retrouver l'implémentation par défaut de B<vi> on peut utiliser cette "
-"commande en tant que super-utilisateur\\ :"
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr "update-alternatives --auto vi"
-
-# type: Plain text
-#: update-alternatives.8:290
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-"Pour toute opération significative, on doit demander une seule action à "
-"B<update-alternatives.> Pour toute action, on peut préciser un certain "
-"nombre d'options."
-
-# type: TP
-#: update-alternatives.8:291
-#, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--verbose>"
-
-# type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr "produit plus de commentaires sur ce que fait B<update-alternatives.>"
-
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-"Ne produit pas de commentaire à moins qu'une erreur survienne. Cette option "
-"n'est pas encore implémentée."
-
-# type: Plain text
-#: update-alternatives.8:304
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-"En vérité, ne fait rien\\ ! Dit simplement ce qui pourrait être fait. Cette "
-"option n'est pas encore implémentée."
-
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
-msgstr "Affiche un message d'aide."
-
-# type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr "Cette option donne la version de B<update-alternatives>."
-
-# type: TP
-#: update-alternatives.8:312
-#, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--altdir> I<répertoire>"
-
-# type: Plain text
-#: update-alternatives.8:316
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-"Donne le répertoire des alternatives, quand il est différent de celui par "
-"défaut."
-
-# type: TP
-#: update-alternatives.8:316
-#, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir> I<répertoire>"
-
-# type: Plain text
-#: update-alternatives.8:320
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr ""
-"Donne le répertoire administratif, quand il est différent de celui par "
-"défaut."
-
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr "B<--install> I<gen lien altern priorité> [B<--slave> I<gen lien altern>] ..."
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -10649,7 +10586,7 @@ msgstr ""
 "zéro ou plusieurs options B<--slave> chacune suivie par trois arguments."
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -10669,13 +10606,13 @@ msgstr ""
 "jour et pointent vers les alternatives nouvellement ajoutées."
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<nom chemin>"
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
@@ -10685,13 +10622,13 @@ msgstr ""
 "script."
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nom chemin>"
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -10712,13 +10649,13 @@ msgstr ""
 "l'alternative sont supprimées."
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<nom>"
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -10727,24 +10664,24 @@ msgstr ""
 "I<nom> est un nom dans le répertoire des alternatives."
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr "Appelle B<--config> sur toutes les alternatives."
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto> I<nom>"
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -10755,13 +10692,13 @@ msgstr ""
 "et pointent vers les alternatives avec les priorités les plus élevées."
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--display> I<nom>"
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -10777,41 +10714,94 @@ msgstr ""
 "la plus élevée."
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--list> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr "Affiche toutes les cibles du groupe de liens."
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--config> I<lien>"
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
 "out of I<auto> mode."
 msgstr ""
-"Affiche les alternatives disponibles pour un groupe de liens et autorise "
-"l'utilisateur à faire un choix de manière interactive. Le groupe de liens "
-"est mis à jour et le mode automatique I<auto> est désactivé."
+"Affiche les alternatives disponibles pour un groupe de liens et autorise "
+"l'utilisateur à faire un choix de manière interactive. Le groupe de liens "
+"est mis à jour et le mode automatique I<auto> est désactivé."
+
+# type: TP
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--altdir> I<répertoire>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+"Donne le répertoire des alternatives, quand il est différent de celui par "
+"défaut."
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+"Donne le répertoire administratif, quand il est différent de celui par "
+"défaut."
+
+# type: TP
+#: update-alternatives.8:311
+#, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr "produit plus de commentaires sur ce que fait B<update-alternatives.>"
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+"Ne produit pas de commentaire à moins qu'une erreur survienne. Cette option "
+"n'est pas encore implémentée."
+
+# type: Plain text
+#: update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+"En vérité, ne fait rien\\ ! Dit simplement ce qui pourrait être fait. Cette "
+"option n'est pas encore implémentée."
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -10820,13 +10810,13 @@ msgstr ""
 "l'option B<--altdir.>"
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -10835,24 +10825,24 @@ msgstr ""
 "admindir>"
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr "L'action demandée s'est correctement déroulée."
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -10861,7 +10851,7 @@ msgstr ""
 "bien pendant l'exécution de l'action."
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -10876,7 +10866,66 @@ msgstr ""
 "n'est pas le cas, veuillez faire un rapport de bogue."
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+#, fuzzy
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+"Plusieurs paquets fournissent un éditeur de texte compatible avec B<vi>, par "
+"exemple B<nvi> et B<vim>. Celui qui sera utilisé est déterminé par le groupe "
+"de liens B<vi>, qui comprend des liens pour le programme lui-même et sa page "
+"de manuel."
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+"Pour afficher les paquets disponibles qui fournissent B<vi> et son "
+"paramétrage actuel, on peut utiliser l'action I<--display :>"
+
+# type: Plain text
+#: update-alternatives.8:367
+#, fuzzy
+msgid "B<update-alternatives --display vi>"
+msgstr "update-alternatives --display vi"
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+"Pour choisir une implémentation particulière de B<vi> on peut utiliser cette "
+"commande en tant que super-utilisateur et choisir un nombre dans la liste :"
+
+# type: Plain text
+#: update-alternatives.8:374
+#, fuzzy
+msgid "B<update-alternatives --config vi>"
+msgstr "update-alternatives --config vi"
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+"Pour retrouver l'implémentation par défaut de B<vi> on peut utiliser cette "
+"commande en tant que super-utilisateur\\ :"
+
+# type: Plain text
+#: update-alternatives.8:381
+#, fuzzy
+msgid "B<update-alternatives --auto vi>"
+msgstr "update-alternatives --auto vi"
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
@@ -10886,7 +10935,7 @@ msgstr ""
 "directement à l'auteur."
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -10897,7 +10946,7 @@ msgstr ""
 "soit dans la documentation\\ ; faites un rapport."
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -10909,7 +10958,7 @@ msgstr ""
 "a AUCUNE garantie."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -10921,7 +10970,7 @@ msgstr ""
 "garantie."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
@@ -10930,7 +10979,576 @@ msgstr ""
 "tous les systèmes Debian."
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 "B<ln>(1), FHS, le standard pour l'organisation des systèmes de fichiers."
+
+# type: Plain text
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr ""
+#~ "I<Standard for the Format of ARPA Internet Text Messages> (RFC 822),"
+
+# type: Plain text
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC 1123) "
+#~ "section 5.2.14,"
+
+# type: Plain text
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> et cette page de manuel ont été écrites par Ian Jackson, qui "
+#~ "les a placé dans le domaine public."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>dirnameE<gt>>]"
+#~ msgstr ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>répertoireE<gt>>]"
+
+# type: Plain text
+#~ msgid "Output the help screen and exit successfully."
+#~ msgstr "Affiche un écran d'aide et se termine normalement."
+
+# type: Plain text
+#~ msgid "Output version and exit successfully."
+#~ msgstr "Affiche la version et se termine normalement."
+
+# type: Plain text
+#~ msgid "Print a usage message."
+#~ msgstr "Affiche un message d'aide."
+
+# type: Plain text
+#~ msgid "Print program version."
+#~ msgstr "Affiche la version du programme."
+
+# type: TH
+#~ msgid "2006-05-23"
+#~ msgstr "23-05-2006"
+
+# type: Plain text
+#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#~ msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive répertoire>"
+
+# type: SH
+#~ msgid "ACTION OPTIONS"
+#~ msgstr "ACTION OPTIONS"
+
+# type: TP
+#~ msgid "B<--build>, B<-b>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#~ msgid ""
+#~ "You can specify the compression level used by adding a B<-z#> option.  "
+#~ "B<dpkg-deb> will pass that option on to gzip."
+#~ msgstr ""
+#~ "On peut préciser le degré de compression en ajoutant une option B<-z#>.  "
+#~ "B<dpkg-deb> passe cette option à gzip."
+
+# type: TP
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: TP
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--field>, B<-f>"
+
+# type: TP
+#~ msgid "B<--contents>, B<-c>"
+#~ msgstr "B<--contents>, B<-c>"
+
+# type: TP
+#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+
+# type: TP
+#~ msgid "B<--fsys-tarfile>"
+#~ msgstr "B<--fsys-tarfile>"
+
+# type: TP
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "B<--control>, B<-e>"
+
+# type: TP
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Affiche l'aide de B<dpkg-deb> qui résume la manière d'utiliser ses "
+#~ "options."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Affiche le numéro de version de B<dpkg-deb>."
+
+# type: TP
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported)."
+#~ msgstr ""
+#~ "Affiche des renseignements sur le copyright de B<dpkg-deb> et l'absence "
+#~ "de garantie. (On peut utiliser l'écriture américaine B<--license.>)"
+
+# type: SH
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "AUTRES OPTIONS"
+
+# type: TP
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--debug>, B<-D>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fichierE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#~ msgstr ""
+#~ "B<dpkg-divert> [I<options>] B<--list> I<E<lt>motif-de-rechercheE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fichierE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-divert> is the utility used to set up and update the list of "
+#~ "diversions. It functions in three basic modes - adding, removing, and "
+#~ "listing diversions.  The options are B<--add>, B<--remove>, and B<--"
+#~ "list>, respectively. Additionally, it can print out the real name for a "
+#~ "diverted file with B<--truename>. Other options (listed below) may also "
+#~ "be specified."
+#~ msgstr ""
+#~ "B<dpkg-divert> sert à créer et à mettre à jour la liste des "
+#~ "détournements. Il possède trois modes élémentaires, l'ajout, la "
+#~ "suppression et le listage d'un détournement. Les options sont "
+#~ "respectivement B<--add>, B<--remove> et B<--list>. De plus, il peut "
+#~ "afficher le vrai nom d'un fichier détourné avec B<--truename>. On peut "
+#~ "indiquer d'autres options (voyez la liste ci-dessous)."
+
+# type: Plain text
+#~ msgid "Output short usage instructions, and exit successfully."
+#~ msgstr "Affiche quelques instructions d'aide, et se termine normalement."
+
+# type: Plain text
+#~ msgid "Output program name and version and exit successfully."
+#~ msgstr ""
+#~ "Affiche le nom du programme et sa version puis se termine normalement."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#~ msgstr ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<rep>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version> [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] "
+#~ "[I<fichiers>]"
+
+# type: TP
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<-h, --help>"
+
+# type: Plain text
+#~ msgid "Print a usage message and exit successfully."
+#~ msgstr "Affiche une aide et se termine normalement."
+
+# type: Plain text
+#~ msgid ""
+#~ "Print copyright information and (a reference to GNU) license information "
+#~ "and exit successfully."
+#~ msgstr ""
+#~ "Affiche les informations sur le copyright et sur la licence (avec une "
+#~ "référence à GNU), puis se termine normalement."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-l>|B<--list> I<nom-paquet-motif> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-W>|B<--show> I<nom-paquet-motif> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-s>|B<--status> I<nom-paquet> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<nom-paquet> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-S>|B<--search> I<motif-de-recherche> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<nom-paquet> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
+
+# type: Plain text
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg-query> B<--version>"
+
+# type: Plain text
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Affiche des renseignements sur la licence et le copyright."
+
+# type: Plain text
+#~ msgid "Display version information."
+#~ msgstr "Affiche des renseignements sur la version."
+
+# type: TH
+#~ msgid "2006-05-10"
+#~ msgstr "10-05-2006"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
+#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#~ msgstr ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>>] [B<-m>] I<rep-de-"
+#~ "binaires> I<fichier-d'-override> [I<chemin-à-préfixer>] B<E<gt>> "
+#~ "I<Packages>"
+
+# type: Plain text
+#~ msgid ""
+#~ "When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for "
+#~ "all debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+#~ msgstr ""
+#~ "Quand B<-a>I<E<lt>archE<gt>> est spécifiée, la commande ne recherche pas "
+#~ "tous les fichiers debs\\ ; elle utilise un motif équivalent à *_all.deb "
+#~ "et à *_arch.deb."
+
+# type: SH
+#~ msgid "THE OVERRIDE FILE"
+#~ msgstr "LE FICHIER « OVERRIDE »"
+
+# type: Plain text
+#~ msgid ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source "
+#~ "package tools"
+#~ msgstr ""
+#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
+#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Les outils de "
+#~ "Debian pour les paquets source."
+
+# type: SH
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "OPTIONS COMMUNES"
+
+# type: Plain text
+#~ msgid ""
+#~ "Many of these programs share options; these are described here, together "
+#~ "with the programs that accept them."
+#~ msgstr ""
+#~ "Beaucoup de ces programmes partagent les options qui sont décrites ici"
+#~ "\\ ; on décrit en même temps les programmes qui les acceptent."
+
+# type: Plain text
+#~ msgid ""
+#~ "Display the particular program's usage message, including a synopsis of "
+#~ "the options it understands.  This option is understood by all the source "
+#~ "package tools."
+#~ msgstr ""
+#~ "Affiche le message d'aide associé au programme\\ : il comprend un résumé "
+#~ "des options acceptées. Tous les outils pour les paquets source "
+#~ "comprennent cette option."
+
+# type: Plain text
+#~ msgid ""
+#~ "Display the particular program's version, including copyright and license "
+#~ "information.  This option is understood by all the source package tools."
+#~ msgstr ""
+#~ "Affiche la version du programme\\ ; le message comprend des informations "
+#~ "sur la licence et le copyright. Tous les outils pour les paquets source "
+#~ "comprennent cette option."
+
+# type: Plain text
+#~ msgid ""
+#~ "Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
+#~ "I<substvarsfile>; the default is B<debian/substvars>.  This option is "
+#~ "understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
+#~ "B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Lit (ou, écrit, pour B<dpkg-shlibdeps),> les variables de substitution "
+#~ "dans le fichier I<fichier/substvars>; Par défaut c'est le fichier "
+#~ "B<debian/substvars.> B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-"
+#~ "shlibdeps> et dpkg-genchanges acceptent cette option."
+
+# type: Plain text
+#~ msgid ""
+#~ "Override or add an output control file field.  This option is understood "
+#~ "by B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Remplace ou ajoute en sortie un champ dans le fichier de contrôle. B<dpkg-"
+#~ "source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+
+# type: Plain text
+#~ msgid ""
+#~ "Remove an output control file field.  This option is understood by B<dpkg-"
+#~ "source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#~ msgstr ""
+#~ "Supprime en sortie un champ dans le fichier de contrôle. B<dpkg-source>, "
+#~ "B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<-b> tells B<dpkg-source> to build a source package (rather than to "
+#~ "extract one) - see below."
+#~ msgstr ""
+#~ "L'option B<-b> indique à B<dpkg-source> de construire un paquet source "
+#~ "(plutôt que d'en extraire un), voyez ci-dessous."
+
+# type: Plain text
+#~ msgid ""
+#~ "This option negates a previously set B<-W>.  It is currently only "
+#~ "understood by B<dpkg-buildpackage> and B<dpkg-source>."
+#~ msgstr ""
+#~ "Cette option annule une précédente option B<-W>. Elle n'est actuellement "
+#~ "comprise que par B<dpkg-buildpackage> et B<dpkg-source>."
+
+# type: SH
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "LES OPTIONS DE DPKG-SOURCE"
+
+# type: TP
+#~ msgid "B<-x>"
+#~ msgstr "B<-x>"
+
+# type: TP
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<-IE<lt>fichierE<gt>>"
+
+# type: SH
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "LES OPTIONS POUR DPKG-GENCONTROL"
+
+# type: Plain text
+#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#~ msgstr "B<dpkg-gencontrol> ne prend pas d'argument sans option."
+
+# type: SH
+#~ msgid "dpkg-SHLIBDEPS OPTIONS"
+#~ msgstr "LES OPTIONS POUR DPKG-SHLIBDEPS"
+
+# type: SH
+#~ msgid "dpkg-GENCHANGES OPTIONS"
+#~ msgstr "LES OPTIONS DE DPKG-GENCHANGES"
+
+# type: Plain text
+#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#~ msgstr "B<dpkg-genchanges> ne prend pas d'argument sans option."
+
+# type: SH
+#~ msgid "dpkg-BUILDPACKAGE OPTIONS"
+#~ msgstr "LES OPTIONS DE DPKG-BUILDPACKAGE"
+
+# type: Plain text
+#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#~ msgstr "B<dpkg-buildpackage> ne prend pas d'argument sans option."
+
+# type: SH
+#~ msgid "dpkg-DISTADDFILE ARGUMENTS"
+#~ msgstr "LES ARGUMENTS DE DPKG-DISTADDFILE"
+
+# type: SH
+#~ msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+#~ msgstr "LES ARGUMENTS DE DPKG-PARSECHANGELOG"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
+#~ "arguments."
+#~ msgstr ""
+#~ "B<dpkg-parsechangelog> ne prend ni d'option particulière ni d'argument "
+#~ "sans option."
+
+# type: SH
+#~ msgid "VARIABLE SUBSTITUTION"
+#~ msgstr "LA SUBSTITUTION DE VARIABLE"
+
+# type: Plain text
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "C'est un logiciel libre\\ ; voyez la «\\ GNU General Public Licence\\ » "
+#~ "version 2 ou supérieure pour le copyright. Il n'y a B<pas> de garantie. "
+#~ "Voyez B</usr/share/doc/dpkg/copyright> et B</usr/share/common-licenses/"
+#~ "GPL> pour des précisions."
+
+# type: Plain text
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
+
+# type: TP
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--split>, B<-s>"
+
+# type: TP
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--join>, B<-j>"
+
+# type: TP
+#~ msgid "B<--auto>, B<-a>"
+#~ msgstr "B<--auto>, B<-a>"
+
+# type: TP
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--listq>, B<-l>"
+
+# type: TP
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--discard>, B<-d>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Affiche un message de B<dpkg-split> donnant un résumé de ses options et "
+#~ "de leur utilisation."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "Affiche le numéro de version de B<dpkg-split>."
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported.)"
+#~ msgstr ""
+#~ "Affiche les renseignements sur le copyright et l'absence de garantie.  "
+#~ "(L'orthographe américaine\\ : B<--license> est acceptée.)"
+
+# type: TP
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--npquiet>, B<-Q>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
+#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>utilisateurE<gt> "
+#~ "E<lt>groupeE<gt> E<lt>modeE<gt> E<lt>fichierE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fichierE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#~ msgstr "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>exp-regE<gt>]>"
+
+# type: TP
+#~ msgid "B<--admindir>"
+#~ msgstr "B<--admindir>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+
+# type: TP
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "Print help information; then exit."
+#~ msgstr "Affiche une aide et se termine."
+
+# type: Plain text
+#~ msgid "Print version information; then exit."
+#~ msgstr "Affiche le numéro de version et se termine."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+#~ msgstr ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<gen lien altern "
+#~ "priorité> [B<--slave> I<altern>]..."
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--remove> I<nom chemin>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<nom>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--display> I<nom>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--list> I<nome>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--config> I<nom>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--set> I<nom chemin>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Exactly one action must be specified if B<update-alternatives> is to "
+#~ "perform any meaningful task.  Any number of the common options may be "
+#~ "specified together with any action."
+#~ msgstr ""
+#~ "Pour toute opération significative, on doit demander une seule action à "
+#~ "B<update-alternatives.> Pour toute action, on peut préciser un certain "
+#~ "nombre d'options."
+
+# type: Plain text
+#~ msgid "Give some usage information."
+#~ msgstr "Affiche un message d'aide."
+
+# type: Plain text
+#~ msgid "Tell which version of B<update-alternatives> this is."
+#~ msgstr "Cette option donne la version de B<update-alternatives>."
diff --git a/man/po/hu.po b/man/po/hu.po
index a597d514..fa837081 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-10-05 21:27+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,157 +13,172 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 
 # type: TH
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr ""
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
 msgstr "2006-02-28"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Debian Project"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, fuzzy, no-wrap
 msgid "dpkg utilities"
 msgstr "dpkg készlet"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NÉV"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr ""
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SZINOPSZIS"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr ""
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "LEÍRÁS"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
+msgstr ""
+
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
 msgstr ""
 
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, fuzzy, no-wrap
 msgid "OPTIONS"
 msgstr "MÁS LEHETŐSÉGEK"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr ""
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "HIBÁK"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr ""
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "LÁSD MÉG"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr ""
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
 
-# type: Plain text
-#: 822-date.1:31
-#, fuzzy
-msgid "B<date>(1)."
-msgstr "B<dpkg>(1)."
-
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "SZERZŐ"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
 
 # type: TH
@@ -172,20 +187,27 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
+#: cleanup-info.8:10
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -194,21 +216,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -217,87 +239,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, fuzzy, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>, B<-h>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr ""
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, fuzzy, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, fuzzy, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+msgid "Show the usage message and exit."
+msgstr ""
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
-msgstr ""
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+#, fuzzy
+msgid "Show the version and exit."
+msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FÁJLOK"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -309,6 +346,13 @@ msgstr ""
 msgid "deb"
 msgstr ""
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "2006-02-28"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -943,5216 +987,5284 @@ msgstr ""
 msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TH
-#: dpkg.1:1
+# type: Plain text
+#: deb-override.5:16
 #, fuzzy, no-wrap
-msgid "dpkg"
-msgstr "dpkg-deb"
+msgid "deb-override"
+msgstr "deb-control"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "2006-04-09"
+msgid "2007-03-07"
 msgstr "2006-02-28"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "dpkg készlet"
-
 # type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr ""
-
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
+#: deb-override.5:22
+msgid "override"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:26
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:31
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-msgstr ""
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr ""
+# type: Plain text
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
+msgid "deb-shlibs"
 msgstr ""
 
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-02-28"
+
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
 msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
 
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
+# type: Plain text
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr ""
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg>(1)."
 
-# type: TP
-#: dpkg.1:59
+# type: TH
+#: deb-substvars.5:2
 #, no-wrap
-msgid "B<unpacked>"
+msgid "deb-substvars"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<--fsys-tarfile>"
+
+# type: Plain text
+#: deb-substvars.5:20
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:66
+#: deb-substvars.5:27
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
 msgstr ""
 
-# type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
+# type: Plain text
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
+#: deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
 msgstr ""
 
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
 msgstr ""
 
 # type: TP
-#: dpkg.1:70
+#: deb-substvars.5:49
 #, no-wrap
-msgid "B<install>"
+msgid "B<Arch>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
 msgstr ""
 
 # type: TP
-#: dpkg.1:73
-#, no-wrap
-msgid "B<deinstall>"
-msgstr ""
+#: deb-substvars.5:53
+#, fuzzy, no-wrap
+msgid "B<source:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:77
-msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+#: deb-substvars.5:56
+msgid "The source package version."
 msgstr ""
 
 # type: TP
-#: dpkg.1:77
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<purge>"
+msgid "B<source:Upstream-Version>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:60
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
-msgstr ""
-
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:60
 #, fuzzy, no-wrap
-msgid "B<hold>"
-msgstr "B<--old>"
+msgid "B<binary:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:64
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
 
 # type: TP
-#: dpkg.1:86
-#, no-wrap
-msgid "B<reinst-required>"
-msgstr ""
+#: deb-substvars.5:64
+#, fuzzy, no-wrap
+msgid "B<Source-Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:69
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
 
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, fuzzy, no-wrap
-msgid "ACTIONS"
-msgstr "MŰVELETI LEHETŐSÉGEK"
-
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:69
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgid "B<Installed-Size>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:78
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
+# type: TP
+#: deb-substvars.5:78
+#, no-wrap
+msgid "B<Extra-Size>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:102
-#, fuzzy
-msgid "B<1.> Extract the control files of the new package."
-msgstr "Kiszedi az ellenőrző információs fájlt egy bináris csomagarchívumból"
-
-# type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:87
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
+# type: TP
+#: deb-substvars.5:87
+#, no-wrap
+msgid "B<F:>I<fieldname>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:94
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:120
-msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+# type: TP
+#: deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:124
+#: deb-substvars.5:104
 msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:104
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
+msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
-msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
 
 # type: TP
-#: dpkg.1:129
+#: deb-substvars.5:107
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgid "B<shlibs:>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:134
+#: deb-substvars.5:111
 msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:111
+#, no-wrap
+msgid "B<dpkg:Upstream-Version>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
 msgstr ""
 
+# type: TP
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<--version>"
+
 # type: Plain text
-#: dpkg.1:141
-msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
+#: deb-substvars.5:120
+msgid ""
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
 
 # type: TP
-#: dpkg.1:144
+#: deb-substvars.5:122
 #, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr ""
-
-# type: Plain text
-#: dpkg.1:155
-msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+msgid "B<debian/substvars>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
+#: deb-substvars.5:125
+msgid "List of substitution variables and values."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:160
-msgid "B<1.> Run I<prerm> script"
+#: deb-substvars.5:129 dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:163
-msgid "B<2.> Remove the installed files"
-msgstr ""
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
 msgstr ""
 
-# type: TP
-#: dpkg.1:167
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
 #, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgid "COPYRIGHT"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:176
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:179
-msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
-msgstr ""
-
-# type: TP
-#: dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:185
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
 msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
+"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
+"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
+"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
+"licenses/GPL> fájlt a részletekért."
 
-# type: TP
-#: dpkg.1:185
+# type: TH
+#: dpkg.1:1
+#, fuzzy, no-wrap
+msgid "dpkg"
+msgstr "dpkg-deb"
+
+# type: TH
+#: dpkg.1:1
+#, fuzzy, no-wrap
+msgid "2006-04-09"
+msgstr "2006-02-28"
+
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
+msgid "dpkg suite"
+msgstr "dpkg készlet"
+
+# type: Plain text
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:188
-msgid "Forget about uninstalled unavailable packages."
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
 msgstr ""
 
-# type: TP
-#: dpkg.1:188
+# type: SH
+#: dpkg.1:9
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
+msgid "WARNING"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:191
-#, fuzzy
-msgid "Erase the existing information about what packages are available."
-msgstr "Egy bináris csomagarchívumról ad információkat."
-
-# type: TP
-#: dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
+#: dpkg.1:13
+msgid ""
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:196
+#: dpkg.1:18
 msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
 
-# type: TP
-#: dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+# type: Plain text
+#: dpkg.1:26
+msgid ""
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:200
+#: dpkg.1:31
 msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
 
-# type: TP
-#: dpkg.1:200
+# type: Plain text
+#: dpkg.1:40
 #, no-wrap
-msgid "B<dpkg --set-selections>"
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:206
-msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
 msgstr ""
 
-# type: TP
-#: dpkg.1:206
+# type: SH
+#: dpkg.1:43
 #, no-wrap
-msgid "B<dpkg --clear-selections>"
+msgid "INFORMATION ABOUT PACKAGES"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:211
+#: dpkg.1:48
 msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
 
-# type: TP
-#: dpkg.1:211
+# type: SS
+#: dpkg.1:48
 #, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr ""
-
-# type: Plain text
-#: dpkg.1:215
-msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+msgid "PACKAGE STATES"
 msgstr ""
 
 # type: TP
-#: dpkg.1:216
+#: dpkg.1:49
 #, no-wrap
-msgid "B<dpkg --print-architecture>"
+msgid "B<installed>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:219
-msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
 msgstr ""
 
 # type: TP
-#: dpkg.1:219
+#: dpkg.1:52
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "B<half-installed>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:230
+#: dpkg.1:56
 msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"The installation of the package has been started, but not completed for some "
+"reason."
 msgstr ""
 
 # type: TP
-#: dpkg.1:230
+#: dpkg.1:56
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg.1:235
-msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
+msgid "B<not-installed>"
 msgstr ""
 
-# type: TP
-#: dpkg.1:235
-#, fuzzy, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<--help>, B<-h>"
-
 # type: Plain text
-#: dpkg.1:238
-msgid "Display a brief help message."
+#: dpkg.1:59
+msgid "The package is not installed on your system."
 msgstr ""
 
 # type: TP
-#: dpkg.1:238
+#: dpkg.1:59
 #, no-wrap
-msgid "B<dpkg --force-help>"
+msgid "B<unpacked>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
 msgstr ""
 
 # type: TP
-#: dpkg.1:241
+#: dpkg.1:62
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<half-configured>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:244
-msgid "Give help about debugging options."
+#: dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
 msgstr ""
 
 # type: TP
-#: dpkg.1:244
+#: dpkg.1:66
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<config-files>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:247
-msgid "Display B<dpkg> licence."
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
 msgstr ""
 
-# type: TP
-#: dpkg.1:247
-#, fuzzy, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<--version>"
-
-# type: Plain text
-#: dpkg.1:250
-#, fuzzy
-msgid "Display B<dpkg> version information."
-msgstr "Kiírja a B<dpkg-deb> verziószámát."
-
-# type: TP
-#: dpkg.1:250
+# type: SS
+#: dpkg.1:69
 #, no-wrap
-msgid "B<dpkg-deb actions>"
+msgid "PACKAGE SELECTION STATES"
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:253
-#, fuzzy
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
+# type: TP
+#: dpkg.1:70
+#, no-wrap
+msgid "B<install>"
 msgstr ""
-"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
-"róluk."
 
 # type: Plain text
-#: dpkg.1:273
-#, no-wrap
-msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
+#: dpkg.1:73
+msgid "The package is selected for installation."
 msgstr ""
 
 # type: TP
-#: dpkg.1:275
+#: dpkg.1:73
 #, no-wrap
-msgid "B<dpkg-query actions>"
+msgid "B<deinstall>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
+#: dpkg.1:77
+msgid ""
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:291
+# type: TP
+#: dpkg.1:77
 #, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+msgid "B<purge>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:298
+#: dpkg.1:81
 msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
 
-# type: TP
-#: dpkg.1:299
+# type: SS
+#: dpkg.1:81
 #, no-wrap
-msgid "B<--abort-after=>I<number>"
+msgid "PACKAGE FLAGS"
 msgstr ""
 
+# type: TP
+#: dpkg.1:82
+#, fuzzy, no-wrap
+msgid "B<hold>"
+msgstr "B<--old>"
+
 # type: Plain text
-#: dpkg.1:302
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+#: dpkg.1:86
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
 
 # type: TP
-#: dpkg.1:302
+#: dpkg.1:86
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
+msgid "B<reinst-required>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:308
+#: dpkg.1:91
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
 
+# type: SH
+#: dpkg.1:92
+#, fuzzy, no-wrap
+msgid "ACTIONS"
+msgstr "MŰVELETI LEHETŐSÉGEK"
+
 # type: TP
-#: dpkg.1:308
+#: dpkg.1:93
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:314
+#: dpkg.1:97
 msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:326
-#, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
-msgstr ""
-
-# type: TP
-#: dpkg.1:326
-#, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:333
-msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
-msgstr ""
+#: dpkg.1:102
+#, fuzzy
+msgid "B<1.> Extract the control files of the new package."
+msgstr "Kiszedi az ellenőrző információs fájlt egy bináris csomagarchívumból"
 
 # type: Plain text
-#: dpkg.1:337
+#: dpkg.1:106
 msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:340
-msgid "B<all>: Turns on (or off) all force options."
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:343
+#: dpkg.1:113
 msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:350
+#: dpkg.1:120
 msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:354
+#: dpkg.1:124
 msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
+# type: TP
+#: dpkg.1:124
+#, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:362
+#: dpkg.1:129
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
+msgstr ""
+
+# type: TP
+#: dpkg.1:129
+#, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:134
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:373
+#: dpkg.1:141
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:377
-msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+#: dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:382
-msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
+# type: TP
+#: dpkg.1:144
+#, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:387
+#: dpkg.1:155
 msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:392
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+#: dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:398
-msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
+#: dpkg.1:160
+msgid "B<1.> Run I<prerm> script"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
+#: dpkg.1:163
+msgid "B<2.> Remove the installed files"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
+#: dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:407
-msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+# type: TP
+#: dpkg.1:167
+#, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
+#: dpkg.1:176
+msgid ""
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:179
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
+# type: TP
+#: dpkg.1:179
+#, no-wrap
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+#: dpkg.1:185
+msgid ""
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
 
 # type: TP
-#: dpkg.1:420
+#: dpkg.1:185
 #, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
+msgid "B<dpkg --forget-old-unavail>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:424
-msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+#: dpkg.1:188
+msgid "Forget about uninstalled unavailable packages."
 msgstr ""
 
 # type: TP
-#: dpkg.1:424
-#, fuzzy, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--info>, B<-I>"
+#: dpkg.1:188
+#, no-wrap
+msgid "B<dpkg --clear-avail>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:428
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
+#: dpkg.1:191
+#, fuzzy
+msgid "Erase the existing information about what packages are available."
+msgstr "Egy bináris csomagarchívumról ad információkat."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:191
 #, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg -C> | B<--audit>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:196
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
 
 # type: TP
-#: dpkg.1:432
+#: dpkg.1:196
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:437
+#: dpkg.1:200
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
+msgstr ""
+
+# type: TP
+#: dpkg.1:200
+#, no-wrap
+msgid "B<dpkg --set-selections>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:442
+#: dpkg.1:206
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
 msgstr ""
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:206
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
+msgid "B<dpkg --clear-selections>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:448
-msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
-msgstr ""
-
-# type: TP
-#: dpkg.1:448
-#, fuzzy, no-wrap
-msgid "B<-G>"
-msgstr "B<--new>"
-
-# type: Plain text
-#: dpkg.1:452
+#: dpkg.1:211
 msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:211
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg --yet-to-unpack>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:463
+#: dpkg.1:215
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
 
 # type: TP
-#: dpkg.1:463
+#: dpkg.1:216
 #, no-wrap
-msgid "B<-O> | B<--selected-only>"
+msgid "B<dpkg --print-architecture>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:219
 msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:219
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:473
+#: dpkg.1:230
 msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:230
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:480
+#: dpkg.1:235
 msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
 
 # type: TP
-#: dpkg.1:480
+#: dpkg.1:235
 #, fuzzy, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--licence>"
+msgid "B<dpkg --help>"
+msgstr "B<--help>, B<-h>"
 
 # type: Plain text
-#: dpkg.1:492
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
+#: dpkg.1:238
+msgid "Display a brief help message."
 msgstr ""
 
 # type: TP
-#: dpkg.1:492
-#, fuzzy, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--new>"
+#: dpkg.1:238
+#, no-wrap
+msgid "B<dpkg --force-help>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
+#: dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:497 dpkg.cfg.5:14
+# type: TP
+#: dpkg.1:241
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
-
-# type: Plain text
-#: dpkg.1:500
-msgid "Configuration file with default options."
+msgid "B<dpkg -Dh >|B< --debug=help>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:500
-#, fuzzy, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+#: dpkg.1:244
+msgid "Give help about debugging options."
+msgstr ""
 
-# type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+# type: TP
+#: dpkg.1:244
+#, no-wrap
+msgid "B<dpkg --licence> | B<dpkg --license>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:507
-msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+#: dpkg.1:247
+msgid "Display B<dpkg> licence."
 msgstr ""
 
 # type: TP
-#: dpkg.1:507
-#, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr ""
+#: dpkg.1:247
+#, fuzzy, no-wrap
+msgid "B<dpkg --version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:510
-msgid "List of available packages."
-msgstr ""
+#: dpkg.1:250
+#, fuzzy
+msgid "Display B<dpkg> version information."
+msgstr "Kiírja a B<dpkg-deb> verziószámát."
 
 # type: TP
-#: dpkg.1:510
+#: dpkg.1:250
 #, no-wrap
-msgid "I</var/lib/dpkg/status>"
+msgid "B<dpkg-deb actions>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:516
-msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+#: dpkg.1:253
+#, fuzzy
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
+"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
+"róluk."
 
 # type: Plain text
-#: dpkg.1:519
+#: dpkg.1:273
+#, no-wrap
 msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:519
-#, fuzzy, no-wrap
-msgid "I<control>"
-msgstr "kontroll"
-
 # type: TP
-#: dpkg.1:521
+#: dpkg.1:275
 #, no-wrap
-msgid "I<conffiles>"
+msgid "B<dpkg-query actions>"
 msgstr ""
 
-# type: TP
-#: dpkg.1:523
-#, no-wrap
-msgid "I<preinst>"
+# type: Plain text
+#: dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 
-# type: TP
-#: dpkg.1:525
+# type: Plain text
+#: dpkg.1:291
 #, no-wrap
-msgid "I<postinst>"
+msgid ""
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
 msgstr ""
 
-# type: TP
-#: dpkg.1:527
-#, no-wrap
-msgid "I<prerm>"
+# type: Plain text
+#: dpkg.1:298
+msgid ""
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
 
 # type: TP
-#: dpkg.1:529
+#: dpkg.1:299
 #, no-wrap
-msgid "I<postrm>"
+msgid "B<--abort-after=>I<number>"
 msgstr ""
 
-# type: SH
-#: dpkg.1:532
-#, no-wrap
-msgid "ENVIRONMENT VARIABLES"
+# type: Plain text
+#: dpkg.1:302
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 
 # type: TP
-#: dpkg.1:533
+#: dpkg.1:302
 #, no-wrap
-msgid "B<DPKG_NO_TSTP>"
+msgid "B<-B>|B<--auto-deconfigure>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:537
+#: dpkg.1:308
 msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
-msgstr ""
-
-# type: TP
-#: dpkg.1:537
-#, no-wrap
-msgid "B<SHELL>"
-msgstr ""
-
-# type: Plain text
-#: dpkg.1:540
-msgid "The program B<dpkg> will execute when starting a new shell."
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
 msgstr ""
 
 # type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:308
 #, no-wrap
-msgid "B<COLUMNS>"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:314
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
-msgstr ""
-
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
-#, fuzzy, no-wrap
-msgid "EXAMPLES"
-msgstr "PÉLDA"
-
-# type: Plain text
-#: dpkg.1:547
-msgid "To list packages related to the editor B<vi>(1):"
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:549
+#: dpkg.1:326
 #, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg.1:552
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+msgid ""
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
 msgstr ""
 
-# type: Plain text
-#: dpkg.1:554
+# type: TP
+#: dpkg.1:326
 #, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
+#: dpkg.1:333
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:559
-#, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
+#: dpkg.1:337
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:562
-msgid "To remove an installed elvis package:"
+#: dpkg.1:340
+msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:564
-#, no-wrap
-msgid "     B<dpkg -r elvis>\n"
+#: dpkg.1:343
+msgid ""
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:569
+#: dpkg.1:350
 msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:572
-#, no-wrap
+#: dpkg.1:354
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:575
-msgid "To make a local copy of the package selection states:"
+#: dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:577
-#, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+#: dpkg.1:362
+msgid ""
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:581
+#: dpkg.1:367
 msgid ""
-"You might transfer this file to another computer, and install it there with:"
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:584
-#, no-wrap
-msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
+#: dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:590
+#: dpkg.1:373
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:593
+#: dpkg.1:377
 msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
-msgstr ""
-
-# type: SH
-#: dpkg.1:595
-#, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:598
+#: dpkg.1:382
 msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:387
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
 
 # type: Plain text
-#: dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
+#: dpkg.1:392
+msgid ""
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
 
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
-#, fuzzy, no-wrap
-msgid "AUTHORS"
-msgstr "SZERZŐ"
-
 # type: Plain text
-#: dpkg.1:616
-#, fuzzy, no-wrap
+#: dpkg.1:398
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
-msgstr "Lásd a I</usr/share/doc/dpkg/THANKS> fájlt, melyben a B<dpkg> készítését segítő személyek listája található."
-
-# type: TH
-#: dpkg-architecture.1:1
-#, no-wrap
-msgid "dpkg-architecture"
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
 msgstr ""
 
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, no-wrap
-msgid "2006-06-17"
-msgstr "2006-06-17"
-
 # type: Plain text
-#: dpkg-architecture.1:4
-msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
+#: dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:9
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
+#: dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:407
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:17
-msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
+#: dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg.1:413
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
 
-# type: TP
-#: dpkg-architecture.1:28
-#, no-wrap
-msgid "B<-a>I<debian-architecture>"
+# type: Plain text
+#: dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:31
+#: dpkg.1:420
 #, no-wrap
-msgid "B<-t>I<gnu-system-type>"
+msgid "B<--ignore-depends>=I<package>,..."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
+#: dpkg.1:424
+msgid ""
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:34
+#: dpkg.1:424
 #, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "B<--new>"
+msgid "B<--new> | B<--old>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:428
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:43
-#, fuzzy, no-wrap
-msgid "B<-l>"
-msgstr "B<--old>"
-
-# type: Plain text
-#: dpkg-architecture.1:47
-msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
-msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:47
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr ""
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg.1:432
 msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg.1:432
 #, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg.1:437
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
-msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:59
-#, no-wrap
-msgid "B<-q>I<variable-name>"
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
+#: dpkg.1:442
+msgid ""
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:62
-#, fuzzy, no-wrap
-msgid "B<-s>"
-msgstr "B<--new>"
+#: dpkg.1:442
+#, no-wrap
+msgid "B<-R> | B<--recursive>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:448
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:66
+#: dpkg.1:448
 #, fuzzy, no-wrap
-msgid "B<-u>"
+msgid "B<-G>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
+#: dpkg.1:452
+msgid ""
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg.1:452
 #, no-wrap
-msgid "B<-c>I< command>"
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg.1:463
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:73
-#, fuzzy, no-wrap
-msgid "B<-L>"
-msgstr "B<--new>"
-
-# type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
+#: dpkg.1:463
+#, no-wrap
+msgid "B<-O> | B<--selected-only>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
-msgstr ""
-
-# type: SH
-#: dpkg-architecture.1:83
-#, no-wrap
-msgid "TERMS"
+#: dpkg.1:469
+msgid ""
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:84
+# type: TP
+#: dpkg.1:469
 #, no-wrap
-msgid "build machine"
+msgid "B<-E> | B<--skip-same-version>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:86
-msgid "The machine the package is built on."
+#: dpkg.1:473
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:473
 #, no-wrap
-msgid "host machine"
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
+#: dpkg.1:480
+msgid ""
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
 
-# type: TH
-#: dpkg-architecture.1:88
+# type: TP
+#: dpkg.1:480
 #, fuzzy, no-wrap
-msgid "Debian architecture"
-msgstr "Debian Project"
+msgid "B<--log=>I<filename>"
+msgstr "B<--licence>"
 
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:492
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:91
-#, no-wrap
-msgid "architecture wildcard"
-msgstr ""
+# type: TP
+#: dpkg.1:492
+#, fuzzy, no-wrap
+msgid "B<--no-debsig>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-architecture.1:95
-msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:95
+# type: Plain text
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr ""
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:99
-msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
+#: dpkg.1:500
+msgid "Configuration file with default options."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
+#: dpkg.1:500
+#, fuzzy, no-wrap
+msgid "I</var/log/dpkg.log>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+#: dpkg.1:507
+msgid ""
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
+# type: TP
+#: dpkg.1:507
+#, no-wrap
+msgid "I</var/lib/dpkg/available>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
+#: dpkg.1:510
+msgid "List of available packages."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
+# type: TP
+#: dpkg.1:510
+#, no-wrap
+msgid "I</var/lib/dpkg/status>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:117
+#: dpkg.1:516
 msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
+#: dpkg.1:519
+msgid ""
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
+#: dpkg.1:519
+#, fuzzy, no-wrap
+msgid "I<control>"
+msgstr "kontroll"
 
-# type: SH
-#: dpkg-architecture.1:122
+# type: TP
+#: dpkg.1:521
 #, no-wrap
-msgid "VARIABLES"
+msgid "I<conffiles>"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
+# type: TP
+#: dpkg.1:523
+#, no-wrap
+msgid "I<preinst>"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:124
+# type: TP
+#: dpkg.1:525
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgid "I<postinst>"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
+# type: TP
+#: dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:126
+# type: TP
+#: dpkg.1:529
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgid "I<postrm>"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
+# type: SH
+#: dpkg.1:532
+#, no-wrap
+msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:128
+# type: TP
+#: dpkg.1:533
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgid "B<DPKG_NO_TSTP>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
+#: dpkg.1:537
+msgid ""
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:130
+# type: TP
+#: dpkg.1:537
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgid "B<SHELL>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
+#: dpkg.1:540
+msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:132
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgid "B<COLUMNS>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+#: dpkg.1:544
+msgid ""
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
-msgstr ""
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
+#, fuzzy, no-wrap
+msgid "EXAMPLES"
+msgstr "PÉLDA"
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+#: dpkg.1:547
+msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:136
+# type: Plain text
+#: dpkg.1:549
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
+#: dpkg.1:552
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:138
+# type: Plain text
+#: dpkg.1:554
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:140
+# type: Plain text
+#: dpkg.1:559
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
+#: dpkg.1:562
+msgid "To remove an installed elvis package:"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:142
+# type: Plain text
+#: dpkg.1:564
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgid "     B<dpkg -r elvis>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: dpkg.1:569
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:144
+# type: Plain text
+#: dpkg.1:572
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgid ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg.1:575
+msgid "To make a local copy of the package selection states:"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:146
+# type: Plain text
+#: dpkg.1:577
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg.1:581
+msgid ""
+"You might transfer this file to another computer, and install it there with:"
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:149
+# type: Plain text
+#: dpkg.1:584
 #, no-wrap
-msgid "DEBIAN/RULES"
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg.1:590
 msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
+#: dpkg.1:593
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:164
+# type: SH
+#: dpkg.1:595
 #, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
+#: dpkg.1:598
+msgid ""
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
+#: dpkg.1:608
 msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:173
-#, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+#: dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr ""
 
+# type: SH
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
+#, fuzzy, no-wrap
+msgid "AUTHORS"
+msgstr "SZERZŐ"
+
 # type: Plain text
-#: dpkg-architecture.1:183
-#, no-wrap
+#: dpkg.1:616
+#, fuzzy, no-wrap
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
+msgstr "Lásd a I</usr/share/doc/dpkg/THANKS> fájlt, melyben a B<dpkg> készítését segítő személyek listája található."
+
+# type: TH
+#: dpkg-architecture.1:1
+#, no-wrap
+msgid "dpkg-architecture"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
+#: dpkg-architecture.1:4
+msgid ""
+"dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+#: dpkg-architecture.1:9
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:193
-#, no-wrap
+#: dpkg-architecture.1:14
 msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:197
+#: dpkg-architecture.1:17
 msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:202
+#: dpkg-architecture.1:26
 msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
 # type: SH
-#: dpkg-architecture.1:203
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
+msgid "COMMANDS"
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:28
+#, fuzzy, no-wrap
+msgid "B<-l>"
+msgstr "B<--old>"
+
 # type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:32
 msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
+msgstr ""
+
+# type: TP
+#: dpkg-architecture.1:32
+#, no-wrap
+msgid "B<-e>I<debian-architecture>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:214
+#: dpkg-architecture.1:38
 msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:218
+# type: TP
+#: dpkg-architecture.1:38
 #, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
+#: dpkg-architecture.1:44
 msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+# type: TP
+#: dpkg-architecture.1:44
+#, no-wrap
+msgid "B<-q>I<variable-name>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:238
-msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:47
+#, fuzzy, no-wrap
+msgid "B<-s>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-architecture.1:248
-#, no-wrap
+#: dpkg-architecture.1:51
 msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:51
+#, fuzzy, no-wrap
+msgid "B<-u>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-architecture.1:253
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+# type: TP
+#: dpkg-architecture.1:54
+#, no-wrap
+msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:264
+#: dpkg-architecture.1:58
 msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:58
+#, fuzzy, no-wrap
+msgid "B<-L>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-architecture.1:267
-msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:271
-#, fuzzy
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+# type: TP
+#: dpkg-architecture.1:69
+#, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:276
-msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
+# type: TP
+#: dpkg-architecture.1:72
 #, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg.cfg"
+msgid "B<-t>I<gnu-system-type>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
-msgstr "dpkg.cfg - dpkg konfigurációs fájl"
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
+msgstr ""
+
+# type: TP
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg.cfg.5:11
+#: dpkg-architecture.1:82
 msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
-"E fájl tartalmazza a dpkg alapbeállításait. Minden sor 1 lehetőséget "
-"tartalmaz, mely pontosan megfelel a sima parancssoros dpkg lehetőségeknek "
-"kivéve a vezető kötőjeleket, melyek itt nincsenek. Megjegyzések egy sor "
-"elején a (\"B<#>\") jellel lehetségesek."
 
-# type: Plain text
-#: dpkg.cfg.5:16
-msgid "I<~/.dpkg.cfg>"
-msgstr "I<~/.dpkg.cfg>"
+# type: SH
+#: dpkg-architecture.1:83
+#, no-wrap
+msgid "TERMS"
+msgstr ""
 
-# type: Plain text
-#: dpkg.cfg.5:20
-msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+# type: IP
+#: dpkg-architecture.1:84
+#, no-wrap
+msgid "build machine"
 msgstr ""
-"Lásd a I</usr/share/doc/dpkg/THANKS> fájlt, melyben a B<dpkg> készítését "
-"segítő személyek listája található."
 
 # type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
-msgstr "B<dpkg>(1)."
+#: dpkg-architecture.1:86
+msgid "The machine the package is built on."
+msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1
+# type: IP
+#: dpkg-architecture.1:86
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
+msgid "host machine"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
 msgstr ""
 
 # type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
+#: dpkg-architecture.1:88
 #, fuzzy, no-wrap
-msgid "2006-05-23"
-msgstr "2006-02-28"
+msgid "Debian architecture"
+msgstr "Debian Project"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+#: dpkg-architecture.1:91
+msgid ""
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-#, fuzzy
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
+# type: IP
+#: dpkg-architecture.1:91
+#, no-wrap
+msgid "architecture wildcard"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
+#: dpkg-architecture.1:95
 msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
+#: dpkg-architecture.1:99
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:17
-#, fuzzy, no-wrap
-msgid "B<-B>"
-msgstr "B<--new>"
+# type: SH
+#: dpkg-architecture.1:100
+#, no-wrap
+msgid "VARIABLES"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
-msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:21
-#, fuzzy, no-wrap
-msgid "B<-h>"
-msgstr "B<--new>"
+# type: IP
+#: dpkg-architecture.1:102
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
 msgstr ""
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: IP
+#: dpkg-architecture.1:104
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
 
-# type: TH
-#: dpkg-deb.1:1
+# type: IP
+#: dpkg-architecture.1:106
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr "dpkg-deb - Debian csomag archívum (.deb) kezelő eszköz"
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<könyvtár> [I<archívum>|I<könyvtár>]"
+# type: IP
+#: dpkg-architecture.1:108
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<formátum>] I<archívum>"
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:114
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
-"B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archívum könyvtár>"
 
 # type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<archívum>"
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:39
-msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:120
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
-"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
-"róluk."
 
 # type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
-"Csomagok telepítéséhez és eltávolításához a rendszerből a B<dpkg> programot "
-"kell használni."
 
 # type: Plain text
-#: dpkg-deb.1:53
-msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
-"A B<dpkg-deb> a B<dpkg>-val is hívható minden lehetéséggel, melyet át akarsz "
-"adni a B<dpkg-deb>-nek. A B<dpkg> látja, hogy a B<dpkg-deb>-et akarod és el "
-"fogja indítani."
 
-# type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
+# type: IP
+#: dpkg-architecture.1:124
 #, no-wrap
-msgid "ACTION OPTIONS"
-msgstr "MŰVELETI LEHETŐSÉGEK"
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:54
+# type: Plain text
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
+
+# type: SH
+#: dpkg-architecture.1:127
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr "B<--build>, B<-b>"
+msgid "DEBIAN/RULES"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
+#: dpkg-architecture.1:135
 msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
-"Létrehoz egy Debian archívumot a I<könyvtár>-ban lévő fájlokból. A "
-"I<könyvtár> egy B<DEBIAN> alkönyvtár kell legyen, mely egyaránt tartalmazza "
-"az ellenőrző információs fájlokat és az ellenőrző fájlt magát. E könyvtár "
-"I<nem> jelenik meg a bináris csomag fájlrendszer archívumában, a benne lévő "
-"fájlok a bináris csomag ellenőrző információs területére kerülnek."
 
 # type: Plain text
-#: dpkg-deb.1:72
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
 msgstr ""
-"A B<-z#> lehetőséggel megadható a tömörítási szint. A B<dpkg-deb> átadja ezt "
-"a gzip-nek.."
 
 # type: Plain text
-#: dpkg-deb.1:84
+#: dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
-"A B<--nocheck> megadása nélkül, a B<dpkg-deb> elolvassa és értelmezi a "
-"B<DEBIAN/control> fájlt. Nyelvtani és más hibákat ellenőriz és kiírja a "
-"bináris csomag nevét. A B<dpkg-deb> ellenőrzi a karbantartói szkriptek "
-"jogait és a B<DEBIAN> ellenőrző információs könyvtárban lévő más fájlokat."
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:145
+msgid "please use the following:"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:149
+#, no-wrap
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
-"Ha nincs I<archívum> megadva, a B<dpkg-deb> a csomagot a I<directory>B<.deb> "
-"fájlba készíti el."
 
 # type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr "A már létező hasonló archívumot felülírja."
+#: dpkg-architecture.1:151
+#, no-wrap
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:161
+#, no-wrap
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"Ha a második argumentum egy könyvtár, a B<dpkg-deb> a "
-"I<csomag>B<_>I<verzió>B<_>I<architektúra>B<.deb>, vagy ha nincs "
-"B<Architektúra> mező a csomag ellenőrző fájlban, a I<csomag>B<_>I<verzió>B<."
-"deb> fájlba ír.  Ha nem fájl, hanem célkönyvtár van megadva, a B<--nocheck> "
-"lehetőség nem használható (mivel a B<dpkg-deb>-nek el kell olvasni a csomag "
-"ellenőrző fájlt a fájlnév meghatározásához)."
 
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
+# type: Plain text
+#: dpkg-architecture.1:164
+msgid "please use:"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:167
 #, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--info>, B<-I>"
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
-msgstr "Egy bináris csomagarchívumról ad információkat."
+#: dpkg-architecture.1:171
+#, no-wrap
+msgid ""
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-architecture.1:175
 msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
-"Ha nincs megadva I<ellenőrző-fájl-név>, kiírja a csomag és ellenőrző fájlja "
-"tartalmát"
 
 # type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-architecture.1:180
 msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
-"Ha meg van adva I<ellenőrző-fájl-név>, a B<dpkg-deb> a megadott sorrendben "
-"mutat rájuk, és ha bármely összetevő hiányzik, azokról hibaüzenetet küld a "
-"stderr-re és kilép 2-es kóddal."
 
-# type: TP
-#: dpkg-deb.1:125
+# type: SH
+#: dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--show>, B<-W>"
+msgid "BACKWARD COMPATIBILITY"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:132
+#: dpkg-architecture.1:187
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
-"Egy bináris csomagarchívumról ad információkat a B<--showformat> "
-"argumentumban megadott formátumban. Az alap formátum kiírja a csomag nevét "
-"és verzióját 1 sorban tabulátorral elválasztva."
 
-# type: TP
-#: dpkg-deb.1:132
-#, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--field>, B<-f>"
+# type: Plain text
+#: dpkg-architecture.1:192
+msgid ""
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
-msgstr "Kiszedi az ellenőrző információs fájlt egy bináris csomagarchívumból"
+#: dpkg-architecture.1:196
+#, no-wrap
+msgid ""
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-architecture.1:210
+#, no-wrap
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:216
+msgid ""
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
-"Ha nincsenek B<ellenőrző-fájl-mezők>k megadva, kiírja az egész ellenőrző "
-"fájlt."
 
 # type: Plain text
-#: dpkg-deb.1:148
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
-"Ha vannak, a B<dpkg-deb> kiírja tartalmukat az ellenőrző fájlban megadott "
-"sorrendben. Ha több, mint 1 B<ellenőrző-fájl-mező> került megadásra, a "
-"B<dpkg-deb> mezőnevükkel (és egy kettősponttal és szóközzel) azonosítja őket."
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
-msgstr "Nem ad hibajelet kért, de nem lelt mezőkre."
-
-# type: TP
-#: dpkg-deb.1:150
+#: dpkg-architecture.1:231
 #, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--contents>, B<-c>"
+msgid ""
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-architecture.1:235
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
-"Kilistázza a csomag archívum fájlrendszer fa archívum részét. Jelenleg a "
-"B<tar> részletes lista formátumban teszi meg ezt."
-
-# type: TP
-#: dpkg-deb.1:156
-#, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
 
 # type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-architecture.1:242
 msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
-"Kibontja egy csomag archívum fájlrendszer fáját egy megadott könyvtárba."
 
 # type: Plain text
-#: dpkg-deb.1:165
+#: dpkg-architecture.1:245
 msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
-"A B<--vextract> (B<-X>)  kiírja a kibontásra került fájlokat, a B<--extract> "
-"(B<-x>)  csak hibánál ír."
 
 # type: Plain text
-#: dpkg-deb.1:171
+#: dpkg-architecture.1:249
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
-"Egy csomag kibontása a gyökérkönyvtárba I<nem> ad helyes telepítést! A "
-"B<dpkg> vagy valamely felülete használható csomagok telepítésére."
 
 # type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr "Létrehozza a I<könyvtár>at (de szüleit nem), ha szükséges."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr "B<--fsys-tarfile>"
+# type: Plain text
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg-architecture.1:256
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
-"Kibontja a fájlrendszer fa adatokat egy bináris csomagból és a szabvány "
-"kimenetre küldi B<tar> formátumban. A B<tar>(1)-ral együtt egyes fájlok "
-"kibontására használható egy csomag archívumból."
-
-# type: TP
-#: dpkg-deb.1:182
-#, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "B<--control>, B<-e>"
 
 # type: Plain text
-#: dpkg-deb.1:186
-msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
-"Kiszedi a csomag információs fájlokat egy csomag archívumból a megadott "
-"könyvtárba."
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
-"Ha nincs megadva könyvtár a jelen könyvtár B<DEBIAN> alkönyvtárát fogja "
-"használni."
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-architecture.1:263
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
-msgstr "Létrehozza a célkönyvtárat (de szüleit nem), ha szükséges."
-
-# type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:198
-msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
-"Kiírja a B<dpkg-deb> használatát, megadva lehetőségei és azok használata "
-"összefoglalóját."
 
 # type: Plain text
-#: dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Kiírja a B<dpkg-deb> verziószámát."
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
-#, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+# type: Plain text
+#: dpkg-architecture.1:271
+#, fuzzy
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-architecture.1:276
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
-"Kiírja a B<dpkg-deb> szerzői jogi információit, a felhasználói engedélyt "
-"(licenc) és a garancia hiányát. (Az amerikai B<--license> helyesírás is "
-"támogatott.) "
 
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
+# type: TH
+#: dpkg.cfg.5:1
 #, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "MÁS LEHETŐSÉGEK"
+msgid "dpkg.cfg"
+msgstr "dpkg.cfg"
 
-# type: TP
-#: dpkg-deb.1:211
-#, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr "B<--showformat=>I<formátum>"
+# type: Plain text
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
+msgstr "dpkg.cfg - dpkg konfigurációs fájl"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
+#: dpkg.cfg.5:11
 msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
-"E lehetőség adja meg a B<--show> kimentének formátumát. A formátum egy "
-"szöveg, melyet minden listázott csomag visszaad."
+"E fájl tartalmazza a dpkg alapbeállításait. Minden sor 1 lehetőséget "
+"tartalmaz, mely pontosan megfelel a sima parancssoros dpkg lehetőségeknek "
+"kivéve a vezető kötőjeleket, melyek itt nincsenek. Megjegyzések egy sor "
+"elején a (\"B<#>\") jellel lehetségesek."
+
+# type: Plain text
+#: dpkg.cfg.5:16
+msgid "I<~/.dpkg.cfg>"
+msgstr "I<~/.dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg.cfg.5:20
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
-"Ez az argumentum egy szöveg, mely a \"${I<field-name>}\" formát használó "
-"bármely állapotmezőre hivatkozhat, az érvényes mezők listája könnyen "
-"előállítható a B<-I>-lel ugyanazon csomagon. A formázási lehetőségek teljes "
-"magyarázata (ideértve az escape sorozatokat és mező oszlopokat) a B<dpkg-"
-"query>(1) B<--showformat> lehetőségének magyarázatában található."
+"Lásd a I</usr/share/doc/dpkg/THANKS> fájlt, melyben a B<dpkg> készítését "
+"segítő személyek listája található."
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
-msgstr "E mező alapértelmezettje: \"${Package}\\et${Version}\\en\"."
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
+msgstr "B<dpkg>(1)."
 
-# type: TP
-#: dpkg-deb.1:227
+# type: TH
+#: dpkg-buildpackage.1:1
 #, no-wrap
-msgid "B<--new>"
-msgstr "B<--new>"
+msgid "dpkg-buildpackage"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:232
-msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
-msgstr "`Új' formátumú archívum használata. Ez az alap."
-
-# type: TP
-#: dpkg-deb.1:232
-#, no-wrap
-msgid "B<--old>"
-msgstr "B<--old>"
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build source packages"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+#: dpkg-buildpackage.1:8
+msgid "B<dpkg-buildpackage> [I<options>]"
 msgstr ""
-"A B<dpkg-deb>-et `régi' formátumú archívumra bírja. E régi archívum "
-"formátumot nehezebben értik nem-Debian eszközök és elavult; egyetlen "
-"használata olyan csomagok készítése, mely a 0.93.76-nál (1995 szeptember) "
-"régebbi verziójú dpkg számára is érthető, mely csak i386 a.out-ként volt "
-"kiadva."
 
 # type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:13
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"Tiltja egy tervezett archívum tartalom szokásos B<dpkg-deb --build> "
-"ellenőrzését. Így bármilyen archívum készíthető, vagyis nem számít, milyen "
-"hibákat tartalmaz."
 
 # type: TP
-#: dpkg-deb.1:246
-#, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--debug>, B<-D>"
-
-# type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
-msgstr "Hibajavító kimenet bekapcsolva. Nem túl érdekes."
-
-# type: Plain text
-#: dpkg-deb.1:254
-msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
-msgstr "B<dpkg-deb -I> I<csomag1>B<.deb> I<csomag2>B<.deb> hibát okoz."
+#: dpkg-buildpackage.1:15
+#, fuzzy, no-wrap
+msgid "B<-b>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-deb.1:258
+#: dpkg-buildpackage.1:19
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
-"Nincs hitelesítés a B<deb> fájlokhoz; illetve nincs ellenőrző összeg. (Ez "
-"megoldva - a fordító)"
+
+# type: TP
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
+#, fuzzy, no-wrap
+msgid "B<-B>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-buildpackage.1:23
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
-"A B<dpkg-deb> önmagában nem használható telepítésre! A B<dpkg> programot "
-"kell használni annak biztosításához, hogy minden fájl a helyére kerüljön, a "
-"csomagok szkriptjei lefussanak és állapotuk és tartalmuk rögzítésre kerüljön."
+
+# type: TP
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+#: dpkg-buildpackage.1:26
+msgid "Specifies a source-only build, no binary packages need to be made."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:278
-#, fuzzy
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
-"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
-"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
-"licenses/GPL> fájlt a részletekért."
 
-# type: TH
-#: dpkg-divert.8:1
-#, fuzzy, no-wrap
-msgid "dpkg-divert"
-msgstr "dpkg-deb"
+# type: TP
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
+#: dpkg-buildpackage.1:40
+msgid ""
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-divert.8:10
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+# type: TP
+#: dpkg-buildpackage.1:46
+#, no-wrap
+msgid "B<-a>I<architecture>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:51
+msgid ""
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<--version>"
+
 # type: Plain text
-#: dpkg-divert.8:36
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, fuzzy, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B< >E<lt>hosszú leírásE<gt>"
+
+# type: Plain text
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
-#, fuzzy, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<Section:> E<lt>szakaszE<gt>"
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+#, no-wrap
+msgid "B<-m>I<maintaineraddress>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:48
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:48
-#, fuzzy, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<Priority:> E<lt>elsőbbségE<gt>"
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, no-wrap
+msgid "B<-e>I<maintaineraddress>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:72
 #, fuzzy, no-wrap
-msgid "B<--local>"
-msgstr "B<--old>"
+msgid "B<-D>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-divert.8:58
-msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+#: dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:75
 #, fuzzy, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<Package:> E<lt>csomag névE<gt>"
+msgid "B<-d>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-divert.8:63
-msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+#: dpkg-buildpackage.1:78
+msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, fuzzy, no-wrap
-msgid "B<--quiet>"
+msgid "B<-W>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
+#: dpkg-buildpackage.1:84
+msgid ""
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:66
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, fuzzy, no-wrap
-msgid "B<--rename>"
+msgid "B<-E>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-divert.8:70
+#: dpkg-buildpackage.1:92
 msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
+#: dpkg-buildpackage.1:92
 #, fuzzy, no-wrap
-msgid "B<--test>"
+msgid "B<-nc>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
+# type: TP
+#: dpkg-buildpackage.1:95
+#, no-wrap
+msgid "B<-tc>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
+#: dpkg-buildpackage.1:101
+msgid ""
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
 
-# type: SH
-#: dpkg-divert.8:80
+# type: TP
+#: dpkg-buildpackage.1:101
 #, no-wrap
-msgid "NOTES"
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:84
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
+# type: TP
+#: dpkg-buildpackage.1:127
+#, no-wrap
+msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg-buildpackage.1:152
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
+# type: TP
+#: dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+#: dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
+#: dpkg-buildpackage.1:158
+msgid "Do not sign the source package."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:107
-msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<--licence>"
+
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
+msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
+#, fuzzy, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr "B<--help>, B<-h>"
+
 # type: Plain text
-#: dpkg-divert.8:123
+#: dpkg-buildpackage.1:185
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr ""
+#: dpkg-buildpackage.1:192
+#, fuzzy
+msgid ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: TH
-#: dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-deb"
+#: dpkg-checkbuilddeps.1:1
+#, no-wrap
+msgid "dpkg-checkbuilddeps"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:22
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
-msgstr ""
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
-#: dpkg-name.1:33
+#: dpkg-checkbuilddeps.1:14
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:34
-#, fuzzy, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<--nocheck>"
-
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
-msgstr ""
-
-# type: TP
-#: dpkg-name.1:37
-#, no-wrap
-msgid "B<-k, --symlink>"
+#: dpkg-checkbuilddeps.1:17
+msgid ""
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
+#: dpkg-checkbuilddeps.1:27
+msgid ""
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:40
+#: dpkg-checkbuilddeps.1:27
 #, fuzzy, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<--version>"
+msgid "B<-h>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-name.1:44
-msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:44
+# type: UR
+#: dpkg-checkbuilddeps.1:33
 #, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
+msgid "mailto:joeyh@debian.org"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:56
-msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
 msgstr ""
-
-# type: TP
-#: dpkg-name.1:56
+
+# type: TH
+#: dpkg-distaddfile.1:1
 #, no-wrap
-msgid "B<-c, --create-dir>"
+msgid "dpkg-distaddfile"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:61
-msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+#: dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:61
-#, fuzzy, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<--help>, B<-h>"
+# type: Plain text
+#: dpkg-distaddfile.1:8
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:64
-#, fuzzy, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<--version>"
+# type: Plain text
+#: dpkg-distaddfile.1:18
+msgid ""
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-msgid "Print version information and exit successfully."
+#: dpkg-distaddfile.1:26
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:67
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<--licence>"
+msgid "B<-f>I<fileslistfile>"
+msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
+msgid "B<debian/files>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-distaddfile.1:46
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:77
+# type: TH
+#: dpkg-deb.1:1
 #, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
+
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "2006-06-17"
+
+# type: Plain text
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr "dpkg-deb - Debian csomag archívum (.deb) kezelő eszköz"
+
+# type: Plain text
+#: dpkg-deb.1:9
+msgid "B<dpkg-deb> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-deb.1:13
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
+"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
+"róluk."
 
-# type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
+"Csomagok telepítéséhez és eltávolításához a rendszerből a B<dpkg> programot "
+"kell használni."
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-deb.1:27
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
+"A B<dpkg-deb> a B<dpkg>-val is hívható minden lehetéséggel, melyet át akarsz "
+"adni a B<dpkg-deb>-nek. A B<dpkg> látja, hogy a B<dpkg-deb>-et akarod és el "
+"fogja indítani."
 
-# type: TP
-#: dpkg-name.1:88
-#, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:29
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<könyvtár> [I<archívum>|I<könyvtár>]"
 
 # type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
+#: dpkg-deb.1:41
+msgid ""
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
+"Létrehoz egy Debian archívumot a I<könyvtár>-ban lévő fájlokból. A "
+"I<könyvtár> egy B<DEBIAN> alkönyvtár kell legyen, mely egyaránt tartalmazza "
+"az ellenőrző információs fájlokat és az ellenőrző fájlt magát. E könyvtár "
+"I<nem> jelenik meg a bináris csomag fájlrendszer archívumában, a benne lévő "
+"fájlok a bináris csomag ellenőrző információs területére kerülnek."
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:53
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
+"A B<--nocheck> megadása nélkül, a B<dpkg-deb> elolvassa és értelmezi a "
+"B<DEBIAN/control> fájlt. Nyelvtani és más hibákat ellenőriz és kiírja a "
+"bináris csomag nevét. A B<dpkg-deb> ellenőrzi a karbantartói szkriptek "
+"jogait és a B<DEBIAN> ellenőrző információs könyvtárban lévő más fájlokat."
 
 # type: Plain text
-#: dpkg-name.1:107
-#, fuzzy
+#: dpkg-deb.1:60
 msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
-#, no-wrap
-msgid "COPYRIGHT"
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
+"Ha nincs I<archívum> megadva, a B<dpkg-deb> a csomagot a I<directory>B<.deb> "
+"fájlba készíti el."
+
+# type: Plain text
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
+msgstr "A már létező hasonló archívumot felülírja."
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-deb.1:78
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
+"Ha a második argumentum egy könyvtár, a B<dpkg-deb> a "
+"I<csomag>B<_>I<verzió>B<_>I<architektúra>B<.deb>, vagy ha nincs "
+"B<Architektúra> mező a csomag ellenőrző fájlban, a I<csomag>B<_>I<verzió>B<."
+"deb> fájlba ír.  Ha nem fájl, hanem célkönyvtár van megadva, a B<--nocheck> "
+"lehetőség nem használható (mivel a B<dpkg-deb>-nek el kell olvasni a csomag "
+"ellenőrző fájlt a fájlnév meghatározásához)."
 
-# type: TH
-#: dpkg-query.1:1
+# type: Plain text
+#: dpkg-deb.1:78
 #, fuzzy, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-deb"
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
-msgstr ""
+#: dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
+msgstr "Egy bináris csomagarchívumról ad információkat."
 
 # type: Plain text
-#: dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#: dpkg-deb.1:86
+msgid ""
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
+"Ha nincs megadva I<ellenőrző-fájl-név>, kiírja a csomag és ellenőrző fájlja "
+"tartalmát"
 
 # type: Plain text
-#: dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#: dpkg-deb.1:94
+msgid ""
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
+"Ha meg van adva I<ellenőrző-fájl-név>, a B<dpkg-deb> a megadott sorrendben "
+"mutat rájuk, és ha bármely összetevő hiányzik, azokról hibaüzenetet küld a "
+"stderr-re és kilép 2-es kóddal."
 
 # type: Plain text
-#: dpkg-query.1:17
-#, fuzzy
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: dpkg-query.1:21
-#, fuzzy
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
+#: dpkg-deb.1:101
+msgid ""
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
+msgstr ""
+"Egy bináris csomagarchívumról ad információkat a B<--showformat> "
+"argumentumban megadott formátumban. Az alap formátum kiírja a csomag nevét "
+"és verzióját 1 sorban tabulátorral elválasztva."
 
 # type: Plain text
-#: dpkg-query.1:25
-#, fuzzy
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
 msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
-#: dpkg-query.1:29
-#, fuzzy
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
-
-# type: Plain text
-#: dpkg-query.1:32
-#, fuzzy
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
-
-# type: TP
-#: dpkg-query.1:35
-#, fuzzy
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<--version>"
+#: dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
+msgstr "Kiszedi az ellenőrző információs fájlt egy bináris csomagarchívumból"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-deb.1:108
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
-msgstr ""
-
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
-msgstr ""
-
-# type: TP
-#: dpkg-query.1:41
-#, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
+"Ha nincsenek B<ellenőrző-fájl-mezők>k megadva, kiírja az egész ellenőrző "
+"fájlt."
 
 # type: Plain text
-#: dpkg-query.1:50
+#: dpkg-deb.1:117
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
 msgstr ""
+"Ha vannak, a B<dpkg-deb> kiírja tartalmukat az ellenőrző fájlban megadott "
+"sorrendben. Ha több, mint 1 B<ellenőrző-fájl-mező> került megadásra, a "
+"B<dpkg-deb> mezőnevükkel (és egy kettősponttal és szóközzel) azonosítja őket."
 
 # type: Plain text
-#: dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr ""
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
+msgstr "Nem ad hibajelet kért, de nem lelt mezőkre."
 
 # type: Plain text
-#: dpkg-query.1:60
-msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
-msgstr ""
-
-# type: TP
-#: dpkg-query.1:60
-#, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr ""
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: dpkg-query.1:67
+#: dpkg-deb.1:125
 msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
+"Kilistázza a csomag archívum fájlrendszer fa archívum részét. Jelenleg a "
+"B<tar> részletes lista formátumban teszi meg ezt."
 
-# type: TP
-#: dpkg-query.1:67
-#, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-deb.1:129
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
-msgstr ""
-
-# type: TP
-#: dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
+"Kibontja egy csomag archívum fájlrendszer fáját egy megadott könyvtárba."
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:135
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
+"Egy csomag kibontása a gyökérkönyvtárba I<nem> ad helyes telepítést! A "
+"B<dpkg> vagy valamely felülete használható csomagok telepítésére."
 
-# type: TP
-#: dpkg-query.1:76
-#, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
+msgstr "Létrehozza a I<könyvtár>at (de szüleit nem), ha szükséges."
+
+# type: Plain text
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:143
+#, fuzzy
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
+"A B<--vextract> (B<-X>)  kiírja a kibontásra került fájlokat, a B<--extract> "
+"(B<-x>)  csak hibánál ír."
 
-# type: TP
-#: dpkg-query.1:82
-#, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<archívum>"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-deb.1:151
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
+"Kibontja a fájlrendszer fa adatokat egy bináris csomagból és a szabvány "
+"kimenetre küldi B<tar> formátumban. A B<tar>(1)-ral együtt egyes fájlok "
+"kibontására használható egy csomag archívumból."
 
-# type: TP
-#: dpkg-query.1:86
+# type: Plain text
+#: dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence>"
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archívum könyvtár>"
 
 # type: Plain text
-#: dpkg-query.1:89
-msgid "Display licence and copyright information."
+#: dpkg-deb.1:155
+msgid ""
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
+"Kiszedi a csomag információs fájlokat egy csomag archívumból a megadott "
+"könyvtárba."
 
 # type: Plain text
-#: dpkg-query.1:92
-msgid "Display version information."
-msgstr ""
-
-# type: TP
-#: dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
+#: dpkg-deb.1:159
+msgid ""
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
+"Ha nincs megadva könyvtár a jelen könyvtár B<DEBIAN> alkönyvtárát fogja "
+"használni."
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:162
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
-msgstr ""
+"The target directory (but not its parents) will be created if necessary."
+msgstr "Létrehozza a célkönyvtárat (de szüleit nem), ha szükséges."
 
 # type: TP
-#: dpkg-query.1:98
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
 #, fuzzy, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<--showformat=>I<formátum>"
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence>"
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:111
+# type: TP
+#: dpkg-deb.1:173
 #, no-wrap
-msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
-msgstr ""
+msgid "B<--showformat=>I<format>"
+msgstr "B<--showformat=>I<formátum>"
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
+"E lehetőség adja meg a B<--show> kimentének formátumát. A formátum egy "
+"szöveg, melyet minden listázott csomag visszaad."
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:187
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
+"Ez az argumentum egy szöveg, mely a \"${I<field-name>}\" formát használó "
+"bármely állapotmezőre hivatkozhat, az érvényes mezők listája könnyen "
+"előállítható a B<-I>-lel ugyanazon csomagon. A formázási lehetőségek teljes "
+"magyarázata (ideértve az escape sorozatokat és mező oszlopokat) a B<dpkg-"
+"query>(1) B<--showformat> lehetőségének magyarázatában található."
 
 # type: Plain text
-#: dpkg-query.1:153
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr "E mező alapértelmezettje: \"${Package}\\et${Version}\\en\"."
+
+# type: TP
+#: dpkg-deb.1:189
 #, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:193
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:167
+# type: TP
+#: dpkg-deb.1:193
 #, no-wrap
-msgid "ENVIRONMENT"
+msgid "B<-Z>I<compress_type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-deb.1:198
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
 
+# type: TP
+#: dpkg-deb.1:198
+#, no-wrap
+msgid "B<--new>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr ""
+#: dpkg-deb.1:203
+msgid ""
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+msgstr "`Új' formátumú archívum használata. Ez az alap."
 
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
+# type: TP
+#: dpkg-deb.1:203
 #, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr ""
+msgid "B<--old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
+#: dpkg-deb.1:211
+msgid ""
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
+"A B<dpkg-deb>-et `régi' formátumú archívumra bírja. E régi archívum "
+"formátumot nehezebben értik nem-Debian eszközök és elavult; egyetlen "
+"használata olyan csomagok készítése, mely a 0.93.76-nál (1995 szeptember) "
+"régebbi verziójú dpkg számára is érthető, mely csak i386 a.out-ként volt "
+"kiadva."
 
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
+# type: Plain text
+#: dpkg-deb.1:217
+msgid ""
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
+"Tiltja egy tervezett archívum tartalom szokásos B<dpkg-deb --build> "
+"ellenőrzését. Így bármilyen archívum készíthető, vagyis nem számít, milyen "
+"hibákat tartalmaz."
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-deb.1:217
 #, fuzzy, no-wrap
-msgid "2006-05-10"
-msgstr "2006-06-17"
+msgid "B<-D>, B<--debug>"
+msgstr "B<--debug>, B<-D>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
-msgstr ""
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
+msgstr "Hibajavító kimenet bekapcsolva. Nem túl érdekes."
+
+# type: Plain text
+#: dpkg-deb.1:226
+msgid ""
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+msgstr "B<dpkg-deb -I> I<csomag1>B<.deb> I<csomag2>B<.deb> hibát okoz."
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
+#: dpkg-deb.1:230
 msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
+"Nincs hitelesítés a B<deb> fájlokhoz; illetve nincs ellenőrző összeg. (Ez "
+"megoldva - a fordító)"
 
 # type: Plain text
-#: dpkg-scanpackages.1:43
+#: dpkg-deb.1:237
 msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
+"A B<dpkg-deb> önmagában nem használható telepítésre! A B<dpkg> programot "
+"kell használni annak biztosításához, hogy minden fájl a helyére kerüljön, a "
+"csomagok szkriptjei lefussanak és állapotuk és tartalmuk rögzítésre kerüljön."
+
+# type: Plain text
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
+#: dpkg-deb.1:252
+#, fuzzy
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
+msgstr ""
+"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
+"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
+"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
+"licenses/GPL> fájlt a részletekért."
+
+# type: TH
+#: dpkg-divert.8:1
+#, fuzzy, no-wrap
+msgid "dpkg-divert"
+msgstr "dpkg-deb"
+
+# type: Plain text
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
-msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+#: dpkg-divert.8:9
+msgid "B<dpkg-divert> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-divert.8:13
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-divert.8:23
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<--field>, B<-f>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:74
-msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+#: dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
+msgstr ""
+
+# type: TP
+#: dpkg-divert.8:31
+#, no-wrap
+msgid "B<--list>I< glob-pattern>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
-msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--new>"
+
+# type: Plain text
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-divert.8:42
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<Priority:> E<lt>elsőbbségE<gt>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:91
+#: dpkg-divert.8:46
 msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:46
+#, fuzzy, no-wrap
+msgid "B<--local>"
+msgstr "B<--old>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+#: dpkg-divert.8:52
+msgid ""
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<Package:> E<lt>csomag névE<gt>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-divert.8:57
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, fuzzy, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:111
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:60
+#, fuzzy, no-wrap
+msgid "B<--rename>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:119
+#: dpkg-divert.8:64
 msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, fuzzy, no-wrap
+msgid "B<--test>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:124
-msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 # type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
+#: dpkg-divert.8:74
 #, no-wrap
-msgid "DIAGNOSTICS"
+msgid "NOTES"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
+#: dpkg-divert.8:78
 msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:135
-#, fuzzy
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
-
-# type: TH
-#: dpkg-scansources.1:1
-#, no-wrap
-msgid "dpkg-scansources"
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-divert.8:86
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-divert.8:91
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:18
-msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:29
-msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:33
-msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-divert.8:101
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
 
-# type: TP
-#: dpkg-scansources.1:45 install-info.8:272
-#, fuzzy, no-wrap
-msgid "B<--debug>"
-msgstr "B<--debug>, B<-D>"
-
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
+#: dpkg-divert.8:103
+msgid ""
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
 
 # type: TP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<--info>, B<-I>"
+#: dpkg-divert.8:109
+#, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-divert.8:114
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
 
-# type: IP
-#: dpkg-scansources.1:52
-#, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
+# type: Plain text
+#: dpkg-divert.8:117
+msgid ""
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:55
-msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
 msgstr ""
 
+# type: TH
+#: dpkg-genchanges.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-genchanges"
+msgstr "dpkg-deb"
+
 # type: Plain text
-#: dpkg-scansources.1:61
-msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+#: dpkg-genchanges.1:4
+msgid "dpkg-genchanges - generate Debian .changes files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:63
-#, fuzzy
-msgid "Print the version number and exit."
-msgstr "Kiírja a B<dpkg-deb> verziószámát."
+#: dpkg-genchanges.1:8
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:66
-#, fuzzy
-msgid "B<dpkg-scanpackages>(1)."
-msgstr "B<dpkg>(1)."
+#: dpkg-genchanges.1:16
+msgid ""
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: dpkg-genchanges.1:23
+msgid ""
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
-# type: TH
-#: dpkg-source.1:2
+# type: TP
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, fuzzy, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg készlet"
+msgid "B<-si>, B<-sa>, B<-sd>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-genchanges.1:49
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
+#: dpkg-genchanges.1:57 dpkg-source.1:153
+msgid ""
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:15
-#, fuzzy
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<könyvtár> [I<archívum>|I<könyvtár>]"
-
-# type: Plain text
-#: dpkg-source.1:18
-msgid "B<dpkg-gencontrol> [I<options>]"
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:21
-msgid "B<dpkg-shlibdeps> I<options>"
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:24
-msgid "B<dpkg-genchanges> [I<options>]"
+#: dpkg-genchanges.1:66 dpkg-source.1:91
+msgid ""
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, fuzzy, no-wrap
+msgid "B<-T>I<substvarsfile>"
+msgstr "B<--fsys-tarfile>"
+
 # type: Plain text
-#: dpkg-source.1:27
-msgid "B<dpkg-buildpackage> [I<options>]"
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+msgid ""
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:30
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+#, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:33
-msgid "B<dpkg-parsechangelog> [I<options>]"
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+#, fuzzy, no-wrap
+msgid "B<-U>I<field>"
+msgstr "B<--field>, B<-f>"
+
 # type: Plain text
-#: dpkg-source.1:36
-#, fuzzy
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
-"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
-"róluk."
+
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:42
+#: dpkg-genchanges.1:101
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
+#, fuzzy, no-wrap
+msgid "B<-c>I<controlfile>"
+msgstr "B<--control>, B<-e>"
+
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
+#, no-wrap
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:80
+#: dpkg-genchanges.1:115
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+# type: TP
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
+#, no-wrap
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:93
-msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+# type: TP
+#: dpkg-genchanges.1:120
+#, no-wrap
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
-#, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "MŰVELETI LEHETŐSÉGEK"
-
 # type: Plain text
-#: dpkg-source.1:96
+#: dpkg-genchanges.1:131
 msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:96
+#: dpkg-genchanges.1:131
 #, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<--help>, B<-h>"
+msgid "B<-q>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-genchanges.1:139
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-genchanges.1:155
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:106
+# type: Plain text
+#: dpkg-gencontrol.1:1
 #, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<--version>"
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-source.1:114
-msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:8
+msgid "B<dpkg-gencontrol> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-gencontrol.1:15
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:119
-#, fuzzy, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B< >E<lt>hosszú leírásE<gt>"
+#: dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:24
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:55
 #, no-wrap
-msgid "B<-m>I<maintaineraddress>"
+msgid "B<-p>I<package>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:62
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:62
 #, no-wrap
-msgid "B<-e>I<maintaineraddress>"
+msgid "B<-n>I<filename>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:67
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:67
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<--show>, B<-W>"
+msgid "B<-is>, B<-ip>, B<-isp>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-gencontrol.1:76
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
+msgstr ""
+
+# type: TP
+#: dpkg-gencontrol.1:76
+#, no-wrap
+msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-gencontrol.1:89
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
+#, fuzzy, no-wrap
+msgid "B<-O>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-gencontrol.1:98
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:163
-#, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
+# type: Plain text
+#: dpkg-gencontrol.1:106
+#, fuzzy, no-wrap
+msgid "B<debian/control>"
+msgstr "deb-control"
+
+# type: Plain text
+#: dpkg-gencontrol.1:111
+msgid ""
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-gencontrol.1:118
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:169
+# type: TH
+#: dpkg-name.1:6
 #, fuzzy, no-wrap
-msgid "B<-T>I<substvarsfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "dpkg-name"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-source.1:179
-msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:179
-#, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
+# type: Plain text
+#: dpkg-name.1:15
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:184
+#: dpkg-name.1:27
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-name.1:29
 #, fuzzy, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<--field>, B<-f>"
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-source.1:189
-msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:189
-#, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
 msgstr ""
 
+# type: TP
+#: dpkg-name.1:35
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<--version>"
+
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-name.1:39
 msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
 
+# type: TP
+#: dpkg-name.1:39
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<--show>, B<-W>"
+
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-name.1:51
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:217
+#: dpkg-name.1:51
 #, fuzzy, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "B<--control>, B<-e>"
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: dpkg-source.1:224
+#: dpkg-name.1:56
 msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:224
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<--version>"
+
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<--licence>"
+
+# type: TP
+#: dpkg-name.1:67
 #, no-wrap
-msgid "B<-l>I<changelogfile>"
+msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-name.1:72
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:231
-#, fuzzy, no-wrap
-msgid "B<-f>I<fileslistfile>"
-msgstr "B<--fsys-tarfile>"
+#: dpkg-name.1:72
+#, no-wrap
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-name.1:77
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:237
+#: dpkg-name.1:77
 #, no-wrap
-msgid "B<-F>I<changelogformat>"
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-name.1:83
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:244
-#, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<--new>"
+#: dpkg-name.1:83
+#, no-wrap
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:251
-msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:251
-#, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<--new>"
-
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-name.1:96
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:257
-#, fuzzy, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "MÁS LEHETŐSÉGEK"
+# type: Plain text
+#: dpkg-name.1:104
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-name.1:111
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:262
-#, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<--new>"
+# type: TH
+#: dpkg-parsechangelog.1:1
+#, no-wrap
+msgid "dpkg-parsechangelog"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+#: dpkg-parsechangelog.1:4
+msgid "dpkg-parsechangelog - parse Debian changelog files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:280
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+#: dpkg-parsechangelog.1:8
+msgid "B<dpkg-parsechangelog> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-parsechangelog.1:14
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:288
+#: dpkg-parsechangelog.1:26
 #, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<--new>"
+msgid "B<-L>I<libdir>"
+msgstr "B<--field>, B<-f>"
 
 # type: Plain text
-#: dpkg-source.1:303
-msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+#: dpkg-parsechangelog.1:41
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-parsechangelog.1:47
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+# type: TH
+#: dpkg-query.1:1
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<Source:> E<lt>forrás névE<gt>"
+msgid "dpkg-query"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-source.1:330
-msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:330
-#, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+# type: Plain text
+#: dpkg-query.1:8
+msgid "B<dpkg-query> [I<option>...] I<command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:345
+#: dpkg-query.1:12
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:357
-msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
-msgstr ""
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
-#: dpkg-source.1:368
+#: dpkg-query.1:23
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:377
-msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+#: dpkg-query.1:27
+#, no-wrap
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:406
+#: dpkg-query.1:33
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:412
-msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
-msgstr ""
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
-# type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
+# type: Plain text
+#: dpkg-query.1:40
+msgid ""
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
-msgstr ""
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-query.1:44
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
-msgstr ""
+#: dpkg-query.1:44
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-query.1:49
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-query.1:49
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
+
+# type: Plain text
+#: dpkg-query.1:55
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:435
+# type: Plain text
+#: dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "MÁS LEHETŐSÉGEK"
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
-#: dpkg-source.1:438
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#: dpkg-query.1:59
+msgid ""
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:438
-#, no-wrap
-msgid "B<-p>I<package>"
-msgstr ""
+#: dpkg-query.1:74
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<--showformat=>I<formátum>"
 
 # type: Plain text
-#: dpkg-source.1:445
-msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:445
+# type: Plain text
+#: dpkg-query.1:87
 #, no-wrap
-msgid "B<-n>I<filename>"
+msgid ""
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-query.1:92
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:450
-#, fuzzy, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
-msgstr "B<--info>, B<-I>"
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-query.1:98
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:459
+# type: Plain text
+#: dpkg-query.1:129
 #, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+msgid ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-query.1:137
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
-#, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<--new>"
-
 # type: Plain text
-#: dpkg-source.1:482
-msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+#: dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:482
+#: dpkg-query.1:143
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid "ENVIRONMENT"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-query.1:148
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:487
+# type: Plain text
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr ""
+
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
-msgid "B<-e>I<executable>"
+msgid "mailto:wakkerma@debian.org"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:491
-msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:491
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "B<-d>I<dependencyfield>"
+msgid "dpkg-scanpackages"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:497
-msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-scanpackages.1:28
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-scanpackages.1:41
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-scanpackages.1:51
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-scanpackages.1:58
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:62
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:540
-#, no-wrap
-msgid "B<-t>I<type>"
+# type: Plain text
+#: dpkg-scanpackages.1:65
+msgid ""
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:549
+#: dpkg-scanpackages.1:69
 msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr ""
+# type: TP
+#: dpkg-scanpackages.1:71
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--udeb>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:552
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#: dpkg-scanpackages.1:74
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<--new>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:571
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
 #, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+msgid "DIAGNOSTICS"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:574
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:574
-#, no-wrap
-msgid "B<-k>I<key-id>"
+#: dpkg-scanpackages.1:94
+msgid ""
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
-msgstr ""
+#: dpkg-scanpackages.1:99
+#, fuzzy
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg-source.1:577
+# type: TH
+#: dpkg-scansources.1:1
 #, no-wrap
-msgid "B<-r>I<gain-root-command>"
+msgid "dpkg-scansources"
 msgstr ""
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scansources.1:4
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
+# type: Plain text
+#: dpkg-scansources.1:13
+msgid ""
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scansources.1:18
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:628
-#, no-wrap
-msgid "B<-tc>"
+# type: Plain text
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scansources.1:33
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:634
-#, fuzzy, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<--show>, B<-W>"
-
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: dpkg-scansources.1:44
+msgid ""
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
-#, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr ""
+#: dpkg-scansources.1:46
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: dpkg-source.1:642
+#: dpkg-scansources.1:49
 msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
+msgstr ""
+
+# type: IP
+#: dpkg-scansources.1:49
+#, no-wrap
+msgid "B<-s>, B<--source-override> I<file>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+#: dpkg-scansources.1:52
+msgid ""
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:651
+#: dpkg-scansources.1:58 install-info.8:272
 #, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<--new>"
+msgid "B<--debug>"
+msgstr "B<--debug>, B<-D>"
 
 # type: Plain text
-#: dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:654
-#, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<--old>"
+# type: Plain text
+#: dpkg-scansources.1:68
+#, fuzzy
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<dpkg>(1)."
 
 # type: Plain text
-#: dpkg-source.1:657
-msgid "Do not check build dependencies and conflicts."
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:657
+# type: TH
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
 #, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<--new>"
+msgid "dpkg-shlibdeps"
+msgstr "dpkg készlet"
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-shlibdeps.1:35
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-shlibdeps.1:41
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:674
+# type: TP
+#: dpkg-shlibdeps.1:41
 #, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+msgid "B<-e>I<executable>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:677
+#: dpkg-shlibdeps.1:45
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:677
+# type: TP
+#: dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "VARIABLE SUBSTITUTION"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:687
-msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:51
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:61
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-shlibdeps.1:69
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "B<Arch>"
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:80
+msgid ""
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:720
-#, fuzzy, no-wrap
-msgid "B<source:Version>"
-msgstr "B<--version>"
-
 # type: Plain text
-#: dpkg-source.1:723
-msgid "The source package version."
+#: dpkg-shlibdeps.1:86
+msgid ""
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:86
 #, no-wrap
-msgid "B<source:Upstream-Version>"
+msgid "B<-t>I<type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:93
 msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:727
-#, fuzzy, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<--version>"
+#: dpkg-shlibdeps.1:93
+#, no-wrap
+msgid "B<-L>I<localshlibsfile>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:731
+#: dpkg-shlibdeps.1:99
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:731
-#, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<--version>"
-
 # type: Plain text
-#: dpkg-source.1:736
+#: dpkg-shlibdeps.1:105
 msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:736
+#: dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<Installed-Size>"
+msgid "B<debian/shlibs.local>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:745
-msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:745
+#: dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B</etc/dpkg/shlibs.override>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:754
-msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:754
-#, no-wrap
-msgid "B<F:>I<fieldname>"
+# type: Plain text
+#: dpkg-shlibdeps.1:123
+#, fuzzy, no-wrap
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr "I</etc/dpkg/dselect.cfg>"
+
+# type: Plain text
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:761
-msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+#: dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:761
-#, no-wrap
-msgid "B<Format>"
+# type: TH
+#: dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "dpkg-source"
+msgstr "dpkg készlet"
+
+# type: Plain text
+#: dpkg-source.1:6
+#, fuzzy
+msgid "dpkg-source, - Debian source package tools"
 msgstr ""
+"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
+"róluk."
 
 # type: Plain text
-#: dpkg-source.1:771
-msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+#: dpkg-source.1:11
+msgid "B<dpkg-source> [I<options>] I<command>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:771
-#, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
+# type: Plain text
+#: dpkg-source.1:15
+#, fuzzy
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
+"A B<dpkg-deb> Debian archívumokat csomagol, kibont és információkat nyújt "
+"róluk."
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-source.1:19
+msgid ""
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:774
+#: dpkg-source.1:21
 #, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:31
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:779
-#, no-wrap
-msgid "B<dpkg:Upstream-Version>"
+# type: Plain text
+#: dpkg-source.1:37
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-source.1:45
+msgid ""
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
+# type: Plain text
+#: dpkg-source.1:45
 #, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<--version>"
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<könyvtár> [I<archívum>|I<könyvtár>]"
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:60
+msgid ""
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:75
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "deb-control"
+#: dpkg-source.1:82
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:118
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:794
-#, no-wrap
-msgid "B<debian/changelog>"
+# type: Plain text
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:137
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:800
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B<debian/files>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:173
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, no-wrap
-msgid "B<debian/substvars>"
+# type: Plain text
+#: dpkg-source.1:185
+msgid ""
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:816
-msgid "List of substitution variables and values."
+#: dpkg-source.1:196
+msgid ""
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
+# type: Plain text
+#: dpkg-source.1:205
+msgid ""
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:819
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-#, fuzzy, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
-msgstr "I</etc/dpkg/dselect.cfg>"
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:258
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:263
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-source.1:274
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:845
+#: dpkg-source.1:279
 #, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:857
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"A B<dpkg-deb> és e manoldal szerzője Ian Jackson.  Ő adta hozzá a Copyright "
-"(C)1995-1996 bejegyzést és adta ki GNU General Public Licence alatt; NINCS "
-"GARANCIA. Lásd a I</usr/share/doc/dpkg/copyright> és I</usr/share/common-"
-"licenses/GPL> fájlt a részletekért."
-
 # type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
@@ -6166,41 +6278,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-deb - Debian csomag archívum (.deb) kezelő eszköz"
 
 # type: Plain text
-#: dpkg-split.1:9
-#, fuzzy
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
-
-# type: Plain text
-#: dpkg-split.1:13
+#: dpkg-split.1:10
 #, fuzzy
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
+msgid "B<dpkg-split> [I<options>] I<command>"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: dpkg-split.1:17
-#, fuzzy
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:24
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:28
-#, fuzzy
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
-
-# type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6208,14 +6292,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6224,25 +6308,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:49
+# type: Plain text
+#: dpkg-split.1:33
 #, fuzzy, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6250,27 +6334,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:68
+# type: Plain text
+#: dpkg-split.1:52
 #, fuzzy, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6278,7 +6362,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6286,17 +6370,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
+
+# type: Plain text
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6304,25 +6394,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:92
-#, fuzzy, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--info>, B<-I>"
+#: dpkg-split.1:76
+#, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6330,21 +6420,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6352,123 +6442,96 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 #, fuzzy, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-l>, B<--listq>"
+msgstr "B<--licence>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
 "stored in the queue."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:134
+# type: Plain text
+#: dpkg-split.1:118
 #, fuzzy, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--build>, B<-b>"
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...]"
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: dpkg-split.1:148
-#, fuzzy
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-"Kiírja a B<dpkg-deb> használatát, megadva lehetőségei és azok használata "
-"összefoglalóját."
-
-# type: Plain text
-#: dpkg-split.1:153
-#, fuzzy
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "Kiírja a B<dpkg-deb> verziószámát."
-
-# type: Plain text
-#: dpkg-split.1:160
-#, fuzzy
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-"Kiírja a B<dpkg-deb> szerzői jogi információit, a felhasználói engedélyt "
-"(licenc) és a garancia hiányát. (Az amerikai B<--license> helyesírás is "
-"támogatott.) "
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 #, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
+msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 #, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 #, fuzzy, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--build>, B<-b>"
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -6477,19 +6540,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -6497,20 +6560,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -6518,14 +6581,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -6533,28 +6596,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -6562,19 +6625,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -6582,13 +6645,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 #, fuzzy
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 #, fuzzy
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
@@ -6620,23 +6683,11 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -6647,123 +6698,101 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:34
+#: dpkg-statoverride.8:25
 #, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
-msgstr ""
-
-# type: TP
-#: dpkg-statoverride.8:44
-#, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 #, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<--list> [I<glob-pattern>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
 "glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 
-# type: Plain text
-#: dpkg-statoverride.8:64
-msgid "Be less verbose about what we do."
-msgstr ""
-
 # type: Plain text
 #: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr ""
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
+msgid "Be less verbose about what we do."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -6771,14 +6800,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr ""
 
@@ -6849,6 +6878,12 @@ msgid ""
 "without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
 
+# type: TP
+#: dselect.1:52
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7068,6 +7103,11 @@ msgid ""
 "successfully."
 msgstr ""
 
+# type: Plain text
+#: dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr ""
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -8114,27 +8154,12 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr ""
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
-msgstr ""
-
-# type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr ""
-
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#: start-stop-daemon.8:9
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -8143,121 +8168,155 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:36
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
 msgstr ""
 
+# type: TP
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<--show>, B<-W>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:55
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 
+# type: TP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<--info>, B<-I>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:73
 msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:90
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#: start-stop-daemon.8:76
+msgid "Show usage information and exit."
+msgstr ""
+
+# type: TP
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Kiírja a B<dpkg-deb> verziószámát."
+
+# type: TP
+#: start-stop-daemon.8:81
 #, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 #, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 #, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 #, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 #, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
-msgstr ""
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 #, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -8266,7 +8325,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -8274,7 +8333,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -8284,69 +8343,69 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
 "then any signal specified with B<--signal> is ignored."
 msgstr ""
 
-# type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
-msgstr ""
+# type: Plain text
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
-msgstr ""
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
-msgstr ""
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
-msgstr ""
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 #, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -8358,26 +8417,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
-msgstr ""
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
-msgstr ""
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
+msgstr "B<--info>, B<-I>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -8385,13 +8444,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
-msgstr ""
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
+msgstr "B<--build>, B<-b>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -8403,35 +8462,35 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 #, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:229
-#, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
-msgstr ""
+#: start-stop-daemon.8:220
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--umask> I<mask>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
-msgstr ""
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
+msgstr "B<--help>, B<-h>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -8443,47 +8502,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 #, fuzzy, no-wrap
-msgid "B<-v>|B<--verbose>"
+msgid "B<-v>, B<--verbose>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr ""
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr ""
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr ""
-
-# type: TP
-#: start-stop-daemon.8:253
-#, fuzzy, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr ""
-
 # type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -8495,12 +8532,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -8508,61 +8539,19 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#: update-alternatives.8:16
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -8573,7 +8562,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -8588,7 +8577,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -8599,7 +8588,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -8609,7 +8598,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -8621,7 +8610,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -8632,7 +8621,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -8642,7 +8631,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -8650,7 +8639,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -8662,14 +8651,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -8678,267 +8667,153 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
-"to one of a number of files of similar function."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:202
-#, no-wrap
-msgid "symlink"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:207
-msgid ""
-"Without any further qualification, this means a symbolic link in the "
-"alternatives directory: one which the system administrator is expected to "
-"adjust."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:207
-#, no-wrap
-msgid "alternative"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:211
-msgid ""
-"The name of a specific file in the filesystem, which may be made accessible "
-"via a generic name using the alternatives system."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:211
-#, no-wrap
-msgid "alternatives directory"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:216
-msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:216
-#, no-wrap
-msgid "administrative directory"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:223
-msgid ""
-"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
-"alternatives>' state information."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:223
-#, no-wrap
-msgid "link group"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:226
-msgid "A set of related symlinks, intended to be updated as a group."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:226
-#, no-wrap
-msgid "master link"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:230
-msgid ""
-"The link in a link group which determines how the other links in the group "
-"are configured."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:230
-#, no-wrap
-msgid "slave link"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:234
-msgid ""
-"A link in a link group which is controlled by the setting of the master link."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:234
-#, no-wrap
-msgid "automatic mode"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:240
-msgid ""
-"When a link group is in automatic mode, the alternatives system ensures that "
-"the links in the group point to the highest priority alternative appropriate "
-"for the group."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:240
-#, no-wrap
-msgid "manual mode"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:245
-msgid ""
-"When a link group is in manual mode, the alternatives system will not make "
-"any changes to the system administrator's settings."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
+"to one of a number of files of similar function."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:159
+#, no-wrap
+msgid "symlink"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:263
+#: update-alternatives.8:164
 msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
+"Without any further qualification, this means a symbolic link in the "
+"alternatives directory: one which the system administrator is expected to "
+"adjust."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
+# type: TP
+#: update-alternatives.8:164
+#, no-wrap
+msgid "alternative"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:272
+#: update-alternatives.8:168
 msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
+"The name of a specific file in the filesystem, which may be made accessible "
+"via a generic name using the alternatives system."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
+# type: TP
+#: update-alternatives.8:168
+#, no-wrap
+msgid "alternatives directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
+#: update-alternatives.8:173
+msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
+# type: TP
+#: update-alternatives.8:173
+#, no-wrap
+msgid "administrative directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:290
+#: update-alternatives.8:180
 msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
+"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
+"alternatives>' state information."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:291
-#, fuzzy, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--version>"
+#: update-alternatives.8:180
+#, no-wrap
+msgid "link group"
+msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
+#: update-alternatives.8:183
+msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
+# type: TP
+#: update-alternatives.8:183
+#, no-wrap
+msgid "master link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:304
+#: update-alternatives.8:187
 msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
+"The link in a link group which determines how the other links in the group "
+"are configured."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
+# type: TP
+#: update-alternatives.8:187
+#, no-wrap
+msgid "slave link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
+#: update-alternatives.8:191
+msgid ""
+"A link in a link group which is controlled by the setting of the master link."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:312
+#: update-alternatives.8:191
 #, no-wrap
-msgid "B<--altdir> I<directory>"
+msgid "automatic mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:316
+#: update-alternatives.8:197
 msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
+"When a link group is in automatic mode, the alternatives system ensures that "
+"the links in the group point to the highest priority alternative appropriate "
+"for the group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:316
+#: update-alternatives.8:197
 #, no-wrap
-msgid "B<--admindir> I<directory>"
+msgid "manual mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:320
+#: update-alternatives.8:202
 msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
+"When a link group is in manual mode, the alternatives system will not make "
+"any changes to the system administrator's settings."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -8950,7 +8825,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -8962,26 +8837,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -8994,37 +8869,37 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<--old>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -9032,13 +8907,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -9048,24 +8923,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, no-wrap
 msgid "B<--config> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -9073,57 +8948,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:311
+#, fuzzy, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -9133,14 +9053,59 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:367
+msgid "B<update-alternatives --display vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:374
+msgid "B<update-alternatives --config vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:381
+msgid "B<update-alternatives --auto vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -9148,7 +9113,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -9156,7 +9121,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -9164,13 +9129,210 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<date>(1)."
+#~ msgstr "B<dpkg>(1)."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-23"
+#~ msgstr "2006-02-28"
+
+# type: Plain text
+#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<formátum>] I<archívum>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archívum könyvtár>"
+
+# type: SH
+#~ msgid "ACTION OPTIONS"
+#~ msgstr "MŰVELETI LEHETŐSÉGEK"
+
+# type: Plain text
+#~ msgid ""
+#~ "You can specify the compression level used by adding a B<-z#> option.  "
+#~ "B<dpkg-deb> will pass that option on to gzip."
+#~ msgstr ""
+#~ "A B<-z#> lehetőséggel megadható a tömörítási szint. A B<dpkg-deb> átadja "
+#~ "ezt a gzip-nek.."
+
+# type: TP
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: TP
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--field>, B<-f>"
+
+# type: TP
+#~ msgid "B<--contents>, B<-c>"
+#~ msgstr "B<--contents>, B<-c>"
+
+# type: TP
+#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+
+# type: TP
+#~ msgid "B<--fsys-tarfile>"
+#~ msgstr "B<--fsys-tarfile>"
+
+# type: TP
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "B<--control>, B<-e>"
+
+# type: TP
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Kiírja a B<dpkg-deb> használatát, megadva lehetőségei és azok használata "
+#~ "összefoglalóját."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Kiírja a B<dpkg-deb> verziószámát."
+
+# type: TP
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported)."
+#~ msgstr ""
+#~ "Kiírja a B<dpkg-deb> szerzői jogi információit, a felhasználói engedélyt "
+#~ "(licenc) és a garancia hiányát. (Az amerikai B<--license> helyesírás is "
+#~ "támogatott.) "
+
+# type: SH
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "MÁS LEHETŐSÉGEK"
+
+# type: TP
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--debug>, B<-D>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<--version>"
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-10"
+#~ msgstr "2006-06-17"
+
+# type: SH
+#, fuzzy
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "MŰVELETI LEHETŐSÉGEK"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "MÁS LEHETŐSÉGEK"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<--new>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<Source:> E<lt>forrás névE<gt>"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "MÁS LEHETŐSÉGEK"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--auto>, B<-a>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Kiírja a B<dpkg-deb> használatát, megadva lehetőségei és azok használata "
+#~ "összefoglalóját."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "Kiírja a B<dpkg-deb> verziószámát."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported.)"
+#~ msgstr ""
+#~ "Kiírja a B<dpkg-deb> szerzői jogi információit, a felhasználói engedélyt "
+#~ "(licenc) és a garancia hiányát. (Az amerikai B<--license> helyesírás is "
+#~ "támogatott.) "
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--build>, B<-b>"
diff --git a/man/po/ja.po b/man/po/ja.po
index 9ee5ffe6..605f3bc0 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-09-19 20:31+0900\n"
 "Last-Translator: KISE Hiroshi <kise@fuyuneko.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -15,46 +15,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "B<822-date>"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
 msgstr "2006-02-28"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Debian Project"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "dpkg utilities"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, fuzzy, no-wrap
 msgid "NAME"
 msgstr ""
@@ -64,109 +71,112 @@ msgstr ""
 "名称"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+#, fuzzy
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - RFC822フォーマットの日付と時間の表示"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "書式"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "説明"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
+#, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> は RFC822 に説明されているフォーマット、RFC1123 で推奨されている"
 "数字によるタイムゾーンオフセットを使って現在の日付と時間を表示する。"
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "オプション"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> には引数やオプションはない。"
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "この機能は実際には B<date>(1) の一部であるべきである。"
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr ""
-"I<ARPAインターネットテキストメッセージのフォーマットの標準 (Standard for the "
-"Format of ARPA Internet Text Messages)> (RFC822),"
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<インターネットホストへの要求事項 -- アプリケーションとサポート "
-"(Requirements for Internet Hosts -- Application and Support)> (RFC1123) "
-"5.2.14 節,"
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
-msgstr "B<date>(1)"
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -176,13 +186,14 @@ msgstr ""
 "著者"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> とこのマニュアルページは Ian Jackson によって書かれた。そして、彼"
-"の手によって public domain とされている。"
 
 # type: TH
 #: cleanup-info.8:1
@@ -190,22 +201,28 @@ msgstr ""
 msgid "cleanup-info"
 msgstr "cleanup-info"
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr "cleanup-info - install-info の誤った利用による混乱の消去"
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] [I<E<lt>ディ"
-"レクトリ名E<gt>>]"
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<update-alternatives> [I<options>] B<--auto> I<name>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -217,7 +234,7 @@ msgstr ""
 "文字小文字の区別、あとに続くコロン/スペースに関しても賢く処理しようとする。"
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
@@ -225,7 +242,7 @@ msgstr ""
 "その他、空のセクションの除去、空行の圧縮(エントリーパートのみ)も行われる。"
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
@@ -234,7 +251,7 @@ msgstr ""
 "のの位置になる)。セクション内でのエントリの順序も保存される。"
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -247,65 +264,81 @@ msgstr ""
 "を使う前にバックアップファイルをとるようにすべきである。"
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr "ヘルプを表示し、正常終了する。"
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--unsafe>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr "いくつかの付加的なおそらく有用であろうオプションをセットする。"
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 "B<警告: `--unsafe' オプションは正しいファイルを改竄してしまうかもしれない!>"
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+#, fuzzy
+msgid "Show the usage message and exit."
+msgstr "利用方法を表示して正常終了する。"
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
-msgstr "バージョンを表示し、正常終了する。"
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+#, fuzzy
+msgid "Show the version and exit."
+msgstr "バージョン情報を出力して終了する。"
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "I</usr/info/dir> または I<E<lt>ディレクトリ名E<gt>/dir>"
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
@@ -314,23 +347,23 @@ msgstr ""
 "たものになる。"
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr "おそらくたくさんある。"
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -344,6 +377,13 @@ msgstr ""
 msgid "deb"
 msgstr "deb"
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "2006-02-28"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -1042,5684 +1082,5796 @@ msgstr ""
 msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
-# type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+# type: TP
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "dpkg-statoverride"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "2007-03-07"
 msgstr "2006-04-09"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "dpkg suite"
-
-# type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - Debian パッケージマネージャ"
-
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
 
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "警告"
+# type: TP
+#: deb-override.5:22
+#, fuzzy
+msgid "override"
+msgstr "dpkg-statoverride"
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
-"このマニュアルは、B<dpkg> のコマンドライン・オプションやパッケージ状態につい"
-"て、B<dpkg --help> で得られる情報よりもさらに詳細に理解したい利用者のために書"
-"かれたものである。"
+"パッケージに関するほとんどの情報は control ファイルで見つけることができるが、"
+"いくつかはメンテナではなくディストリビューション作成者により、それらの情報を"
+"与える必要がある。パッケージの実際の依存関係や説明よりも、リリースにむけて"
+"ファイルをどう配置するかに関係してくるからである。これらの情報は override "
+"ファイルにある。"
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
-"パッケージ管理者は、B<dpkg> がどのようにパッケージをインストールするのかを理"
-"解するという目的では、このマニュアルをI<読まない>ほうがよい。パッケージをイン"
-"ストールするときや削除するときの B<dpkg> の動作に関する記述は、特に不充分であ"
-"る。"
+"override ファイルは簡単な空白で区切られた形式になっている。コメントも許されて"
+"いる(B<#> 以降がコメント)。"
 
 # type: Plain text
-#: dpkg.1:26
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
-msgstr ""
-"B<dpkg> は、Debian パッケージの、インストール、構築、削除、管理をするための"
-"ツールである。B<dselect>(1) は、B<dpkg> の代表的なフロントエンドで、よりユー"
-"ザフレンドリなツールである。B<dpkg> は、コマンドライン引き数によって完全に制"
-"御することができる。コマンドライン引き数は、1 つのアクションと、0 個以上のオ"
-"プションとで構成される。アクションパラメータは、B<dpkg> に何をさせるのかを指"
-"定し、オプションはそのアクションのふるまいを制御する。"
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgstr "I<package> I<priority> I<section> [I<maintainerinfo>]"
 
 # type: Plain text
-#: dpkg.1:31
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"また、B<dpkg> は B<dpkg-deb>(1) のフロントエンドとしても使うことができる。以"
-"下のアクションは B<dpkg-deb> のアクションであり、B<dpkg> にこれらを引き数とし"
-"て与えると、B<dpkg-deb> に同じ引き数を与えて起動する。"
+"I<package> はパッケージ名である。override ファイルにあるがバイナリパッケージ"
+"のツリーにはないパッケージ名のエントリは無視される。"
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>,\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> と I<section> はパッケージをリリースツリーでどこに置くかを指定す"
+"る。これらは control ファイルにあるべきではない。もしパッケージが "
+"I<binarydir> のサブディレクトリにあれば I<section> の値とチェックされる。"
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-msgstr "これらのアクションについては、B<dpkg-deb>(1) にくわしい情報がある。"
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "パッケージに関する情報"
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
+msgstr ""
+"I<maintainerinfo> がもしあればメンテナの名前を無条件に上書きできる。もしくは "
+"I<oldmaintainer> B<=E<gt>> I<newmaintainer> の場合は置換される。"
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"B<dpkg> は、いくつかの利用可能なパッケージに関する有用な情報を管理している。"
-"この情報は、B<パッケージ状態>、B<パッケージ選択状態>、そしてB<フラグ>の 3 つ"
-"に分類できる。これらの値は主に B<dselect> によって変更される。"
+"公式の Packages リストを作成するために使われている override ファイルは、 "
+"Debian ミラーの I<indices> ディレクトリにある。"
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "パッケージ状態"
+# type: Plain text
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
-msgstr "B<installed>"
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-02-28"
 
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
-msgstr "パッケージの展開と設定が完了している。"
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<half-installed>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"パッケージのインストールは開始しているが、何らかの理由で完了していない。"
-
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "パッケージはシステムにインストールされていない。"
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
 
 # type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<unpacked>"
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-deb actions>"
+
+# type: TP
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "パッケージは展開されたが、設定はされていない。"
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
+msgstr ""
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<half-configured>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:66
+#: deb-substvars.5:20
 msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
 msgstr ""
-"パッケージは展開され、設定も開始しているが何らかの理由によって完了していな"
-"い。"
 
-# type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
-msgstr "B<config-files>"
+# type: Plain text
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "パッケージの設定ファイルだけが存在している。"
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
 
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "パッケージ選択状態"
+# type: Plain text
+#: deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
 
 # type: TP
-#: dpkg.1:70
-#, no-wrap
-msgid "B<install>"
-msgstr "B<install>"
+#: deb-substvars.5:49
+#, fuzzy, no-wrap
+msgid "B<Arch>"
+msgstr "B<-h>"
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "パッケージはインストールするように選択されている。"
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
+msgstr ""
 
 # type: TP
-#: dpkg.1:73
+#: deb-substvars.5:53
+#, fuzzy, no-wrap
+msgid "B<source:Version>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: deb-substvars.5:56
+#, fuzzy
+msgid "The source package version."
+msgstr "パッケージの短い説明文"
+
+# type: TP
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstall>"
+msgid "B<source:Upstream-Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:77
+#: deb-substvars.5:60
 msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"パッケージは deinstallation するように選択されている(設定ファイルを除くすべて"
-"のファイルを削除したい)。"
 
 # type: TP
-#: dpkg.1:77
-#, no-wrap
-msgid "B<purge>"
-msgstr "B<purge>"
+#: deb-substvars.5:60
+#, fuzzy, no-wrap
+msgid "B<binary:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:64
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"パッケージは purge するように選択されている(設定ファイルも含めたすべてのファ"
-"イルを削除したい)。"
-
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "パッケージフラグ"
 
 # type: TP
-#: dpkg.1:82
-#, no-wrap
-msgid "B<hold>"
-msgstr "B<hold>"
+#: deb-substvars.5:64
+#, fuzzy, no-wrap
+msgid "B<Source-Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:69
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"パッケージは B<hold> (変更禁止)されている。これは B<--force-hold> で強制しな"
-"い限り B<dpkg> で扱わないということである。"
 
 # type: TP
-#: dpkg.1:86
-#, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<reinst-required>"
+#: deb-substvars.5:69
+#, fuzzy, no-wrap
+msgid "B<Installed-Size>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:78
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"パッケージは B<reinst-required> されている。これは、壊れている状態でインス"
-"トールされていて、再インストールが要求されているということである。このパッ"
-"ケージは B<--force-reinstreq> で強制しない限り、削除することができない。"
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, no-wrap
-msgid "ACTIONS"
-msgstr "アクション"
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:78
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<package_file>..."
+msgid "B<Extra-Size>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:87
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"指定したパッケージをインストールする。もし B<--recursive> または B<-R> オプ"
-"ションを指定する場合、I<package_file> に、参照するディレクトリを指定しなけれ"
-"ばならない。"
-
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "インストールは、以下の手順で構成されている。"
 
-# type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> インストールするパッケージの制御ファイルを取り出す。"
+# type: TP
+#: deb-substvars.5:87
+#, fuzzy, no-wrap
+msgid "B<F:>I<fieldname>"
+msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:94
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
-"B<2.> もし同じパッケージの別のバージョンがすでにインストール済みの場合、新し"
-"いパッケージのインストールの前に、インストール済みのパッケージの I<prerm> ス"
-"クリプトを実行する。"
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
+# type: TP
+#: deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
 msgstr ""
-"B<3.> もしパッケージが I<preinst> スクリプトを提供している場合、それを実行す"
-"る。"
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:104
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"B<4.> 新しいファイルを展開する。同時に、失敗したときに元に戻せるように、古い"
-"ファイルを保存する。"
 
-# type: Plain text
-#: dpkg.1:120
-msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+# type: TP
+#: deb-substvars.5:104
+#, no-wrap
+msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr ""
-"B<5.> もし同じパッケージの別のバージョンがすでにインストール済みの場合、先に"
-"インストールされていたパッケージの I<postrm> を実行する。このスクリプトが、新"
-"しいパッケージの I<preinst> の後に実行されることに注意すること。これは、新し"
-"いファイルが書き込まれるのと同時に古いファイルが削除されるためである。"
 
 # type: Plain text
-#: dpkg.1:124
-msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"B<6.> パッケージの設定をする。これがどのように実行されるか、 B<--configure> "
-"の項にくわしい情報がある。"
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:107
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<package_file> ..."
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
+#: deb-substvars.5:111
 msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"パッケージを展開する、しかし設定はしない。もし B<--recursive> または B<-R> オ"
-"プションを指定する場合、I<Package_file> に、参照するディレクトリを指定しなけ"
-"ればならない。"
 
 # type: TP
-#: dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+#: deb-substvars.5:111
+#, fuzzy, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:134
-msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
 msgstr ""
-"展開済みのパッケージを再設定する。もし、B<-a> または B<--pending> を指定した"
-"場合、まだ設定されていない展開済みのすべてのパッケージを設定する。"
+
+# type: TP
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
-msgstr "設定は、以下の手順で構成されている。"
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:141
+#: deb-substvars.5:120
 msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
-"B<1.> 設定ファイルを展開する。同時に、失敗したときに元に戻せるように、古い設"
-"定ファイルを保存する。"
-
-# type: Plain text
-#: dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
-msgstr ""
-"B<2.> もしパッケージが I<postinst> スクリプトを提供している場合、それを実行す"
-"る。"
 
 # type: TP
-#: dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+#: deb-substvars.5:122
+#, fuzzy, no-wrap
+msgid "B<debian/substvars>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:155
+#: deb-substvars.5:125
+#, fuzzy
+msgid "List of substitution variables and values."
+msgstr "使用できるパッケージの一覧。"
+
+# type: Plain text
+#: deb-substvars.5:129 dpkg-source.1:267
 msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
 msgstr ""
-"インストール済みのパッケージを削除する。B<-r> または B<--remove> は、設定ファ"
-"イルを除いたすべてを削除する。こうすることで、後で再インストールしたときに再"
-"設定をしなくてよくなる(設定ファイルの一覧は、I<debian/conffiles> コントロール"
-"ファイルにある)。B<-P> または B<--purge> は、設定ファイルを含むすべてを削除す"
-"る。引き数として、パッケージ名の代わりに B<-a> または B<--pending> が指定され"
-"た場合には、I</var/lib/dpkg/status> ファイルで remove または purge のマークを"
-"持つすべての展開済みパッケージを、それぞれ remove または purge する。"
 
 # type: Plain text
-#: dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
-msgstr "パッケージの削除は以下の手順で構成されている。"
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 
 # type: Plain text
-#: dpkg.1:160
-msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> I<prerm> スクリプトを実行する。"
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr ""
 
-# type: Plain text
-#: dpkg.1:163
-msgid "B<2.> Remove the installed files"
-msgstr "B<2.> インストールしたファイルを削除する。"
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
+#, fuzzy, no-wrap
+msgid "COPYRIGHT"
+msgstr ""
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"著作権\n"
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"COPYRIGHT"
 
 # type: Plain text
-#: dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> I<postrm> スクリプトを実行する。"
-
-# type: TP
-#: dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+#, fuzzy
+msgid "Copyright (C) 1995-1996 Ian Jackson"
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: Plain text
-#: dpkg.1:176
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
-msgstr ""
-"B<dpkg> や B<dselect> が管理する利用可能なパッケージの情報を更新する。B<--"
-"merge-avail> アクションは、古い情報に I<Packages-file> の情報を組み合わせる。"
-"B<--update-avail> アクションは、古い情報を I<Packages-file> の情報で置き換え"
-"る。Debian と一緒に配布されている I<Packages-file> の名前は簡単に "
-"I<Packages> である。B<dpkg> は、利用可能なパッケージの情報を I</var/lib/dpkg/"
-"available> に記録する。"
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+#, fuzzy
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr "Copyright 2000 Wichert Akkerman"
 
 # type: Plain text
-#: dpkg.1:179
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
 msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
-"I<available> ファイルの取得と更新を行なう、もっとも簡単なコマンドは "
-"B<dselect update> である。"
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO warranty."
 
-# type: TP
-#: dpkg.1:179
+# type: TH
+#: dpkg.1:1
 #, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgid "dpkg"
+msgstr "dpkg"
 
-# type: Plain text
-#: dpkg.1:185
-msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
-msgstr ""
-"B<dpkg> や B<dselect> が管理する利用可能なパッケージの情報を、"
-"I<package_file> パッケージからの情報で更新する。もし B<--recursive> または "
-"B<-R> オプションを指定する場合、I<Package_file> に、参照するディレクトリを指"
-"定しなければならない。"
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
+msgstr "2006-04-09"
 
-# type: TP
-#: dpkg.1:185
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
-msgstr "B<dpkg --forget-old-unavail>"
+msgid "dpkg suite"
+msgstr "dpkg suite"
 
 # type: Plain text
-#: dpkg.1:188
-msgid "Forget about uninstalled unavailable packages."
-msgstr "インストールされていなくて利用可能でないパッケージの情報を消去する。"
-
-# type: TP
-#: dpkg.1:188
-#, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr "B<dpkg --clear-avail>"
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - Debian パッケージマネージャ"
 
 # type: Plain text
-#: dpkg.1:191
-msgid "Erase the existing information about what packages are available."
-msgstr "利用可能なパッケージの情報を消去する。"
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
-# type: TP
-#: dpkg.1:191
+# type: SH
+#: dpkg.1:9
 #, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+msgid "WARNING"
+msgstr "警告"
 
 # type: Plain text
-#: dpkg.1:196
+#: dpkg.1:13
 msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
-"インストールが完了していないパッケージを探す。B<dpkg> はインストールを完了さ"
-"せるためにどうすればよいかを提案する。"
-
-# type: TP
-#: dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<package-name-pattern>...]"
+"このマニュアルは、B<dpkg> のコマンドライン・オプションやパッケージ状態につい"
+"て、B<dpkg --help> で得られる情報よりもさらに詳細に理解したい利用者のために書"
+"かれたものである。"
 
 # type: Plain text
-#: dpkg.1:200
+#: dpkg.1:18
 msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
-"パッケージ選択リストを標準出力に書き出す。パターンを指定しない場合、purge 状"
-"態のパッケージは表示されない。"
-
-# type: TP
-#: dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr "B<dpkg --set-selections>"
+"パッケージ管理者は、B<dpkg> がどのようにパッケージをインストールするのかを理"
+"解するという目的では、このマニュアルをI<読まない>ほうがよい。パッケージをイン"
+"ストールするときや削除するときの B<dpkg> の動作に関する記述は、特に不充分であ"
+"る。"
 
 # type: Plain text
-#: dpkg.1:206
+#: dpkg.1:26
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
 msgstr ""
-"パッケージ選択リストを標準入力から読み込んで設定する。ファイルの形式は "
-"'E<lt>packageE<gt> E<lt>stateE<gt>' でなければならない。state は、install、"
-"hold、deinstall または purge のいずれかである。空行や、行が '#' で始まるコメ"
-"ント行を使用してもよい。"
-
-# type: TP
-#: dpkg.1:206
-#, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr "B<dpkg --clear-selections>"
+"B<dpkg> は、Debian パッケージの、インストール、構築、削除、管理をするための"
+"ツールである。B<dselect>(1) は、B<dpkg> の代表的なフロントエンドで、よりユー"
+"ザフレンドリなツールである。B<dpkg> は、コマンドライン引き数によって完全に制"
+"御することができる。コマンドライン引き数は、1 つのアクションと、0 個以上のオ"
+"プションとで構成される。アクションパラメータは、B<dpkg> に何をさせるのかを指"
+"定し、オプションはそのアクションのふるまいを制御する。"
 
 # type: Plain text
-#: dpkg.1:211
+#: dpkg.1:31
 msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
-"essential でないパッケージすべての選択状態を deinstall にする。--set-"
-"selections に与えるリストにないパッケージを deinstall するため、--set-"
-"selections の直前に使うためのものである。"
-
-# type: TP
-#: dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr "B<dpkg --yet-to-unpack>"
+"また、B<dpkg> は B<dpkg-deb>(1) のフロントエンドとしても使うことができる。以"
+"下のアクションは B<dpkg-deb> のアクションであり、B<dpkg> にこれらを引き数とし"
+"て与えると、B<dpkg-deb> に同じ引き数を与えて起動する。"
 
 # type: Plain text
-#: dpkg.1:215
+#: dpkg.1:40
+#, no-wrap
 msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 msgstr ""
-"インストールするために選択されたが、何らかの理由でまだインストールされていな"
-"いパッケージを探す。"
-
-# type: TP
-#: dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr "B<dpkg --print-architecture>"
-
-# type: Plain text
-#: dpkg.1:219
-msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
-msgstr "B<dpkg> のインストールするアーキテクチャ(例えば、\"i386\")を表示する。"
-
-# type: TP
-#: dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
-msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
-
-# type: Plain text
-#: dpkg.1:230
-msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
-msgstr ""
-"二項演算子 I<op> で 2 つのバージョンを比較する。B<dpkg> の返り値は、指定した"
-"条件を満たすなら成功(0)、そうでなければ失敗(0 以外)となる。演算子は 2 つのグ"
-"ループに分かれる。これは I<ver1> か I<ver2> が欠けているときのふるまいの違い"
-"による。B<lt le eq ne ge gt> は、欠けているバージョンがどれよりも古いとみな"
-"す。B<lt-nl le-nl ge-nl gt-nl> は、欠けているバージョンがどれよりも新しいとみ"
-"なす。B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> は、control ファイ"
-"ルの文法との互換性のためだけに提供されている。"
-
-# type: TP
-#: dpkg.1:230
-#, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
-
-# type: Plain text
-#: dpkg.1:235
-msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
-msgstr ""
-"ファイル記述子 B<E<lt>nE<gt>> から一連のコマンドをうけいれる。注意: 追加のオ"
-"プションはコマンドラインとこのファイル記述子を通じて指定でき、一回の実行を通"
-"じてそれらがリセットされることはない。"
-
-# type: TP
-#: dpkg.1:235
-#, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
-# type: Plain text
-#: dpkg.1:238
-msgid "Display a brief help message."
-msgstr "簡単なオプション一覧を表示する。"
-
-# type: TP
-#: dpkg.1:238
-#, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr "B<dpkg --force-help>"
-
-# type: Plain text
-#: dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
-msgstr "B<--force->I<thing> オプション一覧を表示する。"
-
-# type: TP
-#: dpkg.1:241
-#, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
-
-# type: Plain text
-#: dpkg.1:244
-msgid "Give help about debugging options."
-msgstr "デバッグ用オプション一覧を表示する。"
-
-# type: TP
-#: dpkg.1:244
-#, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
-
-# type: Plain text
-#: dpkg.1:247
-msgid "Display B<dpkg> licence."
-msgstr "B<dpkg> のライセンスを表示する。"
-
-# type: TP
-#: dpkg.1:247
-#, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
-
-# type: Plain text
-#: dpkg.1:250
-msgid "Display B<dpkg> version information."
-msgstr "B<dpkg> のバージョン情報を表示する。"
-
-# type: TP
-#: dpkg.1:250
-#, no-wrap
-msgid "B<dpkg-deb actions>"
-msgstr "B<dpkg-deb actions>"
-
-# type: Plain text
-#: dpkg.1:253
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
-msgstr "以下のアクションのくわしい情報は B<dpkg-deb>(1) を参照すること。"
-
-# type: Plain text
-#: dpkg.1:273
-#, no-wrap
-msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
-msgstr ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    deb パッケージを構築する。\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    deb パッケージに含まれるファイル一覧を表示する。\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    パッケージから制御情報を取り出す。\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    パッケージに含まれるファイルをすべて取り出す。\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    パッケージの制御フィールドを表示する。\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Debian パッケージに含まれる tar ファイルを表示する。\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    パッケージに関する情報を表示する。\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    パッケージに含まれるファイルを展開し、ファイル名を表示する。\n"
-
-# type: TP
-#: dpkg.1:275
-#, no-wrap
-msgid "B<dpkg-query actions>"
-msgstr "B<dpkg-query actions>"
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>,\n"
+"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
-msgstr "以下のアクションの詳細は、B<dpkg-query>(1) を参照すること。"
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr "これらのアクションについては、B<dpkg-deb>(1) にくわしい情報がある。"
 
-# type: Plain text
-#: dpkg.1:291
+# type: SH
+#: dpkg.1:43
 #, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
-msgstr ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    指定したパターンにマッチする名前のパッケージを表示する。\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    指定したパッケージの状態を報告する。\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    B<package> パッケージによってシステムにインストールされたファイルを表示する。\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    指定したファイルがどのパッケージからインストールされたか検索する。\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    I</var/lib/dpkg/available> にある I<package> の詳細情報を表示する。\n"
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "パッケージに関する情報"
 
 # type: Plain text
-#: dpkg.1:298
+#: dpkg.1:48
 msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"すべてのオプションは、コマンドラインや、B<dpkg> の設定ファイルである I</etc/"
-"dpkg/dpkg.cfg> で指定できる。設定ファイルの各行は、(先頭のダッシュが無いこと"
-"以外はコマンドラインオプションと全く同じ)オプションか、(行頭が B<#> の)コメン"
-"トである。"
-
-# type: TP
-#: dpkg.1:299
-#, no-wrap
-msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<number>"
-
-# type: Plain text
-#: dpkg.1:302
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
-msgstr "B<dpkg> の処理を中断させるエラー数を変更する。デフォルトは 50 である。"
+"B<dpkg> は、いくつかの利用可能なパッケージに関する有用な情報を管理している。"
+"この情報は、B<パッケージ状態>、B<パッケージ選択状態>、そしてB<フラグ>の 3 つ"
+"に分類できる。これらの値は主に B<dselect> によって変更される。"
 
-# type: TP
-#: dpkg.1:302
+# type: SS
+#: dpkg.1:48
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr "B<-B>|B<--auto-deconfigure>"
-
-# type: Plain text
-#: dpkg.1:308
-msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
-msgstr ""
-"パッケージを削除するとき、削除するパッケージに依存した別のパッケージがインス"
-"トールされている場合がある。このオプションを指定すると、削除するパッケージに"
-"依存しているパッケージの設定を取り消す。"
+msgid "PACKAGE STATES"
+msgstr "パッケージ状態"
 
 # type: TP
-#: dpkg.1:308
+#: dpkg.1:49
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
-
-# type: Plain text
-#: dpkg.1:314
-msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
-msgstr ""
-"デバッグモードにする。 I<octal> は、以下の一覧から望む値をビットごとの論理和"
-"で組み合わせたものである(これらの値は、将来のリリースでは変更される可能性があ"
-"るので注意すること)。B<-Dh> または B<--debug=help> はこれらの値を表示する。"
+msgid "B<installed>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:326
-#, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
-msgstr ""
-" 数値   説明\n"
-"    1   一般的に役に立つ進行状況\n"
-"    2   管理スクリプトの呼び出し状況と状態\n"
-"   10   各ファイル処理の情報\n"
-"  100   各ファイル処理の大量の情報\n"
-"   20   各設定ファイルの情報\n"
-"  200   各設定ファイルの大量の情報\n"
-"   40   依存関係、競合関係\n"
-"  400   依存関係、競合関係の大量の情報\n"
-" 1000   dpkg/info ディレクトリなどに関する大量の情報\n"
-" 2000   正気でないほどの大量の情報\n"
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
+msgstr "パッケージの展開と設定が完了している。"
 
 # type: TP
-#: dpkg.1:326
+#: dpkg.1:52
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-
-# type: Plain text
-#: dpkg.1:333
-msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
-msgstr ""
-"指定した I<things> を強制実行する(force)、または拒否する(refuse) (B<no-"
-"force> と B<refuse> は同じ意味)。I<things> に、以下の項目をコンマで区切って指"
-"定する。B<--force-help> オプションでこれらの説明を表示する。(*)マークのあるも"
-"のは、デフォルトで強制実行される。"
-
-# type: Plain text
-#: dpkg.1:337
-msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
-msgstr ""
-"I<警告: これらのオプションは、おもに熟練したユーザだけが使うことを意図したも"
-"のである。影響を完全に理解しないままにこれらを使うと、システム全体を壊してし"
-"まうかもしれない。>"
-
-# type: Plain text
-#: dpkg.1:340
-msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: 全ての強制オプションを指定する(または打ち消す)。"
-
-# type: Plain text
-#: dpkg.1:343
-msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
-msgstr ""
-"B<downgrade>(*): より新しいバージョンがすでにインストールされていたとしても、"
-"指定したパッケージをインストールする。"
-
-# type: Plain text
-#: dpkg.1:350
-msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
-msgstr ""
-"I<警告: 現在の dpkg は、ダウングレード時にいかなる依存関係のチェックもしな"
-"い。そのため、ダウングレードすることで、ほかのパッケージの依存関係を警告なし"
-"に壊すかもしれない。これは深刻な副作用となる可能性があり、主要なシステム構成"
-"をダウングレードすることでシステムを壊してしまうこともありうる。注意して使用"
-"すること。>"
-
-# type: Plain text
-#: dpkg.1:354
-msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
-msgstr ""
-"B<configure-any>: 指定したパッケージに依存していて、すでに展開されているが、"
-"まだ設定されていないパッケージも一緒に設定をする。"
+msgid "B<half-installed>"
+msgstr "B<half-installed>"
 
 # type: Plain text
-#: dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
+#: dpkg.1:56
+msgid ""
+"The installation of the package has been started, but not completed for some "
+"reason."
 msgstr ""
-"B<hold>: たとえ \"hold\" とマークされていても、そのパッケージの処理をする。"
+"パッケージのインストールは開始しているが、何らかの理由で完了していない。"
+
+# type: TP
+#: dpkg.1:56
+#, no-wrap
+msgid "B<not-installed>"
+msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:362
-msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
-msgstr ""
-"B<remove-reinstreq>: 壊れていて、再インストールが必要だとマークされていたとし"
-"ても、パッケージを削除する。これにより、例えば、パッケージの一部が B<dpkg> に"
-"管理されないで残るなどの問題がおこるかもしれない。"
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "パッケージはシステムにインストールされていない。"
+
+# type: TP
+#: dpkg.1:59
+#, no-wrap
+msgid "B<unpacked>"
+msgstr "B<unpacked>"
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "パッケージは展開されたが、設定はされていない。"
+
+# type: TP
+#: dpkg.1:62
+#, no-wrap
+msgid "B<half-configured>"
+msgstr "B<half-configured>"
+
+# type: Plain text
+#: dpkg.1:66
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
 msgstr ""
-"B<remove-essential>: essential とされるパッケージであっても削除する。"
-"essential パッケージには、たいてい最も基本的な UNIX コマンドが含まれる。これ"
-"らのパッケージを削除すると、システム全体が動作しなくなることもあるので、注意"
-"して削除すること。"
+"パッケージは展開され、設定も開始しているが何らかの理由によって完了していな"
+"い。"
+
+# type: TP
+#: dpkg.1:66
+#, no-wrap
+msgid "B<config-files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: すべての依存問題を警告に変える。"
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "パッケージの設定ファイルだけが存在している。"
+
+# type: SS
+#: dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "パッケージ選択状態"
+
+# type: TP
+#: dpkg.1:70
+#, no-wrap
+msgid "B<install>"
+msgstr "B<install>"
 
 # type: Plain text
-#: dpkg.1:373
-msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
-msgstr "B<depends-version>: 依存関係の確認をするとき、バージョンを無視する。"
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "パッケージはインストールするように選択されている。"
+
+# type: TP
+#: dpkg.1:73
+#, no-wrap
+msgid "B<deinstall>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:377
+#: dpkg.1:77
 msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
-"B<conflicts>: 他のパッケージと競合してもインストールする。たいていはいくつか"
-"ファイルを上書きすることになるため、危険である。"
+"パッケージは deinstallation するように選択されている(設定ファイルを除くすべて"
+"のファイルを削除したい)。"
+
+# type: TP
+#: dpkg.1:77
+#, no-wrap
+msgid "B<purge>"
+msgstr "B<purge>"
 
 # type: Plain text
-#: dpkg.1:382
+#: dpkg.1:81
 msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
-"B<confmiss>: 常に、欠けている設定ファイルをインストールする。このオプション"
-"は、変更(ファイルを削除したこと)を保存しないため、危険である。"
+"パッケージは purge するように選択されている(設定ファイルも含めたすべてのファ"
+"イルを削除したい)。"
+
+# type: SS
+#: dpkg.1:81
+#, no-wrap
+msgid "PACKAGE FLAGS"
+msgstr "パッケージフラグ"
+
+# type: TP
+#: dpkg.1:82
+#, no-wrap
+msgid "B<hold>"
+msgstr "B<hold>"
 
 # type: Plain text
-#: dpkg.1:387
+#: dpkg.1:86
 msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
-"B<confnew>: 設定ファイルが変更されていた場合、問い合わせなしに新しいバージョ"
-"ンの設定ファイルをインストールする。ただし、B<--force-confdef> を同時に指定し"
-"た場合は、デフォルトの動作が優先される。"
+"パッケージは B<hold> (変更禁止)されている。これは B<--force-hold> で強制しな"
+"い限り B<dpkg> で扱わないということである。"
+
+# type: TP
+#: dpkg.1:86
+#, no-wrap
+msgid "B<reinst-required>"
+msgstr "B<reinst-required>"
 
 # type: Plain text
-#: dpkg.1:392
+#: dpkg.1:91
 msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
-"B<confold>: 設定ファイルが変更されていた場合、問い合わせなしに古いバージョン"
-"の設定ファイルを保持する。ただし、B<--force-confdef> を同時に指定した場合は、"
-"デフォルトの動作が優先される。"
+"パッケージは B<reinst-required> されている。これは、壊れている状態でインス"
+"トールされていて、再インストールが要求されているということである。このパッ"
+"ケージは B<--force-reinstreq> で強制しない限り、削除することができない。"
+
+# type: SH
+#: dpkg.1:92
+#, no-wrap
+msgid "ACTIONS"
+msgstr "アクション"
+
+# type: TP
+#: dpkg.1:93
+#, no-wrap
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<package_file>..."
 
 # type: Plain text
-#: dpkg.1:398
+#: dpkg.1:97
 msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
-"B<confdef>: 設定ファイルが変更されていた場合、常にデフォルトの動作をする。デ"
-"フォルトの動作がなく、B<--force-confnew> と B<--force-confold> のどちらも同時"
-"に指定していない場合、ユーザに尋ねるために中断する。指定している場合は、指定"
-"されたオプションによって最終的な動作が決まる。"
+"指定したパッケージをインストールする。もし B<--recursive> または B<-R> オプ"
+"ションを指定する場合、I<package_file> に、参照するディレクトリを指定しなけれ"
+"ばならない。"
 
 # type: Plain text
-#: dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr ""
-"B<overwrite>: あるパッケージで提供されているファイルを、インストールするパッ"
-"ケージのファイルで上書きする。"
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "インストールは、以下の手順で構成されている。"
 
 # type: Plain text
-#: dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
-msgstr ""
-"B<overwrite-dir>: あるパッケージで提供されているディレクトリを、インストール"
-"するパッケージのファイルで上書きする。"
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> インストールするパッケージの制御ファイルを取り出す。"
 
 # type: Plain text
-#: dpkg.1:407
+#: dpkg.1:106
 msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
-"B<overwrite-diverted>: 退避(divert した)版のファイルを非退避(divert していな"
-"い)版のファイルで上書きする。"
+"B<2.> もし同じパッケージの別のバージョンがすでにインストール済みの場合、新し"
+"いパッケージのインストールの前に、インストール済みのパッケージの I<prerm> ス"
+"クリプトを実行する。"
 
 # type: Plain text
-#: dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr ""
-"B<architecture>: パッケージが間違ったアーキテクチャ用であっても処理をする。"
+"B<3.> もしパッケージが I<preinst> スクリプトを提供している場合、それを実行す"
+"る。"
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:113
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
-"B<bad-path>: 重要なプログラムが B<PATH> に含まれていなくても実行する。問題が"
-"起きる可能性は高い。"
+"B<4.> 新しいファイルを展開する。同時に、失敗したときに元に戻せるように、古い"
+"ファイルを保存する。"
 
 # type: Plain text
-#: dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
+#: dpkg.1:120
+msgid ""
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
-"B<not-root>: root でないときでも、それをインストール(または削除)しようと試み"
-"る。"
-
-# type: Plain text
-#: dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
-msgstr "B<bad-verify>: 信頼性チェックに失敗してもインストールする。"
-
-# type: TP
-#: dpkg.1:420
-#, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
-msgstr "B<--ignore-depends>=I<package>,..."
+"B<5.> もし同じパッケージの別のバージョンがすでにインストール済みの場合、先に"
+"インストールされていたパッケージの I<postrm> を実行する。このスクリプトが、新"
+"しいパッケージの I<preinst> の後に実行されることに注意すること。これは、新し"
+"いファイルが書き込まれるのと同時に古いファイルが削除されるためである。"
 
 # type: Plain text
-#: dpkg.1:424
+#: dpkg.1:124
 msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
-"指定したパッケージに関する依存関係の確認を無視する(実際は、依存関係を確認し、"
-"競合に対して警告メッセージを出して、アクションを実行する)。"
+"B<6.> パッケージの設定をする。これがどのように実行されるか、 B<--configure> "
+"の項にくわしい情報がある。"
 
 # type: TP
-#: dpkg.1:424
+#: dpkg.1:124
 #, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<package_file> ..."
 
 # type: Plain text
-#: dpkg.1:428
+#: dpkg.1:129
 msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"パッケージのフォーマットが新しいか古いかを指定する。これは B<dpkg-deb>(1) の"
-"オプションである。"
+"パッケージを展開する、しかし設定はしない。もし B<--recursive> または B<-R> オ"
+"プションを指定する場合、I<Package_file> に、参照するディレクトリを指定しなけ"
+"ればならない。"
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:129
 #, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:134
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
-"パッケージを構築するときに、制御ファイルの内容も読まず、確認もしない。これは "
-"B<dpkg-deb>(1) のオプションである。"
+"展開済みのパッケージを再設定する。もし、B<-a> または B<--pending> を指定した"
+"場合、まだ設定されていない展開済みのすべてのパッケージを設定する。"
 
-# type: TP
-#: dpkg.1:432
-#, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
+# type: Plain text
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
+msgstr "設定は、以下の手順で構成されている。"
 
 # type: Plain text
-#: dpkg.1:437
+#: dpkg.1:141
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
-"期待される動作をすべて実行するが、どのような変更も書き込まない。これは、実際"
-"にはシステムに何の変更も加えずに、指定したアクションで何がおこるのかを確認す"
-"るためのものである。"
+"B<1.> 設定ファイルを展開する。同時に、失敗したときに元に戻せるように、古い設"
+"定ファイルを保存する。"
 
 # type: Plain text
-#: dpkg.1:442
-msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+#: dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr ""
-"オプション B<--no-act> は、必ずアクションパラメータより前に与えること。さもな"
-"くば、望ましくない結果が起きる可能性がある(例えば、システムに何も変更を加える"
-"つもりがないのに、 B<dpkg --purge foo --no-act> を実行すると、最初にパッケー"
-"ジ foo を本当に purge し、次にパッケージ --no-act を purge しようとする、とい"
-"うことになる)。"
+"B<2.> もしパッケージが I<postinst> スクリプトを提供している場合、それを実行す"
+"る。"
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:144
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr "B<-R> | B<--recursive>"
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:448
+#: dpkg.1:155
 msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
-"指定したディレクトリを再帰的に検索し、みつけた B<*.deb> というパターンにマッ"
-"チするファイルをすべて扱う。これは、B<-i>, B<-A>, B<--install>, B<--unpack> "
-"そして B<--avail> アクションとともに使うことができる。"
+"インストール済みのパッケージを削除する。B<-r> または B<--remove> は、設定ファ"
+"イルを除いたすべてを削除する。こうすることで、後で再インストールしたときに再"
+"設定をしなくてよくなる(設定ファイルの一覧は、I<debian/conffiles> コントロール"
+"ファイルにある)。B<-P> または B<--purge> は、設定ファイルを含むすべてを削除す"
+"る。引き数として、パッケージ名の代わりに B<-a> または B<--pending> が指定され"
+"た場合には、I</var/lib/dpkg/status> ファイルで remove または purge のマークを"
+"持つすべての展開済みパッケージを、それぞれ remove または purge する。"
 
-# type: TP
-#: dpkg.1:448
-#, no-wrap
-msgid "B<-G>"
-msgstr "B<-G>"
+# type: Plain text
+#: dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
+msgstr "パッケージの削除は以下の手順で構成されている。"
 
 # type: Plain text
-#: dpkg.1:452
-msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
-msgstr ""
-"インストール済みのパッケージのほうがバージョンが新しければ、インストールしな"
-"い。これは B<--refuse-downgrade> の別名である。"
+#: dpkg.1:160
+msgid "B<1.> Run I<prerm> script"
+msgstr "B<1.> I<prerm> スクリプトを実行する。"
+
+# type: Plain text
+#: dpkg.1:163
+msgid "B<2.> Remove the installed files"
+msgstr "B<2.> インストールしたファイルを削除する。"
+
+# type: Plain text
+#: dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
+msgstr "B<3.> I<postrm> スクリプトを実行する。"
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:167
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 
 # type: Plain text
-#: dpkg.1:463
+#: dpkg.1:176
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"デフォルトのディレクトリを変更する。B<admindir> はインストール済みのパッケー"
-"ジやインストールされていないパッケージの状態に関する情報などを提供する、多数"
-"のファイルが格納されているディレクトリで、デフォルトは I</var/lib/dpkg> であ"
-"る。B<instdir> はパッケージをインストールするときに参照されるディレクトリで、"
-"デフォルトは I</> である。また、B<instdir> は、パッケージのインストールスクリ"
-"プトが実行される前に B<chroot>(2) するディレクトリのパスである。つまり、スク"
-"リプトは B<instdir> をルートディレクトリとみなす。B<root> を変更すると、"
-"B<instdir> を I<dir> に、B<admindir> を I<dir>B</var/lib/dpkg> に変更する。"
-
-# type: TP
-#: dpkg.1:463
-#, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+"B<dpkg> や B<dselect> が管理する利用可能なパッケージの情報を更新する。B<--"
+"merge-avail> アクションは、古い情報に I<Packages-file> の情報を組み合わせる。"
+"B<--update-avail> アクションは、古い情報を I<Packages-file> の情報で置き換え"
+"る。Debian と一緒に配布されている I<Packages-file> の名前は簡単に "
+"I<Packages> である。B<dpkg> は、利用可能なパッケージの情報を I</var/lib/dpkg/"
+"available> に記録する。"
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:179
 msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
-"インストール(または削除)作業をするように選択したパッケージのみを処理する。実"
-"際の指定は、B<dselect> や B<dpkg> を使って行なう。例えば、あるパッケージが削"
-"除されるのは、そのパッケージが削除されるよう選択されているということである。"
+"I<available> ファイルの取得と更新を行なう、もっとも簡単なコマンドは "
+"B<dselect update> である。"
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:179
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgstr "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 
 # type: Plain text
-#: dpkg.1:473
+#: dpkg.1:185
 msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"すでに同じバージョンのパッケージがインストールされていたら、インストールしな"
-"い。"
+"B<dpkg> や B<dselect> が管理する利用可能なパッケージの情報を、"
+"I<package_file> パッケージからの情報で更新する。もし B<--recursive> または "
+"B<-R> オプションを指定する場合、I<Package_file> に、参照するディレクトリを指"
+"定しなければならない。"
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:185
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg --forget-old-unavail>"
+msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
-#: dpkg.1:480
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-"ファイル記述子 I<E<lt>nE<gt>> にパッケージ状態の情報を送る。これは複数与える"
-"ことができる。状態の情報は `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>' の形"
-"式である。エラーは `status: E<lt>pkgE<gt>: error: extend-error-message' とし"
-"て報告される。設定ファイルの衝突は `status: conffile-prompt: conffile : "
-"'current-conffile' 'new-conffile' useredited distedited' として報告される。"
+#: dpkg.1:188
+msgid "Forget about uninstalled unavailable packages."
+msgstr "インストールされていなくて利用可能でないパッケージの情報を消去する。"
 
 # type: TP
-#: dpkg.1:480
+#: dpkg.1:188
 #, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--log=>I<filename>"
+msgid "B<dpkg --clear-avail>"
+msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
-#: dpkg.1:492
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
+#: dpkg.1:191
+msgid "Erase the existing information about what packages are available."
+msgstr "利用可能なパッケージの情報を消去する。"
+
+# type: TP
+#: dpkg.1:191
+#, no-wrap
+msgid "B<dpkg -C> | B<--audit>"
+msgstr "B<dpkg -C> | B<--audit>"
+
+# type: Plain text
+#: dpkg.1:196
+msgid ""
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
-"状態の変更やアクションの記録を、デフォルトの I</var/log/dpkg.log> から "
-"I<filename> に変更する。このオプションを複数回指定した場合は、最後のファイル"
-"名が使われる。ログメッセージは次の形式である。`YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' は状態の変更。"
-"`YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' はアクションで、"
-"I<E<lt>actionE<gt>> は install、upgrade、remove、purge のいずれか。`YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' は設定ファイルの"
-"変更で、I<E<lt>decisionE<gt>> は install か keep のどちらかである。"
+"インストールが完了していないパッケージを探す。B<dpkg> はインストールを完了さ"
+"せるためにどうすればよいかを提案する。"
 
 # type: TP
-#: dpkg.1:492
+#: dpkg.1:196
 #, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--no-debsig>"
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg --get-selections> [I<package-name-pattern>...]"
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
-msgstr "パッケージの署名を確認しない。"
+#: dpkg.1:200
+msgid ""
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
+msgstr ""
+"パッケージ選択リストを標準出力に書き出す。パターンを指定しない場合、purge 状"
+"態のパッケージは表示されない。"
 
 # type: TP
-#: dpkg.1:497 dpkg.cfg.5:14
+#: dpkg.1:200
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+msgid "B<dpkg --set-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:500
-msgid "Configuration file with default options."
-msgstr "オプションのデフォルト値を記述する設定ファイル。"
+#: dpkg.1:206
+msgid ""
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
+msgstr ""
+"パッケージ選択リストを標準入力から読み込んで設定する。ファイルの形式は "
+"'E<lt>packageE<gt> E<lt>stateE<gt>' でなければならない。state は、install、"
+"hold、deinstall または purge のいずれかである。空行や、行が '#' で始まるコメ"
+"ント行を使用してもよい。"
 
 # type: TP
-#: dpkg.1:500
+#: dpkg.1:206
 #, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</var/log/dpkg.log>"
+msgid "B<dpkg --clear-selections>"
+msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+#: dpkg.1:211
+msgid ""
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
-"デフォルトのログファイル(I</etc/dpkg/dpkg.cfg>(5) と B<--log> オプションも参"
-"照)。"
+"essential でないパッケージすべての選択状態を deinstall にする。--set-"
+"selections に与えるリストにないパッケージを deinstall するため、--set-"
+"selections の直前に使うためのものである。"
+
+# type: TP
+#: dpkg.1:211
+#, no-wrap
+msgid "B<dpkg --yet-to-unpack>"
+msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
-#: dpkg.1:507
+#: dpkg.1:215
 msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
-"以下に示すファイルはデフォルトの値である。どのようにしてファイルの位置を変更"
-"するかについては、B<--admindir> オプションの項を参照すること。"
+"インストールするために選択されたが、何らかの理由でまだインストールされていな"
+"いパッケージを探す。"
 
 # type: TP
-#: dpkg.1:507
+#: dpkg.1:216
 #, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr "I</var/lib/dpkg/available>"
+msgid "B<dpkg --print-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg.1:510
-msgid "List of available packages."
-msgstr "使用できるパッケージの一覧。"
+#: dpkg.1:219
+msgid ""
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+msgstr "B<dpkg> のインストールするアーキテクチャ(例えば、\"i386\")を表示する。"
 
 # type: TP
-#: dpkg.1:510
+#: dpkg.1:219
 #, no-wrap
-msgid "I</var/lib/dpkg/status>"
-msgstr "I</var/lib/dpkg/status>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
-#: dpkg.1:516
+#: dpkg.1:230
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
-"使用できるパッケージの状態。このファイルは、パッケージに削除のマークがあるか"
-"どうか、インストール済みかどうか、などの情報が含まれている。くわしくは、B<"
-"パッケージに関する情報>の項を参照すること。"
+"二項演算子 I<op> で 2 つのバージョンを比較する。B<dpkg> の返り値は、指定した"
+"条件を満たすなら成功(0)、そうでなければ失敗(0 以外)となる。演算子は 2 つのグ"
+"ループに分かれる。これは I<ver1> か I<ver2> が欠けているときのふるまいの違い"
+"による。B<lt le eq ne ge gt> は、欠けているバージョンがどれよりも古いとみな"
+"す。B<lt-nl le-nl ge-nl gt-nl> は、欠けているバージョンがどれよりも新しいとみ"
+"なす。B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> は、control ファイ"
+"ルの文法との互換性のためだけに提供されている。"
+
+# type: TP
+#: dpkg.1:230
+#, no-wrap
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg.1:519
+#: dpkg.1:235
 msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
-"以下のファイルはバイナリパッケージを構成するファイルである。これらのファイル"
-"に関するくわしい情報は、B<deb>(5) を参照すること。"
+"ファイル記述子 B<E<lt>nE<gt>> から一連のコマンドをうけいれる。注意: 追加のオ"
+"プションはコマンドラインとこのファイル記述子を通じて指定でき、一回の実行を通"
+"じてそれらがリセットされることはない。"
 
 # type: TP
-#: dpkg.1:519
+#: dpkg.1:235
 #, no-wrap
-msgid "I<control>"
-msgstr "I<control>"
+msgid "B<dpkg --help>"
+msgstr "B<dpkg --help>"
+
+# type: Plain text
+#: dpkg.1:238
+msgid "Display a brief help message."
+msgstr "簡単なオプション一覧を表示する。"
 
 # type: TP
-#: dpkg.1:521
+#: dpkg.1:238
 #, no-wrap
-msgid "I<conffiles>"
-msgstr "I<conffiles>"
+msgid "B<dpkg --force-help>"
+msgstr "B<dpkg --force-help>"
+
+# type: Plain text
+#: dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
+msgstr "B<--force->I<thing> オプション一覧を表示する。"
 
 # type: TP
-#: dpkg.1:523
+#: dpkg.1:241
 #, no-wrap
-msgid "I<preinst>"
-msgstr "I<preinst>"
+msgid "B<dpkg -Dh >|B< --debug=help>"
+msgstr "B<dpkg -Dh >|B< --debug=help>"
+
+# type: Plain text
+#: dpkg.1:244
+msgid "Give help about debugging options."
+msgstr "デバッグ用オプション一覧を表示する。"
 
 # type: TP
-#: dpkg.1:525
+#: dpkg.1:244
 #, no-wrap
-msgid "I<postinst>"
-msgstr "I<postinst>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: Plain text
+#: dpkg.1:247
+msgid "Display B<dpkg> licence."
+msgstr "B<dpkg> のライセンスを表示する。"
 
 # type: TP
-#: dpkg.1:527
+#: dpkg.1:247
 #, no-wrap
-msgid "I<prerm>"
-msgstr "I<prerm>"
+msgid "B<dpkg --version>"
+msgstr "B<dpkg --version>"
+
+# type: Plain text
+#: dpkg.1:250
+msgid "Display B<dpkg> version information."
+msgstr "B<dpkg> のバージョン情報を表示する。"
 
 # type: TP
-#: dpkg.1:529
+#: dpkg.1:250
 #, no-wrap
-msgid "I<postrm>"
-msgstr "I<postrm>"
+msgid "B<dpkg-deb actions>"
+msgstr "B<dpkg-deb actions>"
 
-# type: SH
-#: dpkg.1:532
+# type: Plain text
+#: dpkg.1:253
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
+msgstr "以下のアクションのくわしい情報は B<dpkg-deb>(1) を参照すること。"
+
+# type: Plain text
+#: dpkg.1:273
 #, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr "環境変数"
+msgid ""
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
+msgstr ""
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    deb パッケージを構築する。\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    deb パッケージに含まれるファイル一覧を表示する。\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    パッケージから制御情報を取り出す。\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    パッケージに含まれるファイルをすべて取り出す。\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    パッケージの制御フィールドを表示する。\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Debian パッケージに含まれる tar ファイルを表示する。\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    パッケージに関する情報を表示する。\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    パッケージに含まれるファイルを展開し、ファイル名を表示する。\n"
 
 # type: TP
-#: dpkg.1:533
+#: dpkg.1:275
 #, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr "B<DPKG_NO_TSTP>"
+msgid "B<dpkg-query actions>"
+msgstr "B<dpkg-query actions>"
 
 # type: Plain text
-#: dpkg.1:537
-msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
-msgstr ""
-"任意の値で定義すると、シェルエスケープをしたときに B<dpkg> 自体を一時停止"
-"(suspend)するのではなく、新しいシェルを起動する。"
-
-# type: TP
-#: dpkg.1:537
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+#: dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgstr "以下のアクションの詳細は、B<dpkg-query>(1) を参照すること。"
 
 # type: Plain text
-#: dpkg.1:540
-msgid "The program B<dpkg> will execute when starting a new shell."
-msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
-
-# type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:291
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid ""
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
+msgstr ""
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    指定したパターンにマッチする名前のパッケージを表示する。\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    指定したパッケージの状態を報告する。\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    B<package> パッケージによってシステムにインストールされたファイルを表示する。\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    指定したファイルがどのパッケージからインストールされたか検索する。\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    I</var/lib/dpkg/available> にある I<package> の詳細情報を表示する。\n"
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:298
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
-"B<dpkg> が整形テキストを表示する時に参照するコラム数。現在は -l オプションで"
-"のみ参照されている。"
+"すべてのオプションは、コマンドラインや、B<dpkg> の設定ファイルである I</etc/"
+"dpkg/dpkg.cfg> で指定できる。設定ファイルの各行は、(先頭のダッシュが無いこと"
+"以外はコマンドラインオプションと全く同じ)オプションか、(行頭が B<#> の)コメン"
+"トである。"
 
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
+# type: TP
+#: dpkg.1:299
 #, no-wrap
-msgid "EXAMPLES"
-msgstr "例"
+msgid "B<--abort-after=>I<number>"
+msgstr "B<--abort-after=>I<number>"
 
 # type: Plain text
-#: dpkg.1:547
-msgid "To list packages related to the editor B<vi>(1):"
-msgstr "B<vi>(1) エディタに関連のあるパッケージの一覧を表示する。"
+#: dpkg.1:302
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+msgstr "B<dpkg> の処理を中断させるエラー数を変更する。デフォルトは 50 である。"
 
-# type: Plain text
-#: dpkg.1:549
+# type: TP
+#: dpkg.1:302
 #, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgid "B<-B>|B<--auto-deconfigure>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: dpkg.1:552
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
-msgstr "2 つのパッケージの I</var/lib/dpkg/available> にある項目を表示する。"
+#: dpkg.1:308
+msgid ""
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
+msgstr ""
+"パッケージを削除するとき、削除するパッケージに依存した別のパッケージがインス"
+"トールされている場合がある。このオプションを指定すると、削除するパッケージに"
+"依存しているパッケージの設定を取り消す。"
 
-# type: Plain text
-#: dpkg.1:554
+# type: TP
+#: dpkg.1:308
 #, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
-msgstr "     B<dpkg --print-avail elvis vim | less>\n"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
-msgstr "自分でパッケージのリストから検索する。"
+#: dpkg.1:314
+msgid ""
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
+msgstr ""
+"デバッグモードにする。 I<octal> は、以下の一覧から望む値をビットごとの論理和"
+"で組み合わせたものである(これらの値は、将来のリリースでは変更される可能性があ"
+"るので注意すること)。B<-Dh> または B<--debug=help> はこれらの値を表示する。"
 
 # type: Plain text
-#: dpkg.1:559
+#: dpkg.1:326
 #, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
-msgstr "     B<less /var/lib/dpkg/available>\n"
-
-# type: Plain text
-#: dpkg.1:562
-msgid "To remove an installed elvis package:"
-msgstr "elvis パッケージを削除する。"
+msgid ""
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
+msgstr ""
+" 数値   説明\n"
+"    1   一般的に役に立つ進行状況\n"
+"    2   管理スクリプトの呼び出し状況と状態\n"
+"   10   各ファイル処理の情報\n"
+"  100   各ファイル処理の大量の情報\n"
+"   20   各設定ファイルの情報\n"
+"  200   各設定ファイルの大量の情報\n"
+"   40   依存関係、競合関係\n"
+"  400   依存関係、競合関係の大量の情報\n"
+" 1000   dpkg/info ディレクトリなどに関する大量の情報\n"
+" 2000   正気でないほどの大量の情報\n"
 
-# type: Plain text
-#: dpkg.1:564
+# type: TP
+#: dpkg.1:326
 #, no-wrap
-msgid "     B<dpkg -r elvis>\n"
-msgstr "     B<dpkg -r elvis>\n"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 
 # type: Plain text
-#: dpkg.1:569
+#: dpkg.1:333
 msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
-"パッケージをインストールするには、まずそのパッケージをアーカイブや CDROM から"
-"探す必要がある。\"available\" ファイルによれば、vim パッケージは \"editors\" "
-"セクションに属している。"
+"指定した I<things> を強制実行する(force)、または拒否する(refuse) (B<no-"
+"force> と B<refuse> は同じ意味)。I<things> に、以下の項目をコンマで区切って指"
+"定する。B<--force-help> オプションでこれらの説明を表示する。(*)マークのあるも"
+"のは、デフォルトで強制実行される。"
 
 # type: Plain text
-#: dpkg.1:572
-#, no-wrap
+#: dpkg.1:337
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
-
-# type: Plain text
-#: dpkg.1:575
-msgid "To make a local copy of the package selection states:"
-msgstr "パッケージ選択状況のコピーを作成する。"
+"I<警告: これらのオプションは、おもに熟練したユーザだけが使うことを意図したも"
+"のである。影響を完全に理解しないままにこれらを使うと、システム全体を壊してし"
+"まうかもしれない。>"
 
 # type: Plain text
-#: dpkg.1:577
-#, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "     B<dpkg --get-selections E<gt>myselections>\n"
+#: dpkg.1:340
+msgid "B<all>: Turns on (or off) all force options."
+msgstr "B<all>: 全ての強制オプションを指定する(または打ち消す)。"
 
 # type: Plain text
-#: dpkg.1:581
+#: dpkg.1:343
 msgid ""
-"You might transfer this file to another computer, and install it there with:"
-msgstr "このファイルをほかのコンピュータに転送して、インストールする。"
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
+msgstr ""
+"B<downgrade>(*): より新しいバージョンがすでにインストールされていたとしても、"
+"指定したパッケージをインストールする。"
 
 # type: Plain text
-#: dpkg.1:584
-#, no-wrap
+#: dpkg.1:350
 msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
 msgstr ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
+"I<警告: 現在の dpkg は、ダウングレード時にいかなる依存関係のチェックもしな"
+"い。そのため、ダウングレードすることで、ほかのパッケージの依存関係を警告なし"
+"に壊すかもしれない。これは深刻な副作用となる可能性があり、主要なシステム構成"
+"をダウングレードすることでシステムを壊してしまうこともありうる。注意して使用"
+"すること。>"
 
 # type: Plain text
-#: dpkg.1:590
+#: dpkg.1:354
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
 msgstr ""
-"これは実際にはインストールも削除もしないことに注意。これは単に要求している"
-"パッケージの選択状態を設定するだけである。実際に要求しているパッケージをダウ"
-"ンロードしインストールするには別のアプリケーションが必要である。例えば、"
-"B<dselect> を起動して、\"導入(Install)\" を選べばよい。"
+"B<configure-any>: 指定したパッケージに依存していて、すでに展開されているが、"
+"まだ設定されていないパッケージも一緒に設定をする。"
 
 # type: Plain text
-#: dpkg.1:593
-msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+#: dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
-"通常、パッケージの選択状態を変更するには B<dselect>(1) を使用するほうが便利で"
-"ある。"
-
-# type: SH
-#: dpkg.1:595
-#, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
-msgstr "機能の追加"
+"B<hold>: たとえ \"hold\" とマークされていても、そのパッケージの処理をする。"
 
 # type: Plain text
-#: dpkg.1:598
+#: dpkg.1:362
 msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
-"I<apt>、I<aptitude>、I<debsums> パッケージをインストールすると便利な機能を追"
-"加できる。"
+"B<remove-reinstreq>: 壊れていて、再インストールが必要だとマークされていたとし"
+"ても、パッケージを削除する。これにより、例えば、パッケージの一部が B<dpkg> に"
+"管理されないで残るなどの問題がおこるかもしれない。"
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:367
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
 msgstr ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), B<dpkg-reconfigure>(8)."
+"B<remove-essential>: essential とされるパッケージであっても削除する。"
+"essential パッケージには、たいてい最も基本的な UNIX コマンドが含まれる。これ"
+"らのパッケージを削除すると、システム全体が動作しなくなることもあるので、注意"
+"して削除すること。"
 
 # type: Plain text
-#: dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
-msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
-
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
-#, no-wrap
-msgid "AUTHORS"
-msgstr "著者"
+#: dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
+msgstr "B<depends>: すべての依存問題を警告に変える。"
 
 # type: Plain text
-#: dpkg.1:616
-#, no-wrap
+#: dpkg.1:373
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
-msgstr ""
-"B<dpkg> に貢献した人のリストは B</usr/share/doc/dpkg/THANKS> に\n"
-"挙げてある。\n"
-
-# type: TP
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-architecture"
-msgstr "B<dpkg --print-architecture>"
-
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, no-wrap
-msgid "2006-06-17"
-msgstr "2006-06-17"
+"B<depends-version>: Don't care about versions when checking dependencies."
+msgstr "B<depends-version>: 依存関係の確認をするとき、バージョンを無視する。"
 
 # type: Plain text
-#: dpkg-architecture.1:4
+#: dpkg.1:377
 msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
 msgstr ""
+"B<conflicts>: 他のパッケージと競合してもインストールする。たいていはいくつか"
+"ファイルを上書きすることになるため、危険である。"
 
 # type: Plain text
-#: dpkg-architecture.1:9
-#, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: dpkg.1:382
+msgid ""
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
+msgstr ""
+"B<confmiss>: 常に、欠けている設定ファイルをインストールする。このオプション"
+"は、変更(ファイルを削除したこと)を保存しないため、危険である。"
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:387
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
+"B<confnew>: 設定ファイルが変更されていた場合、問い合わせなしに新しいバージョ"
+"ンの設定ファイルをインストールする。ただし、B<--force-confdef> を同時に指定し"
+"た場合は、デフォルトの動作が優先される。"
 
 # type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg.1:392
 msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
+"B<confold>: 設定ファイルが変更されていた場合、問い合わせなしに古いバージョン"
+"の設定ファイルを保持する。ただし、B<--force-confdef> を同時に指定した場合は、"
+"デフォルトの動作が優先される。"
 
 # type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg.1:398
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
 msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:28
-#, fuzzy, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<-a, --no-architecture>"
+"B<confdef>: 設定ファイルが変更されていた場合、常にデフォルトの動作をする。デ"
+"フォルトの動作がなく、B<--force-confnew> と B<--force-confold> のどちらも同時"
+"に指定していない場合、ユーザに尋ねるために中断する。指定している場合は、指定"
+"されたオプションによって最終的な動作が決まる。"
 
 # type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
+"B<overwrite>: あるパッケージで提供されているファイルを、インストールするパッ"
+"ケージのファイルで上書きする。"
 
-# type: TP
-#: dpkg-architecture.1:31
-#, no-wrap
-msgid "B<-t>I<gnu-system-type>"
+# type: Plain text
+#: dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
+"B<overwrite-dir>: あるパッケージで提供されているディレクトリを、インストール"
+"するパッケージのファイルで上書きする。"
 
 # type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
+#: dpkg.1:407
+msgid ""
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
+"B<overwrite-diverted>: 退避(divert した)版のファイルを非退避(divert していな"
+"い)版のファイルで上書きする。"
 
-# type: TP
-#: dpkg-architecture.1:34
-#, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "B<-B>"
+# type: Plain text
+#: dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
+msgstr ""
+"B<architecture>: パッケージが間違ったアーキテクチャ用であっても処理をする。"
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:413
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:43
-#, fuzzy, no-wrap
-msgid "B<-l>"
-msgstr "B<-B>"
+"B<bad-path>: 重要なプログラムが B<PATH> に含まれていなくても実行する。問題が"
+"起きる可能性は高い。"
 
 # type: Plain text
-#: dpkg-architecture.1:47
-msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
+#: dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
+"B<not-root>: root でないときでも、それをインストール(または削除)しようと試み"
+"る。"
+
+# type: Plain text
+#: dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+msgstr "B<bad-verify>: 信頼性チェックに失敗してもインストールする。"
 
 # type: TP
-#: dpkg-architecture.1:47
-#, fuzzy, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr "B<-a, --no-architecture>"
+#: dpkg.1:420
+#, no-wrap
+msgid "B<--ignore-depends>=I<package>,..."
+msgstr "B<--ignore-depends>=I<package>,..."
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg.1:424
 msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
+"指定したパッケージに関する依存関係の確認を無視する(実際は、依存関係を確認し、"
+"競合に対して警告メッセージを出して、アクションを実行する)。"
 
 # type: TP
-#: dpkg-architecture.1:53
-#, fuzzy, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
-msgstr "B<-a, --no-architecture>"
+#: dpkg.1:424
+#, no-wrap
+msgid "B<--new> | B<--old>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg.1:428
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
+"パッケージのフォーマットが新しいか古いかを指定する。これは B<dpkg-deb>(1) の"
+"オプションである。"
 
 # type: TP
-#: dpkg-architecture.1:59
-#, fuzzy, no-wrap
-msgid "B<-q>I<variable-name>"
-msgstr "B<[--] >I<filename>"
+#: dpkg.1:428 dpkg-deb.1:211
+#, no-wrap
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
+#: dpkg.1:432
+msgid ""
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
 msgstr ""
+"パッケージを構築するときに、制御ファイルの内容も読まず、確認もしない。これは "
+"B<dpkg-deb>(1) のオプションである。"
 
 # type: TP
-#: dpkg-architecture.1:62
-#, fuzzy, no-wrap
-msgid "B<-s>"
-msgstr "B<-B>"
+#: dpkg.1:432
+#, no-wrap
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:437
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
 msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:66
-#, fuzzy, no-wrap
-msgid "B<-u>"
-msgstr "B<-B>"
+"期待される動作をすべて実行するが、どのような変更も書き込まない。これは、実際"
+"にはシステムに何の変更も加えずに、指定したアクションで何がおこるのかを確認す"
+"るためのものである。"
 
 # type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
+#: dpkg.1:442
+msgid ""
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
 msgstr ""
+"オプション B<--no-act> は、必ずアクションパラメータより前に与えること。さもな"
+"くば、望ましくない結果が起きる可能性がある(例えば、システムに何も変更を加える"
+"つもりがないのに、 B<dpkg --purge foo --no-act> を実行すると、最初にパッケー"
+"ジ foo を本当に purge し、次にパッケージ --no-act を purge しようとする、とい"
+"うことになる)。"
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg.1:442
 #, no-wrap
-msgid "B<-c>I< command>"
-msgstr ""
+msgid "B<-R> | B<--recursive>"
+msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg.1:448
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
+"指定したディレクトリを再帰的に検索し、みつけた B<*.deb> というパターンにマッ"
+"チするファイルをすべて扱う。これは、B<-i>, B<-A>, B<--install>, B<--unpack> "
+"そして B<--avail> アクションとともに使うことができる。"
 
 # type: TP
-#: dpkg-architecture.1:73
-#, fuzzy, no-wrap
-msgid "B<-L>"
-msgstr "B<-B>"
+#: dpkg.1:448
+#, no-wrap
+msgid "B<-G>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
+#: dpkg.1:452
+msgid ""
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
+"インストール済みのパッケージのほうがバージョンが新しければ、インストールしな"
+"い。これは B<--refuse-downgrade> の別名である。"
 
-# type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
-msgstr "利用方法を表示する。"
+# type: TP
+#: dpkg.1:452
+#, no-wrap
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 
 # type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
+#: dpkg.1:463
+msgid ""
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
+"デフォルトのディレクトリを変更する。B<admindir> はインストール済みのパッケー"
+"ジやインストールされていないパッケージの状態に関する情報などを提供する、多数"
+"のファイルが格納されているディレクトリで、デフォルトは I</var/lib/dpkg> であ"
+"る。B<instdir> はパッケージをインストールするときに参照されるディレクトリで、"
+"デフォルトは I</> である。また、B<instdir> は、パッケージのインストールスクリ"
+"プトが実行される前に B<chroot>(2) するディレクトリのパスである。つまり、スク"
+"リプトは B<instdir> をルートディレクトリとみなす。B<root> を変更すると、"
+"B<instdir> を I<dir> に、B<admindir> を I<dir>B</var/lib/dpkg> に変更する。"
 
-# type: SH
-#: dpkg-architecture.1:83
-#, fuzzy, no-wrap
-msgid "TERMS"
-msgstr "注意"
-
-# type: IP
-#: dpkg-architecture.1:84
+# type: TP
+#: dpkg.1:463
 #, no-wrap
-msgid "build machine"
-msgstr ""
+msgid "B<-O> | B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
-#: dpkg-architecture.1:86
-msgid "The machine the package is built on."
+#: dpkg.1:469
+msgid ""
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
+"インストール(または削除)作業をするように選択したパッケージのみを処理する。実"
+"際の指定は、B<dselect> や B<dpkg> を使って行なう。例えば、あるパッケージが削"
+"除されるのは、そのパッケージが削除されるよう選択されているということである。"
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:469
 #, no-wrap
-msgid "host machine"
-msgstr ""
+msgid "B<-E> | B<--skip-same-version>"
+msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
+#: dpkg.1:473
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
 msgstr ""
+"すでに同じバージョンのパッケージがインストールされていたら、インストールしな"
+"い。"
 
-# type: TH
-#: dpkg-architecture.1:88
-#, fuzzy, no-wrap
-msgid "Debian architecture"
-msgstr "Debian Project"
+# type: TP
+#: dpkg.1:473
+#, no-wrap
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:480
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
+"ファイル記述子 I<E<lt>nE<gt>> にパッケージ状態の情報を送る。これは複数与える"
+"ことができる。状態の情報は `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>' の形"
+"式である。エラーは `status: E<lt>pkgE<gt>: error: extend-error-message' とし"
+"て報告される。設定ファイルの衝突は `status: conffile-prompt: conffile : "
+"'current-conffile' 'new-conffile' useredited distedited' として報告される。"
 
-# type: IP
-#: dpkg-architecture.1:91
+# type: TP
+#: dpkg.1:480
 #, no-wrap
-msgid "architecture wildcard"
-msgstr ""
+msgid "B<--log=>I<filename>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg.1:492
 msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
+"状態の変更やアクションの記録を、デフォルトの I</var/log/dpkg.log> から "
+"I<filename> に変更する。このオプションを複数回指定した場合は、最後のファイル"
+"名が使われる。ログメッセージは次の形式である。`YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' は状態の変更。"
+"`YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' はアクションで、"
+"I<E<lt>actionE<gt>> は install、upgrade、remove、purge のいずれか。`YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' は設定ファイルの"
+"変更で、I<E<lt>decisionE<gt>> は install か keep のどちらかである。"
 
-# type: IP
-#: dpkg-architecture.1:95
+# type: TP
+#: dpkg.1:492
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr ""
+msgid "B<--no-debsig>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-architecture.1:99
-msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
-msgstr ""
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
+msgstr "パッケージの署名を確認しない。"
 
-# type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
+# type: TP
+#: dpkg.1:497 dpkg.cfg.5:14
+#, no-wrap
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
+#: dpkg.1:500
+msgid "Configuration file with default options."
+msgstr "オプションのデフォルト値を記述する設定ファイル。"
+
+# type: TP
+#: dpkg.1:500
+#, no-wrap
+msgid "I</var/log/dpkg.log>"
+msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
+"デフォルトのログファイル(I</etc/dpkg/dpkg.cfg>(5) と B<--log> オプションも参"
+"照)。"
 
 # type: Plain text
-#: dpkg-architecture.1:110
+#: dpkg.1:507
 msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
+"以下に示すファイルはデフォルトの値である。どのようにしてファイルの位置を変更"
+"するかについては、B<--admindir> オプションの項を参照すること。"
 
-# type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr ""
+# type: TP
+#: dpkg.1:507
+#, no-wrap
+msgid "I</var/lib/dpkg/available>"
+msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr ""
+#: dpkg.1:510
+msgid "List of available packages."
+msgstr "使用できるパッケージの一覧。"
+
+# type: TP
+#: dpkg.1:510
+#, no-wrap
+msgid "I</var/lib/dpkg/status>"
+msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-architecture.1:117
+#: dpkg.1:516
 msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
 msgstr ""
+"使用できるパッケージの状態。このファイルは、パッケージに削除のマークがあるか"
+"どうか、インストール済みかどうか、などの情報が含まれている。くわしくは、B<"
+"パッケージに関する情報>の項を参照すること。"
 
 # type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
+#: dpkg.1:519
+msgid ""
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
+"以下のファイルはバイナリパッケージを構成するファイルである。これらのファイル"
+"に関するくわしい情報は、B<deb>(5) を参照すること。"
 
-# type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
+# type: TP
+#: dpkg.1:519
+#, no-wrap
+msgid "I<control>"
+msgstr "I<control>"
 
-# type: SH
-#: dpkg-architecture.1:122
-#, fuzzy, no-wrap
-msgid "VARIABLES"
-msgstr "環境変数"
+# type: TP
+#: dpkg.1:521
+#, no-wrap
+msgid "I<conffiles>"
+msgstr "I<conffiles>"
 
-# type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr ""
+# type: TP
+#: dpkg.1:523
+#, no-wrap
+msgid "I<preinst>"
+msgstr "I<preinst>"
 
-# type: IP
-#: dpkg-architecture.1:124
+# type: TP
+#: dpkg.1:525
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
-msgstr ""
+msgid "I<postinst>"
+msgstr "I<postinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
-msgstr ""
+# type: TP
+#: dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
+msgstr "I<prerm>"
 
-# type: IP
-#: dpkg-architecture.1:126
+# type: TP
+#: dpkg.1:529
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
-msgstr ""
+msgid "I<postrm>"
+msgstr "I<postrm>"
 
-# type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr ""
+# type: SH
+#: dpkg.1:532
+#, no-wrap
+msgid "ENVIRONMENT VARIABLES"
+msgstr "環境変数"
 
-# type: IP
-#: dpkg-architecture.1:128
+# type: TP
+#: dpkg.1:533
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
-msgstr ""
+msgid "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
+#: dpkg.1:537
+msgid ""
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
+"任意の値で定義すると、シェルエスケープをしたときに B<dpkg> 自体を一時停止"
+"(suspend)するのではなく、新しいシェルを起動する。"
 
-# type: IP
-#: dpkg-architecture.1:130
+# type: TP
+#: dpkg.1:537
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
-msgstr ""
+#: dpkg.1:540
+msgid "The program B<dpkg> will execute when starting a new shell."
+msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
-# type: IP
-#: dpkg-architecture.1:132
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr ""
+msgid "B<COLUMNS>"
+msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+#: dpkg.1:544
+msgid ""
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
+"B<dpkg> が整形テキストを表示する時に参照するコラム数。現在は -l オプションで"
+"のみ参照されている。"
 
-# type: IP
-#: dpkg-architecture.1:134
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
-msgstr ""
+msgid "EXAMPLES"
+msgstr "例"
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
-msgstr ""
+#: dpkg.1:547
+msgid "To list packages related to the editor B<vi>(1):"
+msgstr "B<vi>(1) エディタに関連のあるパッケージの一覧を表示する。"
 
-# type: IP
-#: dpkg-architecture.1:136
+# type: Plain text
+#: dpkg.1:549
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
-msgstr ""
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgstr "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
-msgstr ""
+#: dpkg.1:552
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+msgstr "2 つのパッケージの I</var/lib/dpkg/available> にある項目を表示する。"
 
-# type: IP
-#: dpkg-architecture.1:138
+# type: Plain text
+#: dpkg.1:554
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr ""
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
-msgstr ""
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
+msgstr "自分でパッケージのリストから検索する。"
 
-# type: IP
-#: dpkg-architecture.1:140
+# type: Plain text
+#: dpkg.1:559
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
-msgstr ""
+msgid "     B<less /var/lib/dpkg/available>\n"
+msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
-msgstr ""
+#: dpkg.1:562
+msgid "To remove an installed elvis package:"
+msgstr "elvis パッケージを削除する。"
 
-# type: IP
-#: dpkg-architecture.1:142
+# type: Plain text
+#: dpkg.1:564
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
-msgstr ""
+msgid "     B<dpkg -r elvis>\n"
+msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: dpkg.1:569
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
+"パッケージをインストールするには、まずそのパッケージをアーカイブや CDROM から"
+"探す必要がある。\"available\" ファイルによれば、vim パッケージは \"editors\" "
+"セクションに属している。"
 
-# type: IP
-#: dpkg-architecture.1:144
+# type: Plain text
+#: dpkg.1:572
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgid ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 msgstr ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
+#: dpkg.1:575
+msgid "To make a local copy of the package selection states:"
+msgstr "パッケージ選択状況のコピーを作成する。"
 
-# type: IP
-#: dpkg-architecture.1:146
+# type: Plain text
+#: dpkg.1:577
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr ""
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "     B<dpkg --get-selections E<gt>myselections>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
+#: dpkg.1:581
+msgid ""
+"You might transfer this file to another computer, and install it there with:"
+msgstr "このファイルをほかのコンピュータに転送して、インストールする。"
 
-# type: SH
-#: dpkg-architecture.1:149
+# type: Plain text
+#: dpkg.1:584
 #, no-wrap
-msgid "DEBIAN/RULES"
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 msgstr ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg.1:590
 msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
+"これは実際にはインストールも削除もしないことに注意。これは単に要求している"
+"パッケージの選択状態を設定するだけである。実際に要求しているパッケージをダウ"
+"ンロードしインストールするには別のアプリケーションが必要である。例えば、"
+"B<dselect> を起動して、\"導入(Install)\" を選べばよい。"
 
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
+#: dpkg.1:593
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
+"通常、パッケージの選択状態を変更するには B<dselect>(1) を使用するほうが便利で"
+"ある。"
 
-# type: Plain text
-#: dpkg-architecture.1:164
+# type: SH
+#: dpkg.1:595
 #, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
-msgstr ""
+msgid "ADDITIONAL FUNCTIONALITY"
+msgstr "機能の追加"
 
 # type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
+#: dpkg.1:598
+msgid ""
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
+"I<apt>、I<aptitude>、I<debsums> パッケージをインストールすると便利な機能を追"
+"加できる。"
 
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
+#: dpkg.1:608
 msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: dpkg-architecture.1:173
+#: dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
+msgstr "B<--no-act> の提供する情報はたいていの場合、不充分である。"
+
+# type: SH
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-msgstr ""
+msgid "AUTHORS"
+msgstr "著者"
 
 # type: Plain text
-#: dpkg-architecture.1:183
+#: dpkg.1:616
 #, no-wrap
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
 msgstr ""
+"B<dpkg> に貢献した人のリストは B</usr/share/doc/dpkg/THANKS> に\n"
+"挙げてある。\n"
 
-# type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-architecture"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+#: dpkg-architecture.1:4
+msgid ""
+"dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:193
-#, no-wrap
+#: dpkg-architecture.1:9
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+# type: Plain text
+#: dpkg-architecture.1:14
 msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:197
+#: dpkg-architecture.1:17
 msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:202
+#: dpkg-architecture.1:26
 msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
 # type: SH
-#: dpkg-architecture.1:203
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
-msgstr ""
+msgid "COMMANDS"
+msgstr "コマンド"
 
-# type: Plain text
-#: dpkg-architecture.1:209
-msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:28
+#, fuzzy, no-wrap
+msgid "B<-l>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-architecture.1:214
+#: dpkg-architecture.1:32
 msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:218
-#, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:32
+#, fuzzy, no-wrap
+msgid "B<-e>I<debian-architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
+#: dpkg-architecture.1:38
 msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:38
+#, fuzzy, no-wrap
+msgid "B<-i>I<architecture-wildcard>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:238
+#: dpkg-architecture.1:44
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:44
+#, fuzzy, no-wrap
+msgid "B<-q>I<variable-name>"
+msgstr "B<[--] >I<filename>"
+
 # type: Plain text
-#: dpkg-architecture.1:248
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:47
+#, fuzzy, no-wrap
+msgid "B<-s>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:253
-#, no-wrap
+#: dpkg-architecture.1:51
 msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:51
+#, fuzzy, no-wrap
+msgid "B<-u>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:264
-msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+# type: TP
+#: dpkg-architecture.1:54
+#, no-wrap
+msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:267
+#: dpkg-architecture.1:58
 msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:271
-#, fuzzy
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+# type: TP
+#: dpkg-architecture.1:58
+#, fuzzy, no-wrap
+msgid "B<-L>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-architecture.1:276
-msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
+# type: TP
+#: dpkg-architecture.1:69
 #, fuzzy, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg"
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr ""
+
+# type: TP
+#: dpkg-architecture.1:72
+#, no-wrap
+msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:11
-msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
 msgstr ""
 
 # type: TP
-#: dpkg.cfg.5:16
-#, fuzzy
-msgid "I<~/.dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg.cfg.5:20
-#, fuzzy
+#: dpkg-architecture.1:82
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
-"B<dpkg> に貢献した人のリストは B</usr/share/doc/dpkg/THANKS> に\n"
-"挙げてある。\n"
 
-# type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
-msgstr "B<dpkg>(1)."
+# type: SH
+#: dpkg-architecture.1:83
+#, fuzzy, no-wrap
+msgid "TERMS"
+msgstr "注意"
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:1
+# type: IP
+#: dpkg-architecture.1:84
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
-msgstr "dpkg-checkbuilddeps"
+msgid "build machine"
+msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
+# type: Plain text
+#: dpkg-architecture.1:86
+msgid "The machine the package is built on."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:86
 #, no-wrap
-msgid "2006-05-23"
-msgstr "2006-05-23"
+msgid "host machine"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
-msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
+msgstr ""
+
+# type: TH
+#: dpkg-architecture.1:88
+#, fuzzy, no-wrap
+msgid "Debian architecture"
+msgstr "Debian Project"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> B<-B> [I<コントロールファイル>]"
+#: dpkg-architecture.1:91
+msgid ""
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:91
+#, no-wrap
+msgid "architecture wildcard"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
+#: dpkg-architecture.1:95
 msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
 msgstr ""
-"このプログラムはコントロールファイル中にリストされているビルド依存とビルド衝"
-"突に関して、システムにインストールされているパッケージをチェックする。もし、"
-"足りないものや衝突している物があるなら、それらを表示して 0 以外の返り値を返し"
-"て終了する。"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
+#: dpkg-architecture.1:99
 msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
-"デフォルトでは、I<debian/control> が読まれるが、別のコントロールファイル名を"
-"コマンドラインに指定することもできる。"
 
-# type: TP
-#: dpkg-checkbuilddeps.1:17
-#, no-wrap
-msgid "B<-B>"
-msgstr "B<-B>"
+# type: SH
+#: dpkg-architecture.1:100
+#, fuzzy, no-wrap
+msgid "VARIABLES"
+msgstr "環境変数"
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
-msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
-"I<Build-Depends-Indep> 行を無視する。アーキテクチャに非依存なパッケージがビル"
-"ドされない時に利用する。"
 
-# type: TP
-#: dpkg-checkbuilddeps.1:21
+# type: IP
+#: dpkg-architecture.1:102
 #, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
-msgstr "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
+msgstr ""
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: IP
+#: dpkg-architecture.1:104
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:joeyh@debian.org"
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
+msgstr ""
 
-# type: TH
-#: dpkg-deb.1:1
+# type: IP
+#: dpkg-architecture.1:106
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr "dpkg-deb - Debian パッケージアーカイブ (.deb) 操作ツール"
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
+# type: IP
+#: dpkg-architecture.1:108
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
-"B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
 
-# type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
+# type: IP
+#: dpkg-architecture.1:114
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<archive>"
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:39
-msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
-msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
+# type: IP
+#: dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
-"パッケージをシステムにインストールするときや削除するときには B<dpkg> を使うこ"
-"と。"
 
 # type: Plain text
-#: dpkg-deb.1:53
-msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
 msgstr ""
-"また、 B<dpkg> に対して B<dpkg-deb> のオプションを指定することで、 B<dpkg> を"
-"通して B<dpkg-deb> を呼び出すことができる。 B<dpkg> は、オプションが B<dpkg-"
-"deb> のオプションであると判断すると、 B<dpkg-deb> を起動する。"
 
-# type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
+# type: IP
+#: dpkg-architecture.1:120
 #, no-wrap
-msgid "ACTION OPTIONS"
-msgstr "アクション・オプション"
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:54
+# type: Plain text
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:122
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr "B<--build>, B<-b>"
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
-msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
-"I<directory> に格納されているファイルシステム木から debian アーカイブを作成す"
-"る。 I<directory> には、control ファイルなどの制御情報ファイルのある "
-"B<DEBIAN> サブディレクトリが必ず存在しなければならない。 DEBIAN ディレクトリ"
-"はバイナリパッケージのファイルシステム・アーカイブにはI<含まれない>。そのかわ"
-"り、DEBIAN ディレクトリ以下にあったファイルはバイナリパッケージ制御情報エリア"
-"に置かれる。"
 
-# type: Plain text
-#: dpkg-deb.1:72
-msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+# type: IP
+#: dpkg-architecture.1:124
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
-"圧縮レベルを指定する場合は、 B<-z#> オプションを追加する。 B<dpkg-deb> は、こ"
-"のオプションを gzip に渡す。"
 
 # type: Plain text
-#: dpkg-deb.1:84
-msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
+
+# type: SH
+#: dpkg-architecture.1:127
+#, no-wrap
+msgid "DEBIAN/RULES"
 msgstr ""
-"B<--nocheck> を指定しないかぎり、 B<dpkg-deb> は B<DEBIAN/control> を読み、解"
-"析する。 dpkg-deb は、文法エラーやその他の問題のチェックをし、そして、構築中"
-"のバイナリパッケージ名を表示する。 B<dpkg-deb> はまた、 B<DEBIAN> 管理情報"
-"ディレクトリにある、管理スクリプトやその他のファイルのパーミッションをチェッ"
-"クする。"
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:135
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
-"もし、 I<archive> を指定しない場合、 B<dpkg-deb> はパッケージを "
-"I<directory>B<.deb> という名前で作成する。"
 
 # type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr "もし、すでにアーカイブが作成されて存在している場合、上書きする。"
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
-"2 番目の引き数がディレクトリの場合、 B<dpkg-deb> は "
-"I<package>B<_>I<version>B<_>I<arch>B<.deb> または I<package>B<_>I<version>B<."
-"deb> (パッケージ制御ファイルに B<Architecture> フィールドがない場合)という"
-"ファイルを作成する。アーカイブの代わりにディレクトリを指定するときには、 B<--"
-"nocheck> オプションは使用してはいけない( B<dpkg-deb> は、使用するファイル名を"
-"調べるために、パッケージ制御ファイルを読んで解析する必要があるから)。"
-
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--info>, B<-I>"
-
-# type: Plain text
-#: dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
-msgstr "バイナリパッケージアーカイブの情報を表示する。"
 
 # type: Plain text
-#: dpkg-deb.1:117
-msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+#: dpkg-architecture.1:145
+msgid "please use the following:"
 msgstr ""
-"もし I<control-file-name> が指定されていない場合、制御ファイル一覧と、パッ"
-"ケージの中身の要約を表示する。"
 
 # type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-architecture.1:149
+#, no-wrap
 msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
-"もし I<control-file-name> を指定した場合、 B<dpkg-deb> は指定した順でファイル"
-"名を表示する。もし指定したファイルのどれかが存在しなければ、存在しなかった"
-"ファイルに対してそれぞれエラーメッセージを表示し、そして終了ステータス 2 で終"
-"了する。"
 
-# type: TP
-#: dpkg-deb.1:125
+# type: Plain text
+#: dpkg-architecture.1:151
 #, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--show>, B<-W>"
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:132
+#: dpkg-architecture.1:161
+#, no-wrap
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"バイナリパッケージアーカイブの情報を B<--showformat> の引き数で指定した形式で"
-"表示する。デフォルトの出力形式は、一行ごとにパッケージ名とバージョンをタブで"
-"区切ったものである。"
 
-# type: TP
-#: dpkg-deb.1:132
-#, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--field>, B<-f>"
+# type: Plain text
+#: dpkg-architecture.1:164
+msgid "please use:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
-msgstr "バイナリパッケージアーカイブから制御ファイル情報を取り出す。"
+#: dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-architecture.1:171
+#, no-wrap
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"B<control-file-field> が指定されていない場合、制御ファイルすべてを表示する。"
 
 # type: Plain text
-#: dpkg-deb.1:148
+#: dpkg-architecture.1:175
 msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
-"もし何か指定されている場合、 B<dpkg-deb> はその内容を制御ファイルに現われる順"
-"序で表示する。もし、複数の B<control-file-field> が指定された場合、 B<dpkg-"
-"deb> は、それぞれの情報の前にフィールド名(そしてコロンと空白)を表示する。"
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
-msgstr "指定したフィールドがみつからない場合でもエラーを報告しない。"
+#: dpkg-architecture.1:180
+msgid ""
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
+msgstr ""
 
-# type: TP
-#: dpkg-deb.1:150
+# type: SH
+#: dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--contents>, B<-c>"
+msgid "BACKWARD COMPATIBILITY"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-architecture.1:187
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
-"パッケージアーカイブに含まれるファイルシステム木の内容の一覧を表示する。現在"
-"のバージョンは、 B<tar> の冗長出力(-v オプション)をそのまま表示する。"
-
-# type: TP
-#: dpkg-deb.1:156
-#, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
 
 # type: Plain text
-#: dpkg-deb.1:160
+#: dpkg-architecture.1:192
 msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
-"パッケージアーカイブからファイルシステム木を、指定したディレクトリに展開す"
-"る。"
 
 # type: Plain text
-#: dpkg-deb.1:165
+#: dpkg-architecture.1:196
+#, no-wrap
 msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 msgstr ""
-"B<--vextract> (B<-X>) は現在展開中のファイルを表示する。 B<--extract> (B<-"
-"x>) はエラーが発生しない限り何も表示しない。"
 
 # type: Plain text
-#: dpkg-deb.1:171
+#: dpkg-architecture.1:210
+#, no-wrap
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
-"ルートディレクトリでパッケージを展開することは正しいインストールにはI<ならな"
-"い>ことに注意すること! パッケージのインストールには B<dpkg> を使うべきであ"
-"る。"
 
 # type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
-"I<directory> (親やそれより上のディレクトリは含まない)は必要があれば作成され"
-"る。"
-
-# type: TP
-#: dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg-architecture.1:216
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
-"バイナリパッケージからファイルシステム木を展開し、標準出力に B<tar> 形式で出"
-"力する。 B<tar> と共に使用することで、特定のファイルをパッケージアーカイブか"
-"ら取り出すことができる。"
-
-# type: TP
-#: dpkg-deb.1:182
-#, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "B<--control>, B<-e>"
 
 # type: Plain text
-#: dpkg-deb.1:186
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
-"パッケージアーカイブから制御情報ファイルを指定したディレクトリに展開する。"
 
 # type: Plain text
-#: dpkg-deb.1:190
+#: dpkg-architecture.1:231
+#, no-wrap
 msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 msgstr ""
-"もしディレクトリが指定されない場合、カレントディレクトリにある B<DEBIAN> サブ"
-"ディレクトリに展開する。"
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-architecture.1:235
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
-"指定したディレクトリ(親やそれより上のディレクトリは含まない)は必要があれば作"
-"成される。"
-
-# type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#: dpkg-architecture.1:242
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
-"B<dpkg-deb> の使用方法、つまりすべてのオプションとその使い方の要約を表示す"
-"る。"
 
 # type: Plain text
-#: dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "B<dpkg-deb> のバージョン番号を表示する。"
-
-# type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
-#, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+#: dpkg-architecture.1:245
+msgid ""
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-architecture.1:249
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
-"B<dpkg-deb> の著作権と無保証に関する情報を表示する(アメリカ式の綴りである "
-"B<--license> もサポートしている)。"
-
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
-#, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "その他のオプション"
 
-# type: TP
-#: dpkg-deb.1:211
-#, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr "B<--showformat=>I<format>"
+# type: Plain text
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
-msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
 msgstr ""
-"このオプションは、B<--show> が生成する出力の書式を指定するものである。書式は"
-"文字列で、パッケージごとに出力される。"
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-architecture.1:256
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
-"文字列は \"${I<field-name>}\" 形式であらゆる status フィールドを参照すること"
-"ができる。有効なフィールドの一覧は、そのパッケージに B<-I> を使用することで簡"
-"単に生成できる。書式オプションの完全な解説(エスケープシーケンスやフィールドで"
-"のタブの使い方を含む)は、B<dpkg-query>(1)の B<--showformat> オプションの解説"
-"を参照すること。"
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
-"このフィールドのデフォルトのフォーマット文字列は \"${Package}\\et${Version}"
-"\\en\" である。"
 
-# type: TP
-#: dpkg-deb.1:227
-#, no-wrap
-msgid "B<--new>"
-msgstr "B<--new>"
+# type: Plain text
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:232
+#: dpkg-architecture.1:263
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
-"B<dpkg-deb> に `新しい' 形式のアーカイブで構築させる。これはデフォルトの動作"
-"である。"
-
-# type: TP
-#: dpkg-deb.1:232
-#, no-wrap
-msgid "B<--old>"
-msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
-"B<dpkg-deb> に `古い' 形式のアーカイブを構築させる。この古いアーカイブ形式"
-"は、新しい形式よりも非 Debian ツールで処理することが難しく、現在は使用されて"
-"いない。このオプションは、i386 の a.out 形式のみを対象としてリリースされた、"
-"バージョン 0.93.76(1995 年 9 月)以前の dpkg で処理するためのパッケージを構築"
-"するときだけに使用される。"
 
 # type: Plain text
-#: dpkg-deb.1:246
-msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
-"B<dpkg-deb --build> のときにアーカイブの中身を確認させない。これによって、"
-"アーカイブの中身にどのように問題があっても、望んだ通りアーカイブを構築するこ"
-"とができる。"
 
-# type: TP
-#: dpkg-deb.1:246
-#, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--debug>, B<-D>"
+# type: Plain text
+#: dpkg-architecture.1:271
+#, fuzzy
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
-msgstr "デバッグ出力を有効にする。これはあまり役に立たない。"
+#: dpkg-architecture.1:276
+msgid ""
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+msgstr ""
+
+# type: TH
+#: dpkg.cfg.5:1
+#, fuzzy, no-wrap
+msgid "dpkg.cfg"
+msgstr "dpkg"
 
 # type: Plain text
-#: dpkg-deb.1:254
-msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
 msgstr ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> はうまく動作しない。"
 
 # type: Plain text
-#: dpkg-deb.1:258
+#: dpkg.cfg.5:11
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
-"B<.deb> ファイル自体には認証の手段がない。実際、単純なチェックサムさえもな"
-"い。"
+
+# type: TP
+#: dpkg.cfg.5:16
+#, fuzzy
+msgid "I<~/.dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg.cfg.5:20
+#, fuzzy
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
-"B<dpkg-deb> でソフトウェアをインストールしようとしてはいけない! 必ず B<dpkg> "
-"を使うこと。そうすれば、すべてのファイルを正しい位置に置き、パッケージのスク"
-"リプトを実行し、状態や内容を記録する、ということを確実に実行できる。"
+"B<dpkg> に貢献した人のリストは B</usr/share/doc/dpkg/THANKS> に\n"
+"挙げてある。\n"
 
 # type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
+msgstr "B<dpkg>(1)."
+
+# type: TH
+#: dpkg-buildpackage.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-deb.1:278
+#: dpkg-buildpackage.1:4
 #, fuzzy
+msgid "dpkg-buildpackage - build source packages"
+msgstr "dpkg-scanpackages - Packages ファイルの作成"
+
+# type: Plain text
+#: dpkg-buildpackage.1:8
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+# type: Plain text
+#: dpkg-buildpackage.1:13
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作権は"
-"彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布される。これ"
-"らは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</usr/share/"
-"common-licenses/GPL> を参照すること。"
 
-# type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "dpkg-divert"
-msgstr "dpkg-divert"
+# type: TP
+#: dpkg-buildpackage.1:15
+#, fuzzy, no-wrap
+msgid "B<-b>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
-msgstr "dpkg-divert - パッケージのファイルのオーバーライド"
+#: dpkg-buildpackage.1:19
+msgid ""
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
+msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:10
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
+# type: TP
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
+#, no-wrap
+msgid "B<-B>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:23
+msgid ""
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
+msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+# type: TP
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:26
+#, fuzzy
+msgid "Specifies a source-only build, no binary packages need to be made."
+msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 # type: Plain text
-#: dpkg-divert.8:36
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"`diversions' というファイルにより、B<dpkg>(1) はファイルをインストールする時"
-"に本来意図していた場所ではなく退避した (`diverted') 場所にインストールするよ"
-"うになる。diversions は Debian パッケージスクリプトで衝突がおこりうるファイル"
-"を移動させるために使うことができる。システム管理者はパッケージの設定ファイル"
-"や他のファイルを (`conffiles' としてマークされていなければ) dpkg が新しいバー"
-"ジョンのパッケージをインストールする時にそれらのファイルを上書きしてしまわな"
-"いようにするために diversion を使うことができる。"
+
+# type: TP
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-buildpackage.1:40
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
-"B<dpkg-divert> は diversions のリストを設定、更新するためのユーティリティであ"
-"る。これは 3 つの基本モードの機能をもっている。diversion の追加、削除、リスト"
-"である。それぞれ B<--add>、B<--remove>、B<--list> オプションで指定する。さら"
-"に B<--truename> によって退避されたファイルの実際の名前を表示することもでき"
-"る。以下にあげられている他オプションも指定することができる。"
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
-#, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>directoryE<gt>>"
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:48
-msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
-"dpkg データディレクトリを I<E<lt>directoryE<gt>> に設定する。(デフォルト: I</"
-"var/lib/dpkg>)"
 
 # type: TP
-#: dpkg-divert.8:48
-#, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<--divert>I< E<lt>divert-toE<gt>>"
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:52
-msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
-"I<E<lt>divert-toE<gt>> は、他のパッケージによって提供される "
-"I<E<lt>fileE<gt>> を退避する位置である。"
 
 # type: TP
-#: dpkg-divert.8:52
-#, no-wrap
-msgid "B<--local>"
-msgstr "B<--local>"
+#: dpkg-buildpackage.1:46
+#, fuzzy, no-wrap
+msgid "B<-a>I<architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:51
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
-"全てのパッケージのそのファイルを退避する対象にする。つまり、例外なく、どのよ"
-"うなパッケージをインストールしても退避される。これを使って、管理者がローカル"
-"の修正バージョンをインストールすることができる。"
 
 # type: TP
-#: dpkg-divert.8:58
-#, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<--package>I< E<lt>packageE<gt>>"
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg-divert.8:63
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
-"I<E<lt>packageE<gt>> は、I<E<lt>fileE<gt>> が退避されていないパッケージの名前"
-"である。つまり、I<E<lt>fileE<gt>> は I<E<lt>packageE<gt>> を除いたすべての"
-"パッケージによって退避される。"
 
-# type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
-#, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+# type: Plain text
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, fuzzy, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B< >E<lt>長い説明E<gt>"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
-msgstr "静かなモード。つまり無駄な出力をしない。"
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+msgid ""
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
+msgstr ""
 
 # type: TP
-#: dpkg-divert.8:66
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
-msgid "B<--rename>"
-msgstr "B<--rename>"
+msgid "B<-m>I<maintaineraddress>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:70
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
-"実際にファイルを移動する (もしくは戻す)。dpkg-divert は移動先のファイルが既に"
-"存在していると動作を中断する。"
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, no-wrap
-msgid "B<--test>"
-msgstr "B<--test>"
+msgid "B<-e>I<maintaineraddress>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
+msgid ""
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
-"テストモード。つまり実際にはなにも実行せず、なにをするかを表示するだけであ"
-"る。"
 
-# type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
-msgstr "バージョンと簡単な利用法を表示して正常終了する。"
+# type: TP
+#: dpkg-buildpackage.1:72
+#, fuzzy, no-wrap
+msgid "B<-D>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
-msgstr "プログラム名とバージョンを表示して正常終了する。"
+#: dpkg-buildpackage.1:75
+#, fuzzy
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
+msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
 
-# type: SH
-#: dpkg-divert.8:80
-#, no-wrap
-msgid "NOTES"
-msgstr "注意"
+# type: TP
+#: dpkg-buildpackage.1:75
+#, fuzzy, no-wrap
+msgid "B<-d>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:84
-msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
-msgstr ""
-"追加する時は、デフォルトは B<--local> と B<--divert> I<E<lt>originalE<gt>."
-"distrib> である。削除する時は、B<--package> もしくは B<--local> と B<--"
-"divert> は指定されていれば一致していなければいけない。"
+#: dpkg-buildpackage.1:78
+#, fuzzy
+msgid "Do not check build dependencies and conflicts."
+msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
 
-# type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
-msgstr "B<dpkg-divert> ではディレクトリは退避できない。"
+# type: TP
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
+#, fuzzy, no-wrap
+msgid "B<-W>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg-buildpackage.1:84
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"共有ライブラリを退避する場合、注意すべきである。B<ldconfig>(8) はライブラリに"
-"埋め込まれている DT_SONAME フィールドに基づいて、シンボリックリンクを作成す"
-"る。ldconfig は退避させることができないためである (dpkg だけができる)。もし退"
-"避したライブラリと退避していないライブラリが同じ SONAME であれば、最終的にシ"
-"ンボリックリンクは退避したライブラリを指す。"
+
+# type: TP
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
+#, fuzzy, no-wrap
+msgid "B<-E>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:97
+#: dpkg-buildpackage.1:92
 msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
-"すべての I</usr/bin/example> を I</usr/bin/example.foo> に退避させる、つま"
-"り、I</usr/bin/example> を提供するすべてのパッケージに対して必要であれば I</"
-"usr/bin/example.foo> と変更してインストールさせる。"
 
-# type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
-msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+# type: TP
+#: dpkg-buildpackage.1:92
+#, fuzzy, no-wrap
+msgid "B<-nc>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
-msgstr "diversion を削除する。"
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
+msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --rename --remove /usr/bin/example"
+# type: TP
+#: dpkg-buildpackage.1:95
+#, fuzzy, no-wrap
+msgid "B<-tc>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:107
+#: dpkg-buildpackage.1:101
 msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
-"I</usr/bin/example> をインストールしようとするすべてのパッケージを I</usr/"
-"bin/example.foo> に退避、ただし自作の I<wibble> パッケージを除く。"
 
-# type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+# type: TP
+#: dpkg-buildpackage.1:101
+#, no-wrap
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
-msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
+msgid ""
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
+msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:127
 #, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/diversions>"
+msgid "B<-p>I<sign-command>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:152
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
-"システムの現在の退避リストを含むファイル。これは dpkg で使われる重要なファイ"
-"ル `status' や `available' がある dpkg の管理ディレクトリにある。"
 
-# type: Plain text
-#: dpkg-divert.8:123
-msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+# type: TP
+#: dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
 msgstr ""
-"注意: B<dpkg-divert> はこのファイルを更新する時に、古いバージョンを \"-old\" "
-"という名前をつけたファイルにコピーしておく。"
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr "Copyright (C) 1995 Ian Jackson."
+#: dpkg-buildpackage.1:155
+#, fuzzy
+msgid "Specify a key-ID to use when signing packages."
+msgstr "これは新しいパッケージを作る時に使うことができる。"
 
-# type: TH
-#: dpkg-name.1:6
-#, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-name"
+# type: TP
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
-msgstr "dpkg-name - Debian パッケージを完全なパッケージの名前に変更"
+#: dpkg-buildpackage.1:158
+#, fuzzy
+msgid "Do not sign the source package."
+msgstr "パッケージの短い説明文"
+
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-name.1:22
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, fuzzy, no-wrap
+msgid "B<-i>[I<regexp>]"
+msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 # type: Plain text
-#: dpkg-name.1:33
-msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
-"このマニュアルページでは、B<dpkg-name> シェルスクリプトについて説明する。"
-"B<dpkg-name> シェルスクリプトは、B<Debian> パッケージを完全なパッケージ名に、"
-"簡単に変更することができる。完全なパッケージ名とは、パッケージの control ファ"
-"イルで指定された情報から得られる E<lt>パッケージE<gt>_E<lt>バージョン"
-"E<gt>_E<lt>アーキテクチャE<gt>.deb という名前である。E<lt>バージョンE<gt> の"
-"部分は、上流のバージョン情報にハイフン、そしてリビジョン情報が続いたものであ"
-"る。"
 
 # type: TP
-#: dpkg-name.1:34
-#, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<-a, --no-architecture>"
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
-msgstr "変更後のファイル名にアーキテクチャ情報を含ませない。"
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+msgstr ""
 
 # type: TP
-#: dpkg-name.1:37
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<-k, --symlink>"
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir=>I<dir>"
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
-msgstr "移動するかわりにシンボリックリンクを作る。"
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
+msgid ""
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
+msgstr ""
+"B<dpkg> データベースの位置を変更する。デフォルトの位置は I</var/lib/dpkg> で"
+"ある。"
 
 # type: TP
-#: dpkg-name.1:40
-#, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<-o, --overwrite>"
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
+#, fuzzy, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-buildpackage.1:185
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
-msgstr "変更後のファイル名と同名のファイルがあれば、それを上書きしてしまう。"
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
+msgstr ""
 
-# type: TP
-#: dpkg-name.1:44
+# type: Plain text
+#: dpkg-buildpackage.1:192
+#, fuzzy
+msgid ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:1
 #, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<-s, --subdir> [I<dir>]"
+msgid "dpkg-checkbuilddeps"
+msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: dpkg-name.1:56
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> B<-B> [I<コントロールファイル>]"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:14
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
-"ファイルをサブディレクトリに移動する。もし引数で指定したディレクトリが存在す"
-"れば、パッケージの control のセクションフィールドから得られたターゲットディレ"
-"クトリの名前のかわりにそのディレクトリにファイルを移動する。通常、ターゲット"
-"ディレクトリは `unstable/binary-E<lt>アーキテクチャE<gt>/E<lt>セクション"
-"E<gt>' である。もし control でのセクション情報がない場合は `no-section' とみ"
-"なされる。そしてこの場合、`non-free' や `contrib' セクションの時と同様にター"
-"ゲットディレクトリは `E<lt>セクションE<gt>/binary-E<lt>アーキテクチャE<gt>' "
-"になる。セクションフィールドは必須ではないので多くのパッケージが `no-"
-"section' の場所にいってしまうだろう。このオプションを使う時は注意すること。厄"
-"介である。"
+"このプログラムはコントロールファイル中にリストされているビルド依存とビルド衝"
+"突に関して、システムにインストールされているパッケージをチェックする。もし、"
+"足りないものや衝突している物があるなら、それらを表示して 0 以外の返り値を返し"
+"て終了する。"
 
-# type: TP
-#: dpkg-name.1:56
-#, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr "B<-c, --create-dir>"
+# type: Plain text
+#: dpkg-checkbuilddeps.1:17
+msgid ""
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
+msgstr ""
+"デフォルトでは、I<debian/control> が読まれるが、別のコントロールファイル名を"
+"コマンドラインに指定することもできる。"
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-checkbuilddeps.1:27
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
-"このオプションは -s オプションとともに使うことができる。ターゲットディレクト"
-"リがなければ、自動的に作成される。B<このオプションを使う時は注意すること。>"
+"I<Build-Depends-Indep> 行を無視する。アーキテクチャに非依存なパッケージがビル"
+"ドされない時に利用する。"
 
 # type: TP
-#: dpkg-name.1:61
+#: dpkg-checkbuilddeps.1:27
 #, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<-h, --help>"
+msgid "B<-h>"
+msgstr "B<-h>"
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
-msgstr "利用方法を表示して正常終了する。"
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
 
-# type: TP
-#: dpkg-name.1:64
+# type: UR
+#: dpkg-checkbuilddeps.1:33
 #, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<-v, --version>"
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-#, fuzzy
-msgid "Print version information and exit successfully."
-msgstr ""
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"バージョン情報を表示し、正常終了する。\n"
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"バージョン情報を表示して正常終了する。"
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TP
-#: dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<-l, --license>"
+#: dpkg-distaddfile.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-distaddfile"
+msgstr "dpkg-statoverride"
 
 # type: Plain text
-#: dpkg-name.1:71
-msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
-msgstr "著作権情報、ライセンス情報(GNU への参照)を表示して正常終了する。"
+#: dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
+msgstr ""
 
-# type: TP
-#: dpkg-name.1:72
-#, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
-msgstr "B<dpkg-name bar-foo.deb>"
+# type: Plain text
+#: dpkg-distaddfile.1:8
+#, fuzzy
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-distaddfile.1:18
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
+msgstr ""
+
+# type: Plain text
+#: dpkg-distaddfile.1:26
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
-"ファイル `bar-foo.deb' が bar-foo_1.0-2_i386.deb のような感じに変更される。"
-"(実際にどうなるかは `bar-foo.deb' の中の control の情報に依存する)"
 
 # type: TP
-#: dpkg-name.1:77
-#, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
-msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
+#, fuzzy, no-wrap
+msgid "B<-f>I<fileslistfile>"
+msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
-"ディレクトリ /root/debian 以下にあり拡張子が `deb' の全てのファイルを dpkg-"
-"name を使ってアーキテクチャ情報なしの名前に変更する。"
 
 # type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
-msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
+#, fuzzy, no-wrap
+msgid "B<debian/files>"
+msgstr "B<infodesc>"
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-distaddfile.1:46
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
-"B<やってはいけない!> 多くのパッケージはセクション情報をもっていないので、あな"
-"たのアーカイブはぐちゃぐちゃになってしまうだろう。B<やってはいけない!>"
 
-# type: TP
-#: dpkg-name.1:88
+# type: TH
+#: dpkg-deb.1:1
 #, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
+
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "2006-06-17"
 
 # type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
-msgstr "これは新しいパッケージを作る時に使うことができる。"
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr "dpkg-deb - Debian パッケージアーカイブ (.deb) 操作ツール"
+
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:13
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
+
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
-"パッケージによっては E<lt>パッケージE<gt>_E<lt>バージョンE<gt>_E<lt>アーキテ"
-"クチャE<gt>.deb という名前ではない。 dpkg-name によって改名されたパッケージは"
-"このような名前になる。一般には、これは B<dselect>(1)/ B<dpkg>(1) によってパッ"
-"ケージがどのようにインストールされたかには影響はないが、この名前構造に依存し"
-"ているインストールツールによっては影響があるかもしれない。"
+"パッケージをシステムにインストールするときや削除するときには B<dpkg> を使うこ"
+"と。"
 
 # type: Plain text
-#: dpkg-name.1:107
+#: dpkg-deb.1:27
 msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"また、 B<dpkg> に対して B<dpkg-deb> のオプションを指定することで、 B<dpkg> を"
+"通して B<dpkg-deb> を呼び出すことができる。 B<dpkg> は、オプションが B<dpkg-"
+"deb> のオプションであると判断すると、 B<dpkg-deb> を起動する。"
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
+# type: Plain text
+#: dpkg-deb.1:29
 #, fuzzy, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"著作権\n"
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"COPYRIGHT"
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-deb.1:41
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"I<directory> に格納されているファイルシステム木から debian アーカイブを作成す"
+"る。 I<directory> には、control ファイルなどの制御情報ファイルのある "
+"B<DEBIAN> サブディレクトリが必ず存在しなければならない。 DEBIAN ディレクトリ"
+"はバイナリパッケージのファイルシステム・アーカイブにはI<含まれない>。そのかわ"
+"り、DEBIAN ディレクトリ以下にあったファイルはバイナリパッケージ制御情報エリア"
+"に置かれる。"
 
 # type: Plain text
-#: dpkg-query.1:1
-#, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-query"
+#: dpkg-deb.1:53
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
+msgstr ""
+"B<--nocheck> を指定しないかぎり、 B<dpkg-deb> は B<DEBIAN/control> を読み、解"
+"析する。 dpkg-deb は、文法エラーやその他の問題のチェックをし、そして、構築中"
+"のバイナリパッケージ名を表示する。 B<dpkg-deb> はまた、 B<DEBIAN> 管理情報"
+"ディレクトリにある、管理スクリプトやその他のファイルのパーミッションをチェッ"
+"クする。"
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
-msgstr "dpkg-query - dpkg データベース問い合わせツール"
-
-# type: TP
-#: dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-
-# type: TP
-#: dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-
-# type: TP
-#: dpkg-query.1:17
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-
-# type: TP
-#: dpkg-query.1:21
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#: dpkg-deb.1:60
+msgid ""
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
+msgstr ""
+"もし、 I<archive> を指定しない場合、 B<dpkg-deb> はパッケージを "
+"I<directory>B<.deb> という名前で作成する。"
 
-# type: TP
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
-msgstr "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+# type: Plain text
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
+msgstr "もし、すでにアーカイブが作成されて存在している場合、上書きする。"
 
-# type: TP
-#: dpkg-query.1:29
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+# type: Plain text
+#: dpkg-deb.1:78
+msgid ""
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
+msgstr ""
+"2 番目の引き数がディレクトリの場合、 B<dpkg-deb> は "
+"I<package>B<_>I<version>B<_>I<arch>B<.deb> または I<package>B<_>I<version>B<."
+"deb> (パッケージ制御ファイルに B<Architecture> フィールドがない場合)という"
+"ファイルを作成する。アーカイブの代わりにディレクトリを指定するときには、 B<--"
+"nocheck> オプションは使用してはいけない( B<dpkg-deb> は、使用するファイル名を"
+"調べるために、パッケージ制御ファイルを読んで解析する必要があるから)。"
 
-# type: TP
-#: dpkg-query.1:32
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg-query> B<--licence>|B<--license>"
+# type: Plain text
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
 
 # type: Plain text
-#: dpkg-query.1:35
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg-query> B<--version>"
+#: dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
+msgstr "バイナリパッケージアーカイブの情報を表示する。"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-deb.1:86
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
-"B<dpkg-query> は、B<dpkg> データベースから、パッケージの情報を表示するツール"
-"である。"
-
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
-msgstr "コマンド"
-
-# type: TP
-#: dpkg-query.1:41
-#, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<-l> | B<--list> I<package-name-pattern> ..."
+"もし I<control-file-name> が指定されていない場合、制御ファイル一覧と、パッ"
+"ケージの中身の要約を表示する。"
 
 # type: Plain text
-#: dpkg-query.1:50
+#: dpkg-deb.1:94
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
-"指定したパターンにマッチする名前のパッケージを表示する。 I<package-name-"
-"pattern> を指定しない場合は、 I</var/lib/dpkg/status> にある、purge 状態に"
-"マークされていないすべてのパッケージの一覧を表示する。I<package-name-"
-"pattern> には、標準的なシェルのワイルド文字を使用することができる。ただし、"
-"シェルにファイル名展開をさせないように、I<package-name-pattern> をクオートす"
-"る必要があることに注意していただきたい。例えば次のコマンドは、名前が "
-"``libc6'' で始まるすべてのパッケージを表示する。"
+"もし I<control-file-name> を指定した場合、 B<dpkg-deb> は指定した順でファイル"
+"名を表示する。もし指定したファイルのどれかが存在しなければ、存在しなかった"
+"ファイルに対してそれぞれエラーメッセージを表示し、そして終了ステータス 2 で終"
+"了する。"
 
 # type: Plain text
-#: dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-deb.1:101
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
-"この出力形式は変更可能ではないが、端末の横幅に合うように自動的に調整される。"
-"この出力は人間に読みやすいものであり、機械に読ませるのには向かない。出力形式"
-"の設定方法については、 B<-W> (B<--show>) と B<--showformat> を参照。"
+"バイナリパッケージアーカイブの情報を B<--showformat> の引き数で指定した形式で"
+"表示する。デフォルトの出力形式は、一行ごとにパッケージ名とバージョンをタブで"
+"区切ったものである。"
 
-# type: TP
-#: dpkg-query.1:60
-#, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<-W> | B<--show> I<package-name-pattern> ..."
+# type: Plain text
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
+
+# type: Plain text
+#: dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
+msgstr "バイナリパッケージアーカイブから制御ファイル情報を取り出す。"
 
 # type: Plain text
-#: dpkg-query.1:67
+#: dpkg-deb.1:108
 msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
-"B<--list> オプションと同様に、指定したパターンにマッチするすべてのパッケージ"
-"を表示する。さらに、このオプションの出力は、 B<--showformat> オプションによっ"
-"てカスタマイズすることができる。デフォルトの出力形式は、マッチしたパッケージ"
-"ごとに 1 行となる。それぞれの行は、パッケージ名とインストールしたバージョンが"
-"タブ区切りで含まれる。"
-
-# type: TP
-#: dpkg-query.1:67
-#, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<-s> | B<--status> I<package-name> ..."
+"B<control-file-field> が指定されていない場合、制御ファイルすべてを表示する。"
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-deb.1:117
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
 msgstr ""
-"指定したパッケージの状況を報告する。これは、インストール済みパッケージ状況"
-"データベースからの内容を表示しているだけである。"
+"もし何か指定されている場合、 B<dpkg-deb> はその内容を制御ファイルに現われる順"
+"序で表示する。もし、複数の B<control-file-field> が指定された場合、 B<dpkg-"
+"deb> は、それぞれの情報の前にフィールド名(そしてコロンと空白)を表示する。"
+
+# type: Plain text
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
+msgstr "指定したフィールドがみつからない場合でもエラーを報告しない。"
 
-# type: TP
-#: dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<-L> | B<--listfiles> I<package-name> ..."
+# type: Plain text
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:125
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
-"B<package-name> によってインストールしたファイルを表示する。ただし、パッケー"
-"ジ付属のインストールスクリプトによって作成されたファイルは表示されないことに"
-"注意すること。"
+"パッケージアーカイブに含まれるファイルシステム木の内容の一覧を表示する。現在"
+"のバージョンは、 B<tar> の冗長出力(-v オプション)をそのまま表示する。"
 
-# type: TP
-#: dpkg-query.1:76
-#, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
-msgstr "B<-S> | B<--search> I<filename-search-pattern> ..."
+# type: Plain text
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:129
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
-"指定したファイルがどのパッケージからインストールされたかを探す。パターンに"
-"は、標準的なシェルのすべてのワイルド文字を使用することができる。このコマンド"
-"では、メンテナスクリプトで作成された追加ファイルや、 alternatives は探すこと"
-"ができない。"
-
-# type: TP
-#: dpkg-query.1:82
-#, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<-p> |B<--print-avail> I<package-name>"
+"パッケージアーカイブからファイルシステム木を、指定したディレクトリに展開す"
+"る。"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-deb.1:135
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
-"I</var/lib/dpkg/available> にある I<package-name> に関する情報を表示する。"
+"ルートディレクトリでパッケージを展開することは正しいインストールにはI<ならな"
+"い>ことに注意すること! パッケージのインストールには B<dpkg> を使うべきであ"
+"る。"
 
-# type: TP
-#: dpkg-query.1:86
-#, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence> | B<--license>"
+# type: Plain text
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
+msgstr ""
+"I<directory> (親やそれより上のディレクトリは含まない)は必要があれば作成され"
+"る。"
 
 # type: Plain text
-#: dpkg-query.1:89
-msgid "Display licence and copyright information."
-msgstr "ライセンスと著作権情報を表示する。"
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
 
 # type: Plain text
-#: dpkg-query.1:92
-msgid "Display version information."
-msgstr "バージョン情報を表示する。"
+#: dpkg-deb.1:143
+#, fuzzy
+msgid ""
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
+msgstr ""
+"B<--vextract> (B<-X>) は現在展開中のファイルを表示する。 B<--extract> (B<-"
+"x>) はエラーが発生しない限り何も表示しない。"
 
-# type: TP
-#: dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir=>I<dir>"
+# type: Plain text
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<archive>"
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:151
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
-"B<dpkg> データベースの位置を変更する。デフォルトの位置は I</var/lib/dpkg> で"
-"ある。"
-
-# type: TP
-#: dpkg-query.1:98
-#, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<-f> | B<--showformat=>I<format>"
+"バイナリパッケージからファイルシステム木を展開し、標準出力に B<tar> 形式で出"
+"力する。 B<tar> と共に使用することで、特定のファイルをパッケージアーカイブか"
+"ら取り出すことができる。"
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
-msgstr "フォーマット文字列中では、\\(lqB<\\e>\\(rq はエスケープ文字である:"
+#: dpkg-deb.1:151
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:155
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
-"    B<\\en>  改行\n"
-"    B<\\er>  キャリッジリターン\n"
-"    B<\\et>  タブ\n"
+"パッケージアーカイブから制御情報ファイルを指定したディレクトリに展開する。"
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:159
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
-"前に \\(lqB<\\e>\\(rq を置くことで、続くあらゆる文字の意味を抑制できる。"
-"\\(lqB<\\e>\\(rq や \\(lqB<$>\\(rq のために有用である。"
+"もしディレクトリが指定されない場合、カレントディレクトリにある B<DEBIAN> サブ"
+"ディレクトリに展開する。"
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:162
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"パッケージ情報には、パッケージフィールドを参照する変数を含めることができる。"
-"その変数の構文は、\\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq となる。それぞれ"
-"のフィールドは右寄せで表示されるが、width に負の値を指定すると左寄せになる。"
-"以下の I<field> は認識される:"
+"指定したディレクトリ(親やそれより上のディレクトリは含まない)は必要があれば作"
+"成される。"
+
+# type: TP
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
+#, fuzzy, no-wrap
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence> | B<--license>"
 
 # type: Plain text
-#: dpkg-query.1:153
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
+msgstr ""
+
+# type: TP
+#: dpkg-deb.1:173
 #, no-wrap
+msgid "B<--showformat=>I<format>"
+msgstr "B<--showformat=>I<format>"
+
+# type: Plain text
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+"このオプションは、B<--show> が生成する出力の書式を指定するものである。書式は"
+"文字列で、パッケージごとに出力される。"
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:187
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
-"デフォルトのフォーマット文字列は  \\(lqB<${Package}\\et${Version}\\en>\\(rq "
-"である。実際には、status ファイルに含まれる他のすべてのフィールド(つまり、"
-"ユーザ定義フィールド)も指定することができる。これらはそのまま表示される。変換"
-"やエラーチェックはされない。dpkg のメンテナとインストールされているバージョン"
-"を得るには、これを実行する:"
+"文字列は \"${I<field-name>}\" 形式であらゆる status フィールドを参照すること"
+"ができる。有効なフィールドの一覧は、そのパッケージに B<-I> を使用することで簡"
+"単に生成できる。書式オプションの完全な解説(エスケープシーケンスやフィールドで"
+"のタブの使い方を含む)は、B<dpkg-query>(1)の B<--showformat> オプションの解説"
+"を参照すること。"
 
 # type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
-msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr ""
+"このフィールドのデフォルトのフォーマット文字列は \"${Package}\\et${Version}"
+"\\en\" である。"
 
-# type: SH
-#: dpkg-query.1:167
+# type: TP
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "ENVIRONMENT"
-msgstr "環境変数"
+msgid "B<-z>I<compress_level>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-deb.1:193
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
-msgstr "設定すると、B<--list> オプションによる出力の横幅を変更する。"
-
-# type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Wichert Akkerman"
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
+msgstr ""
 
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:wakkerma@debian.org"
+# type: TP
+#: dpkg-deb.1:193
+#, fuzzy, no-wrap
+msgid "B<-Z>I<compress_type>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
-msgstr "dpkg-scanpackages"
+#: dpkg-deb.1:198
+msgid ""
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
+msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-deb.1:198
 #, no-wrap
-msgid "2006-05-10"
-msgstr "2006-05-10"
+msgid "B<--new>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
-msgstr "dpkg-scanpackages - Packages ファイルの作成"
+#: dpkg-deb.1:203
+msgid ""
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+msgstr ""
+"B<dpkg-deb> に `新しい' 形式のアーカイブで構築させる。これはデフォルトの動作"
+"である。"
+
+# type: TP
+#: dpkg-deb.1:203
+#, no-wrap
+msgid "B<--old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
+#: dpkg-deb.1:211
 msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"B<dpkg-deb> に `古い' 形式のアーカイブを構築させる。この古いアーカイブ形式"
+"は、新しい形式よりも非 Debian ツールで処理することが難しく、現在は使用されて"
+"いない。このオプションは、i386 の a.out 形式のみを対象としてリリースされた、"
+"バージョン 0.93.76(1995 年 9 月)以前の dpkg で処理するためのパッケージを構築"
+"するときだけに使用される。"
 
 # type: Plain text
-#: dpkg-scanpackages.1:43
+#: dpkg-deb.1:217
 msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
-"B<dpkg-scanpackages> は Debian バイナリパッケージのツリーを見て Packages ファ"
-"イルを生成する。Packages ファイルは B<apt>(8) や B<dselect>(1) などに、どの"
-"パッケージがインストールできるかをユーザに知らせるために利用している。これら"
-"の Packages ファイルは Debian アーカイブサイトや CD-ROM などで使われているも"
-"のと同じものである。もし、たくさんのマシンにインストールしたいローカルなパッ"
-"ケージのディレクトリを作るなら、自分で B<dpkg-scanpackages> を使うことができ"
-"る。"
+"B<dpkg-deb --build> のときにアーカイブの中身を確認させない。これによって、"
+"アーカイブの中身にどのように問題があっても、望んだ通りアーカイブを構築するこ"
+"とができる。"
+
+# type: TP
+#: dpkg-deb.1:217
+#, fuzzy, no-wrap
+msgid "B<-D>, B<--debug>"
+msgstr "B<--debug>"
+
+# type: Plain text
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
+msgstr "デバッグ出力を有効にする。これはあまり役に立たない。"
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
+#: dpkg-deb.1:226
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
-"B<注意:> B<apt> で使うのであれば、生成した Packages ファイルを B<gzip>(1) で"
-"圧縮する(Packages.gz を生成する)必要があるだろう。apt はローカルアクセス(つま"
-"り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> はうまく動作しない。"
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
+#: dpkg-deb.1:230
 msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
-"I<binarydir> は処理するバイナリパッケージのツリーの名前である(例えば "
-"B<contrib/binary-i386> など)。Debian アーカイブのルートからの相対にしておくの"
-"が最もいい方法である。なぜなら Packages ファイルに含まれている各々の "
-"Filename フィールドはこの文字列で始まるからである。"
+"B<.deb> ファイル自体には認証の手段がない。実際、単純なチェックサムさえもな"
+"い。"
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-deb.1:237
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
-"I<overridefile> はパッケージがディストリビューションに合うようにするための情"
-"報を含んでいるファイルの名前である。以下を参照のこと。"
+"B<dpkg-deb> でソフトウェアをインストールしようとしてはいけない! 必ず B<dpkg> "
+"を使うこと。そうすれば、すべてのファイルを正しい位置に置き、パッケージのスク"
+"リプトを実行し、状態や内容を記録する、ということを確実に実行できる。"
+
+# type: Plain text
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-deb.1:252
+#, fuzzy
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
 msgstr ""
-"I<pathprefix> は Filename フィールドで前に追加できるオプションの文字列であ"
-"る。"
+"B<dpkg-deb> とこのマニュアルページは Ian Jackson が作成した。これらの著作権は"
+"彼にあり(Copyright (C)1995-1996)、GNU 一般公有使用許諾により頒布される。これ"
+"らは無保証である。詳細は B</usr/share/doc/dpkg/copyright> と B</usr/share/"
+"common-licenses/GPL> を参照すること。"
+
+# type: TH
+#: dpkg-divert.8:1
+#, no-wrap
+msgid "dpkg-divert"
+msgstr "dpkg-divert"
 
 # type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr "B<-u> を指定した場合は、*.deb の代わりに *.udeb をスキャンする。"
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
+msgstr "dpkg-divert - パッケージのファイルのオーバーライド"
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-divert.8:9
+#, fuzzy
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+# type: Plain text
+#: dpkg-divert.8:13
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
-"B<-a>I<E<lt>archE<gt>> を指定した場合は、すべての deb ファイルをスキャンする"
-"代わりに、*_all.deb や *_arch.deb パターンにマッチするファイルを対象とする。"
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
+#: dpkg-divert.8:23
 msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
-"2 つ以上のバージョンのパッケージがあれば、最新の 1 つだけが出力に含まれる。同"
-"一のバージョンでアーキテクチャだけが異なる場合は、最初の 1 つだけが使用され"
-"る。この動きは B<-m> スイッチで変更できる。このスイッチが指定された場合は、み"
-"つかったパッケージすべてが出力に含まれる。"
+"`diversions' というファイルにより、B<dpkg>(1) はファイルをインストールする時"
+"に本来意図していた場所ではなく退避した (`diverted') 場所にインストールするよ"
+"うになる。diversions は Debian パッケージスクリプトで衝突がおこりうるファイル"
+"を移動させるために使うことができる。システム管理者はパッケージの設定ファイル"
+"や他のファイルを (`conffiles' としてマークされていなければ) dpkg が新しいバー"
+"ジョンのパッケージをインストールする時にそれらのファイルを上書きしてしまわな"
+"いようにするために diversion を使うことができる。"
 
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr "OVERRIDE ファイル"
+# type: TP
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
-msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
-"パッケージに関するほとんどの情報は control ファイルで見つけることができるが、"
-"いくつかはメンテナではなくディストリビューション作成者により、それらの情報を"
-"与える必要がある。パッケージの実際の依存関係や説明よりも、リリースにむけて"
-"ファイルをどう配置するかに関係してくるからである。これらの情報は override "
-"ファイルにある。"
+
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--remove>I< E<lt>fileE<gt>>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:91
-msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
-msgstr ""
-"override ファイルは簡単な空白で区切られた形式になっている。コメントも許されて"
-"いる(B<#> 以降がコメント)。"
+#: dpkg-divert.8:31
+#, fuzzy
+msgid "Remove a diversion for I<file>."
+msgstr "diversion を削除する。"
+
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 # type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
-msgstr "I<package> I<priority> I<section> [I<maintainerinfo>]"
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
+msgstr ""
+
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
-msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
-"I<package> はパッケージ名である。override ファイルにあるがバイナリパッケージ"
-"のツリーにはないパッケージ名のエントリは無視される。"
+
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir> I<directory>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
+#: dpkg-divert.8:42
+#, fuzzy
 msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
-"I<priority> と I<section> はパッケージをリリースツリーでどこに置くかを指定す"
-"る。これらは control ファイルにあるべきではない。もしパッケージが "
-"I<binarydir> のサブディレクトリにあれば I<section> の値とチェックされる。"
+"dpkg データディレクトリを I<E<lt>directoryE<gt>> に設定する。(デフォルト: I</"
+"var/lib/dpkg>)"
+
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<--divert>I< E<lt>divert-toE<gt>>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:119
+#: dpkg-divert.8:46
+#, fuzzy
 msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
-"I<maintainerinfo> がもしあればメンテナの名前を無条件に上書きできる。もしくは "
-"I<oldmaintainer> B<=E<gt>> I<newmaintainer> の場合は置換される。"
+"I<E<lt>divert-toE<gt>> は、他のパッケージによって提供される "
+"I<E<lt>fileE<gt>> を退避する位置である。"
+
+# type: TP
+#: dpkg-divert.8:46
+#, no-wrap
+msgid "B<--local>"
+msgstr "B<--local>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
+#: dpkg-divert.8:52
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
-"公式の Packages リストを作成するために使われている override ファイルは、 "
-"Debian ミラーの I<indices> ディレクトリにある。"
+"全てのパッケージのそのファイルを退避する対象にする。つまり、例外なく、どのよ"
+"うなパッケージをインストールしても退避される。これを使って、管理者がローカル"
+"の修正バージョンをインストールすることができる。"
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
+# type: TP
+#: dpkg-divert.8:52
 #, fuzzy, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"診断\n"
-"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
-"診断メッセージ"
+msgid "B<--package>I< package>"
+msgstr "B<--package>I< E<lt>packageE<gt>>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
+#: dpkg-divert.8:57
+#, fuzzy
 msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
-"B<dpkg-scanpackages> は通常の自己説明的なエラーを出力する。パッケージが間違っ"
-"たディレクトリにある、複数ある、control ファイルに Filename フィールドがあ"
-"る、override ファイルにない、実行されなかったメンテナの置換があるなどといった"
-"警告もする。"
+"I<E<lt>packageE<gt>> は、I<E<lt>fileE<gt>> が退避されていないパッケージの名前"
+"である。つまり、I<E<lt>fileE<gt>> は I<E<lt>packageE<gt>> を除いたすべての"
+"パッケージによって退避される。"
+
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
+msgstr "静かなモード。つまり無駄な出力をしない。"
 
-# type: TH
-#: dpkg-scansources.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-scansources"
-msgstr "dpkg-scanpackages"
+# type: TP
+#: dpkg-divert.8:60
+#, no-wrap
+msgid "B<--rename>"
+msgstr "B<--rename>"
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-divert.8:64
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
+"実際にファイルを移動する (もしくは戻す)。dpkg-divert は移動先のファイルが既に"
+"存在していると動作を中断する。"
+
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, no-wrap
+msgid "B<--test>"
+msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-scansources.1:13
-#, fuzzy
-msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"テストモード。つまり実際にはなにも実行せず、なにをするかを表示するだけであ"
+"る。"
+
+# type: SH
+#: dpkg-divert.8:74
+#, no-wrap
+msgid "NOTES"
+msgstr "注意"
 
 # type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-divert.8:78
 msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
+"追加する時は、デフォルトは B<--local> と B<--divert> I<E<lt>originalE<gt>."
+"distrib> である。削除する時は、B<--package> もしくは B<--local> と B<--"
+"divert> は指定されていれば一致していなければいけない。"
 
 # type: Plain text
-#: dpkg-scansources.1:29
-msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
-msgstr ""
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
+msgstr "B<dpkg-divert> ではディレクトリは退避できない。"
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-divert.8:86
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
+"共有ライブラリを退避する場合、注意すべきである。B<ldconfig>(8) はライブラリに"
+"埋め込まれている DT_SONAME フィールドに基づいて、シンボリックリンクを作成す"
+"る。ldconfig は退避させることができないためである (dpkg だけができる)。もし退"
+"避したライブラリと退避していないライブラリが同じ SONAME であれば、最終的にシ"
+"ンボリックリンクは退避したライブラリを指す。"
 
 # type: Plain text
-#: dpkg-scansources.1:44
-#, fuzzy
+#: dpkg-divert.8:91
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
-"B<注意:> B<apt> で使うのであれば、生成した Packages ファイルを B<gzip>(1) で"
-"圧縮する(Packages.gz を生成する)必要があるだろう。apt はローカルアクセス(つま"
-"り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
+"すべての I</usr/bin/example> を I</usr/bin/example.foo> に退避させる、つま"
+"り、I</usr/bin/example> を提供するすべてのパッケージに対して必要であれば I</"
+"usr/bin/example.foo> と変更してインストールさせる。"
 
-# type: TP
-#: dpkg-scansources.1:45 install-info.8:272
-#, no-wrap
-msgid "B<--debug>"
-msgstr "B<--debug>"
+# type: Plain text
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+msgstr "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
-msgstr ""
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
+msgstr "diversion を削除する。"
 
 # type: Plain text
-#: dpkg-scansources.1:49
-#, fuzzy
-msgid "Show the usage message and die."
-msgstr "利用方法を表示して正常終了する。"
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --rename --remove /usr/bin/example"
 
-# type: TP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-o>|B<--oknodo>"
+# type: Plain text
+#: dpkg-divert.8:101
+msgid ""
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
+msgstr ""
+"I</usr/bin/example> をインストールしようとするすべてのパッケージを I</usr/"
+"bin/example.foo> に退避、ただし自作の I<wibble> パッケージを除く。"
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-divert.8:103
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
+
+# type: Plain text
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 
 # type: TP
-#: dpkg-scansources.1:52
-#, fuzzy, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-p>|B<--pidfile> I<pid-file>"
+#: dpkg-divert.8:109
+#, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-divert.8:114
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
+"システムの現在の退避リストを含むファイル。これは dpkg で使われる重要なファイ"
+"ル `status' や `available' がある dpkg の管理ディレクトリにある。"
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-divert.8:117
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
+"注意: B<dpkg-divert> はこのファイルを更新する時に、古いバージョンを \"-old\" "
+"という名前をつけたファイルにコピーしておく。"
 
 # type: Plain text
-#: dpkg-scansources.1:63
-#, fuzzy
-msgid "Print the version number and exit."
-msgstr "バージョン情報を出力して終了する。"
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
+msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
-#: dpkg-scansources.1:66
-#, fuzzy
-msgid "B<dpkg-scanpackages>(1)."
+#: dpkg-genchanges.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-genchanges"
 msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
-msgstr ""
+#: dpkg-genchanges.1:4
+#, fuzzy
+msgid "dpkg-genchanges - generate Debian .changes files"
+msgstr "dpkg-scanpackages - Packages ファイルの作成"
 
 # type: Plain text
-#: dpkg-source.1:2
-#, fuzzy, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg-query"
+#: dpkg-genchanges.1:8
+#, fuzzy
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-genchanges.1:16
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:15
-#, fuzzy
+#: dpkg-genchanges.1:23
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-
-# type: Plain text
-#: dpkg-source.1:18
-#, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg> [I<options>] I<action>"
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:21
-#, fuzzy
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-deb actions>"
-
-# type: Plain text
-#: dpkg-source.1:24
-#, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: dpkg-genchanges.1:41 dpkg-source.1:137
+#, fuzzy, no-wrap
+msgid "B<-si>, B<-sa>, B<-sd>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:27
-#, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: dpkg-genchanges.1:49
+msgid ""
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:30
-#, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: dpkg-genchanges.1:57 dpkg-source.1:153
+msgid ""
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:33
-#, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg> [I<options>] I<action>"
+#: dpkg-genchanges.1:62 dpkg-source.1:158
+msgid ""
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:36
-#, fuzzy
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
-msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:42
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, fuzzy, no-wrap
+msgid "B<-T>I<substvarsfile>"
+msgstr "B<--fsys-tarfile>"
+
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
+msgstr ""
+
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+#, fuzzy, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+
+# type: Plain text
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+#, fuzzy, no-wrap
+msgid "B<-U>I<field>"
+msgstr "B<[--] >I<filename>"
+
 # type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<-t>|B<--test>"
+
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-genchanges.1:101
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
+#, fuzzy, no-wrap
+msgid "B<-c>I<controlfile>"
+msgstr "I<control>"
+
 # type: Plain text
-#: dpkg-source.1:80
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
+#, no-wrap
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-genchanges.1:115
 msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
-# type: SS
-#: dpkg-source.1:93 update-alternatives.8:290
+# type: TP
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
 #, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "共通オプション"
+msgid "B<-F>I<changelogformat>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:96
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:96
-#, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: dpkg-source.1:101
-msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+#: dpkg-genchanges.1:120
+#, no-wrap
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-genchanges.1:131
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:106
+#: dpkg-genchanges.1:131
 #, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<--version>"
+msgid "B<-q>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-source.1:114
+#: dpkg-genchanges.1:139
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-genchanges.1:155
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-gencontrol.1:1
 #, fuzzy, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B< >E<lt>長い説明E<gt>"
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-source.1:126
-msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:126
-#, no-wrap
-msgid "B<-m>I<maintaineraddress>"
-msgstr ""
+# type: Plain text
+#: dpkg-gencontrol.1:8
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:15
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:134
-#, no-wrap
-msgid "B<-e>I<maintaineraddress>"
+# type: Plain text
+#: dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:24
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:55
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<--show>, B<-W>"
+msgid "B<-p>I<package>"
+msgstr "B<--package>I< E<lt>packageE<gt>>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-gencontrol.1:62
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:62
+#, fuzzy, no-wrap
+msgid "B<-n>I<filename>"
+msgstr "B<[--] >I<filename>"
+
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-gencontrol.1:67
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:67
+#, fuzzy, no-wrap
+msgid "B<-is>, B<-ip>, B<-isp>"
+msgstr "B<--info>, B<-I>"
+
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-gencontrol.1:76
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:163
+#: dpkg-gencontrol.1:76
 #, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
+msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-gencontrol.1:89
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:169
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
 #, fuzzy, no-wrap
-msgid "B<-T>I<substvarsfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "B<-O>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-source.1:179
+#: dpkg-gencontrol.1:98
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:179
+# type: Plain text
+#: dpkg-gencontrol.1:106
 #, fuzzy, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<debian/control>"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-source.1:184
+#: dpkg-gencontrol.1:111
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:184
-#, fuzzy, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<[--] >I<filename>"
-
 # type: Plain text
-#: dpkg-source.1:189
+#: dpkg-gencontrol.1:118
 msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:189
-#, fuzzy, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr "B<-t>|B<--test>"
+# type: TH
+#: dpkg-name.1:6
+#, no-wrap
+msgid "dpkg-name"
+msgstr "dpkg-name"
 
 # type: Plain text
-#: dpkg-source.1:212
-msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
-msgstr ""
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
+msgstr "dpkg-name - Debian パッケージを完全なパッケージの名前に変更"
 
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
+
+# type: Plain text
+#: dpkg-name.1:27
+#, fuzzy
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
+"このマニュアルページでは、B<dpkg-name> シェルスクリプトについて説明する。"
+"B<dpkg-name> シェルスクリプトは、B<Debian> パッケージを完全なパッケージ名に、"
+"簡単に変更することができる。完全なパッケージ名とは、パッケージの control ファ"
+"イルで指定された情報から得られる E<lt>パッケージE<gt>_E<lt>バージョン"
+"E<gt>_E<lt>アーキテクチャE<gt>.deb という名前である。E<lt>バージョンE<gt> の"
+"部分は、上流のバージョン情報にハイフン、そしてリビジョン情報が続いたものであ"
+"る。"
 
 # type: TP
-#: dpkg-source.1:217
+#: dpkg-name.1:29
 #, fuzzy, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "I<control>"
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<-a, --no-architecture>"
 
 # type: Plain text
-#: dpkg-source.1:224
-msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
-msgstr ""
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
+msgstr "変更後のファイル名にアーキテクチャ情報を含ませない。"
 
 # type: TP
-#: dpkg-source.1:224
-#, no-wrap
-msgid "B<-l>I<changelogfile>"
-msgstr ""
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<-k, --symlink>"
+
+# type: Plain text
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
+msgstr "移動するかわりにシンボリックリンクを作る。"
+
+# type: TP
+#: dpkg-name.1:35
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<-o, --overwrite>"
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-name.1:39
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
-msgstr ""
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
+msgstr "変更後のファイル名と同名のファイルがあれば、それを上書きしてしまう。"
 
 # type: TP
-#: dpkg-source.1:231
+#: dpkg-name.1:39
 #, fuzzy, no-wrap
-msgid "B<-f>I<fileslistfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<-s, --subdir> [I<dir>]"
 
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-name.1:51
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
+"ファイルをサブディレクトリに移動する。もし引数で指定したディレクトリが存在す"
+"れば、パッケージの control のセクションフィールドから得られたターゲットディレ"
+"クトリの名前のかわりにそのディレクトリにファイルを移動する。通常、ターゲット"
+"ディレクトリは `unstable/binary-E<lt>アーキテクチャE<gt>/E<lt>セクション"
+"E<gt>' である。もし control でのセクション情報がない場合は `no-section' とみ"
+"なされる。そしてこの場合、`non-free' や `contrib' セクションの時と同様にター"
+"ゲットディレクトリは `E<lt>セクションE<gt>/binary-E<lt>アーキテクチャE<gt>' "
+"になる。セクションフィールドは必須ではないので多くのパッケージが `no-"
+"section' の場所にいってしまうだろう。このオプションを使う時は注意すること。厄"
+"介である。"
 
 # type: TP
-#: dpkg-source.1:237
-#, no-wrap
-msgid "B<-F>I<changelogformat>"
-msgstr ""
+#: dpkg-name.1:51
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-c, --create-dir>"
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-name.1:56
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
+"このオプションは -s オプションとともに使うことができる。ターゲットディレクト"
+"リがなければ、自動的に作成される。B<このオプションを使う時は注意すること。>"
+
+# type: TP
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<-v, --version>"
 
 # type: TP
-#: dpkg-source.1:244
+#: dpkg-name.1:62
 #, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<-B>"
+msgid "B<-l>, B<--license>"
+msgstr "B<-l, --license>"
+
+# type: TP
+#: dpkg-name.1:67
+#, no-wrap
+msgid "B<dpkg-name bar-foo.deb>"
+msgstr "B<dpkg-name bar-foo.deb>"
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-name.1:72
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
+"ファイル `bar-foo.deb' が bar-foo_1.0-2_i386.deb のような感じに変更される。"
+"(実際にどうなるかは `bar-foo.deb' の中の control の情報に依存する)"
 
 # type: TP
-#: dpkg-source.1:251
-#, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<-B>"
+#: dpkg-name.1:72
+#, no-wrap
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-name.1:77
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
+"ディレクトリ /root/debian 以下にあり拡張子が `deb' の全てのファイルを dpkg-"
+"name を使ってアーキテクチャ情報なしの名前に変更する。"
 
-# type: SH
-#: dpkg-source.1:257
-#, fuzzy, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "その他のオプション"
+# type: TP
+#: dpkg-name.1:77
+#, no-wrap
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-name.1:83
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
+"B<やってはいけない!> 多くのパッケージはセクション情報をもっていないので、あな"
+"たのアーカイブはぐちゃぐちゃになってしまうだろう。B<やってはいけない!>"
 
 # type: TP
-#: dpkg-source.1:262
-#, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<-B>"
+#: dpkg-name.1:83
+#, no-wrap
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 
 # type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
-msgstr ""
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
+msgstr "これは新しいパッケージを作る時に使うことができる。"
 
 # type: Plain text
-#: dpkg-source.1:280
+#: dpkg-name.1:96
 msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
+"パッケージによっては E<lt>パッケージE<gt>_E<lt>バージョンE<gt>_E<lt>アーキテ"
+"クチャE<gt>.deb という名前ではない。 dpkg-name によって改名されたパッケージは"
+"このような名前になる。一般には、これは B<dselect>(1)/ B<dpkg>(1) によってパッ"
+"ケージがどのようにインストールされたかには影響はないが、この名前構造に依存し"
+"ているインストールツールによっては影響があるかもしれない。"
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-name.1:104
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 msgstr ""
-
-# type: TP
-#: dpkg-source.1:288
-#, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<-B>"
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 
 # type: Plain text
-#: dpkg-source.1:303
+#: dpkg-name.1:111
 msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 
-# type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+# type: Plain text
+#: dpkg-parsechangelog.1:1
 #, fuzzy, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
-msgstr ""
+#: dpkg-parsechangelog.1:4
+#, fuzzy
+msgid "dpkg-parsechangelog - parse Debian changelog files"
+msgstr "dpkg-scanpackages - Packages ファイルの作成"
+
+# type: Plain text
+#: dpkg-parsechangelog.1:8
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-parsechangelog.1:14
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+#: dpkg-parsechangelog.1:26
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<--remove>I< E<lt>fileE<gt>>"
+msgid "B<-L>I<libdir>"
+msgstr "B<[--] >I<filename>"
 
 # type: Plain text
-#: dpkg-source.1:330
-msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:330
+#: dpkg-parsechangelog.1:41
 #, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:345
-msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:357
+#: dpkg-parsechangelog.1:47
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:368
-msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
-msgstr ""
+#: dpkg-query.1:1
+#, no-wrap
+msgid "dpkg-query"
+msgstr "dpkg-query"
 
 # type: Plain text
-#: dpkg-source.1:377
-msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
-msgstr ""
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
+msgstr "dpkg-query - dpkg データベース問い合わせツール"
 
 # type: Plain text
-#: dpkg-source.1:406
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
-msgstr ""
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-query.1:12
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
+"B<dpkg-query> は、B<dpkg> データベースから、パッケージの情報を表示するツール"
+"である。"
 
 # type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
-msgstr ""
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<-l> | B<--list> I<package-name-pattern> ..."
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-query.1:23
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
+"指定したパターンにマッチする名前のパッケージを表示する。 I<package-name-"
+"pattern> を指定しない場合は、 I</var/lib/dpkg/status> にある、purge 状態に"
+"マークされていないすべてのパッケージの一覧を表示する。I<package-name-"
+"pattern> には、標準的なシェルのワイルド文字を使用することができる。ただし、"
+"シェルにファイル名展開をさせないように、I<package-name-pattern> をクオートす"
+"る必要があることに注意していただきたい。例えば次のコマンドは、名前が "
+"``libc6'' で始まるすべてのパッケージを表示する。"
 
 # type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
-msgstr ""
+#: dpkg-query.1:27
+#, no-wrap
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-query.1:33
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
+"この出力形式は変更可能ではないが、端末の横幅に合うように自動的に調整される。"
+"この出力は人間に読みやすいものであり、機械に読ませるのには向かない。出力形式"
+"の設定方法については、 B<-W> (B<--show>) と B<--showformat> を参照。"
+
+# type: TP
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<-W> | B<--show> I<package-name-pattern> ..."
 
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-query.1:40
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
+"B<--list> オプションと同様に、指定したパターンにマッチするすべてのパッケージ"
+"を表示する。さらに、このオプションの出力は、 B<--showformat> オプションによっ"
+"てカスタマイズすることができる。デフォルトの出力形式は、マッチしたパッケージ"
+"ごとに 1 行となる。それぞれの行は、パッケージ名とインストールしたバージョンが"
+"タブ区切りで含まれる。"
 
-# type: SH
-#: dpkg-source.1:435
+# type: TP
+#: dpkg-query.1:40
 #, fuzzy, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "その他のオプション"
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-s> | B<--status> I<package-name> ..."
 
 # type: Plain text
-#: dpkg-source.1:438
-#, fuzzy
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-msgstr "B<822-date> には引数やオプションはない。"
+#: dpkg-query.1:44
+msgid ""
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
+msgstr ""
+"指定したパッケージの状況を報告する。これは、インストール済みパッケージ状況"
+"データベースからの内容を表示しているだけである。"
 
 # type: TP
-#: dpkg-source.1:438
+#: dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<--package>I< E<lt>packageE<gt>>"
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<-L> | B<--listfiles> I<package-name> ..."
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-query.1:49
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
+"B<package-name> によってインストールしたファイルを表示する。ただし、パッケー"
+"ジ付属のインストールスクリプトによって作成されたファイルは表示されないことに"
+"注意すること。"
 
 # type: TP
-#: dpkg-source.1:445
+#: dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<[--] >I<filename>"
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<-S> | B<--search> I<filename-search-pattern> ..."
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-query.1:55
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
+"指定したファイルがどのパッケージからインストールされたかを探す。パターンに"
+"は、標準的なシェルのすべてのワイルド文字を使用することができる。このコマンド"
+"では、メンテナスクリプトで作成された追加ファイルや、 alternatives は探すこと"
+"ができない。"
 
 # type: TP
-#: dpkg-source.1:450
+#: dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-p> |B<--print-avail> I<package-name>"
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-query.1:59
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
+"I</var/lib/dpkg/available> にある I<package-name> に関する情報を表示する。"
 
 # type: TP
-#: dpkg-source.1:459
+#: dpkg-query.1:74
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-f> | B<--showformat=>I<format>"
+
+# type: Plain text
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+msgstr "フォーマット文字列中では、\\(lqB<\\e>\\(rq はエスケープ文字である:"
+
+# type: Plain text
+#: dpkg-query.1:87
 #, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+msgid ""
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
+"    B<\\en>  改行\n"
+"    B<\\er>  キャリッジリターン\n"
+"    B<\\et>  タブ\n"
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-query.1:92
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
-
-# type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
-#, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<-B>"
+"前に \\(lqB<\\e>\\(rq を置くことで、続くあらゆる文字の意味を抑制できる。"
+"\\(lqB<\\e>\\(rq や \\(lqB<$>\\(rq のために有用である。"
 
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-query.1:98
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
+"パッケージ情報には、パッケージフィールドを参照する変数を含めることができる。"
+"その変数の構文は、\\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq となる。それぞれ"
+"のフィールドは右寄せで表示されるが、width に負の値を指定すると左寄せになる。"
+"以下の I<field> は認識される:"
 
-# type: SH
-#: dpkg-source.1:482
+# type: Plain text
+#: dpkg-query.1:129
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-query.1:137
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
+"デフォルトのフォーマット文字列は  \\(lqB<${Package}\\et${Version}\\en>\\(rq "
+"である。実際には、status ファイルに含まれる他のすべてのフィールド(つまり、"
+"ユーザ定義フィールド)も指定することができる。これらはそのまま表示される。変換"
+"やエラーチェックはされない。dpkg のメンテナとインストールされているバージョン"
+"を得るには、これを実行する:"
 
-# type: TP
-#: dpkg-source.1:487
-#, fuzzy, no-wrap
-msgid "B<-e>I<executable>"
-msgstr "B<-x>|B<--exec> I<executable>"
+# type: Plain text
+#: dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+
+# type: SH
+#: dpkg-query.1:143
+#, no-wrap
+msgid "ENVIRONMENT"
+msgstr "環境変数"
 
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-query.1:148
 msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
-msgstr ""
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
+msgstr "設定すると、B<--list> オプションによる出力の横幅を変更する。"
 
-# type: TP
-#: dpkg-source.1:491
+# type: Plain text
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr "Copyright 2001 Wichert Akkerman"
+
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
-msgid "B<-d>I<dependencyfield>"
-msgstr ""
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: dpkg-source.1:497
-msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
-msgstr ""
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
+
+# type: TH
+#: dpkg-scanpackages.1:16
+#, no-wrap
+msgid "dpkg-scanpackages"
+msgstr "dpkg-scanpackages"
+
+# type: Plain text
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
+msgstr "dpkg-scanpackages - Packages ファイルの作成"
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-scanpackages.1:28
+#, fuzzy
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
+"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
+"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-scanpackages.1:41
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
+"B<dpkg-scanpackages> は Debian バイナリパッケージのツリーを見て Packages ファ"
+"イルを生成する。Packages ファイルは B<apt>(8) や B<dselect>(1) などに、どの"
+"パッケージがインストールできるかをユーザに知らせるために利用している。これら"
+"の Packages ファイルは Debian アーカイブサイトや CD-ROM などで使われているも"
+"のと同じものである。もし、たくさんのマシンにインストールしたいローカルなパッ"
+"ケージのディレクトリを作るなら、自分で B<dpkg-scanpackages> を使うことができ"
+"る。"
 
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+# type: Plain text
+#: dpkg-scanpackages.1:51
+msgid ""
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
+"B<注意:> B<apt> で使うのであれば、生成した Packages ファイルを B<gzip>(1) で"
+"圧縮する(Packages.gz を生成する)必要があるだろう。apt はローカルアクセス(つま"
+"り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-scanpackages.1:58
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
+"I<binarydir> は処理するバイナリパッケージのツリーの名前である(例えば "
+"B<contrib/binary-i386> など)。Debian アーカイブのルートからの相対にしておくの"
+"が最もいい方法である。なぜなら Packages ファイルに含まれている各々の "
+"Filename フィールドはこの文字列で始まるからである。"
 
-# type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+# type: Plain text
+#: dpkg-scanpackages.1:62
+msgid ""
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
+"I<overridefile> はパッケージがディストリビューションに合うようにするための情"
+"報を含んでいるファイルの名前である。以下を参照のこと。"
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-scanpackages.1:65
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
+"I<pathprefix> は Filename フィールドで前に追加できるオプションの文字列であ"
+"る。"
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:69
+#, fuzzy
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
+"2 つ以上のバージョンのパッケージがあれば、最新の 1 つだけが出力に含まれる。同"
+"一のバージョンでアーキテクチャだけが異なる場合は、最初の 1 つだけが使用され"
+"る。この動きは B<-m> スイッチで変更できる。このスイッチが指定された場合は、み"
+"つかったパッケージすべてが出力に含まれる。"
 
 # type: TP
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:71
 #, fuzzy, no-wrap
-msgid "B<-t>I<type>"
-msgstr "B<-t>|B<--test>"
-
-# type: Plain text
-#: dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr ""
+msgid "B<-u>, B<--udeb>"
+msgstr "B<--show>, B<-W>"
 
 # type: Plain text
-#: dpkg-source.1:552
+#: dpkg-scanpackages.1:74
 #, fuzzy
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
-msgstr "B<822-date> には引数やオプションはない。"
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
+msgstr "B<-u> を指定した場合は、*.deb の代わりに *.udeb をスキャンする。"
 
 # type: TP
-#: dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<path>"
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<-B>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:571
-#, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
+#, fuzzy, no-wrap
+msgid "DIAGNOSTICS"
 msgstr ""
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"診断\n"
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"診断メッセージ"
 
 # type: Plain text
-#: dpkg-source.1:574
-#, fuzzy
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr "B<822-date> には引数やオプションはない。"
-
-# type: TP
-#: dpkg-source.1:574
-#, no-wrap
-msgid "B<-k>I<key-id>"
+#: dpkg-scanpackages.1:94
+msgid ""
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
+"B<dpkg-scanpackages> は通常の自己説明的なエラーを出力する。パッケージが間違っ"
+"たディレクトリにある、複数ある、control ファイルに Filename フィールドがあ"
+"る、override ファイルにない、実行されなかったメンテナの置換があるなどといった"
+"警告もする。"
 
 # type: Plain text
-#: dpkg-source.1:577
+#: dpkg-scanpackages.1:99
 #, fuzzy
-msgid "Specify a key-ID to use when signing packages."
-msgstr "これは新しいパッケージを作る時に使うことができる。"
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
 
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
+# type: TH
+#: dpkg-scansources.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-scansources"
+msgstr "dpkg-scanpackages"
+
+# type: Plain text
+#: dpkg-scansources.1:4
+msgid ""
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scansources.1:13
+#, fuzzy
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
+"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
+"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
 
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
+# type: Plain text
+#: dpkg-scansources.1:18
+msgid ""
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scansources.1:29
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:628
-#, fuzzy, no-wrap
-msgid "B<-tc>"
-msgstr "B<-B>"
+# type: Plain text
+#: dpkg-scansources.1:33
+msgid ""
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scansources.1:44
+#, fuzzy
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
+"B<注意:> B<apt> で使うのであれば、生成した Packages ファイルを B<gzip>(1) で"
+"圧縮する(Packages.gz を生成する)必要があるだろう。apt はローカルアクセス(つま"
+"り B<file://> ソース)以外での非圧縮の Packages ファイルを無視する。"
 
 # type: TP
-#: dpkg-source.1:634
+#: dpkg-scansources.1:46
 #, fuzzy, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<--show>, B<-W>"
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: dpkg-scansources.1:49
+msgid ""
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
+#: dpkg-scansources.1:49
 #, fuzzy, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<-a, --no-architecture>"
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 # type: Plain text
-#: dpkg-source.1:642
+#: dpkg-scansources.1:52
 msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:651
-#, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<-B>"
+#: dpkg-scansources.1:58 install-info.8:272
+#, no-wrap
+msgid "B<--debug>"
+msgstr "B<--debug>"
 
 # type: Plain text
-#: dpkg-source.1:654
-#, fuzzy
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
-msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
+msgstr ""
 
-# type: TP
-#: dpkg-source.1:654
-#, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<-B>"
+# type: TH
+#: dpkg-scansources.1:68
+#, fuzzy
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: dpkg-source.1:657
-#, fuzzy
-msgid "Do not check build dependencies and conflicts."
-msgstr "dpkg-checkbuilddeps - ビルド依存と衝突のチェック"
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+msgstr ""
 
-# type: TP
-#: dpkg-source.1:657
+# type: Plain text
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
 #, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<-B>"
+msgid "dpkg-shlibdeps"
+msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-shlibdeps.1:35
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-shlibdeps.1:41
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:674
-#, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
-msgstr ""
+# type: TP
+#: dpkg-shlibdeps.1:41
+#, fuzzy, no-wrap
+msgid "B<-e>I<executable>"
+msgstr "B<-x>|B<--exec> I<executable>"
 
 # type: Plain text
-#: dpkg-source.1:677
-#, fuzzy
+#: dpkg-shlibdeps.1:45
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
-msgstr "B<822-date> には引数やオプションはない。"
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
+msgstr ""
 
-# type: SH
-#: dpkg-source.1:677
+# type: TP
+#: dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-shlibdeps.1:51
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:61
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:69
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:714
-msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+
+# type: TP
+#: dpkg-shlibdeps.1:69
+#, no-wrap
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-shlibdeps.1:80
+msgid ""
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:716
-#, fuzzy, no-wrap
-msgid "B<Arch>"
-msgstr "B<-h>"
-
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:86
+msgid ""
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:720
+#: dpkg-shlibdeps.1:86
 #, fuzzy, no-wrap
-msgid "B<source:Version>"
-msgstr "B<--version>"
+msgid "B<-t>I<type>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-source.1:723
-#, fuzzy
-msgid "The source package version."
-msgstr "パッケージの短い説明文"
+#: dpkg-shlibdeps.1:93
+msgid ""
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:93
 #, no-wrap
-msgid "B<source:Upstream-Version>"
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:99
 msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:727
-#, fuzzy, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<--version>"
-
 # type: Plain text
-#: dpkg-source.1:731
+#: dpkg-shlibdeps.1:105
 msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:731
-#, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<--version>"
+#: dpkg-shlibdeps.1:117
+#, no-wrap
+msgid "B<debian/shlibs.local>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:736
-msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:736
+#: dpkg-shlibdeps.1:120
 #, fuzzy, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<installed>"
+msgid "B</etc/dpkg/shlibs.override>"
+msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dpkg-source.1:745
-msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:745
+#: dpkg-shlibdeps.1:123
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B</etc/dpkg/shlibs.default>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:754
-msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:754
+# type: Plain text
+#: dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<[--] >I<filename>"
+msgid "dpkg-source"
+msgstr "dpkg-query"
+
+# type: Plain text
+#: dpkg-source.1:6
+#, fuzzy
+msgid "dpkg-source, - Debian source package tools"
+msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
+
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
+
+# type: Plain text
+#: dpkg-source.1:15
+#, fuzzy
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
+msgstr "B<dpkg-deb> は、Debian アーカイブの作成、展開、情報の表示をする。"
 
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-source.1:19
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:761
+#: dpkg-source.1:21
 #, no-wrap
-msgid "B<Format>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:771
+#: dpkg-source.1:31
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:771
-#, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
+# type: Plain text
+#: dpkg-source.1:37
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-source.1:45
+msgid ""
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:774
-#, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
-msgstr ""
+# type: Plain text
+#: dpkg-source.1:45
+#, fuzzy, no-wrap
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:60
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:779
-#, fuzzy, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:75
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-source.1:82
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
-#, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:118
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "deb-control"
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:137
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:794
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B<debian/changelog>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:173
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:800
-#, fuzzy, no-wrap
-msgid "B<debian/files>"
-msgstr "B<infodesc>"
+# type: Plain text
+#: dpkg-source.1:185
+msgid ""
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:196
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, fuzzy, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<deinstall>"
+# type: Plain text
+#: dpkg-source.1:205
+msgid ""
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:816
-#, fuzzy
-msgid "List of substitution variables and values."
-msgstr "使用できるパッケージの一覧。"
+#: dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:816
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B<debian/shlibs.local>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:819
-#, fuzzy, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
-msgstr "I</var/lib/dpkg/statoverride>"
-
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:822
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
+# type: Plain text
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:258
+msgid ""
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:263
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:274
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6727,48 +6879,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
-msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:845
+#: dpkg-source.1:279
 #, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
 
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:849
-#, fuzzy
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr "Copyright (C) 1995 Ian Jackson."
-
-# type: Plain text
-#: dpkg-source.1:851
-#, fuzzy
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr "Copyright 2000 Wichert Akkerman"
-
-# type: Plain text
-#: dpkg-source.1:857
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO warranty."
-
 # type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
@@ -6782,42 +6899,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-deb - Debian パッケージアーカイブ (.deb) 操作ツール"
 
 # type: Plain text
-#: dpkg-split.1:9
-#, fuzzy
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-
-# type: Plain text
-#: dpkg-split.1:13
-#, fuzzy
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-
-# type: TP
-#: dpkg-split.1:17
-#, fuzzy
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr ""
-
-# type: TP
-#: dpkg-split.1:24
-#, fuzzy
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg-query> B<--licence>|B<--license>"
-
-# type: TP
-#: dpkg-split.1:28
+#: dpkg-split.1:10
 #, fuzzy
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6825,14 +6913,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6841,26 +6929,26 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:49
+# type: Plain text
+#: dpkg-split.1:33
 #, fuzzy, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 #, fuzzy
 msgid "Splits a single Debian binary package into several parts."
 msgstr "deb-old - Debian バイナリパッケージ旧形式フォーマット"
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6868,27 +6956,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
-# type: TP
-#: dpkg-split.1:68
+# type: Plain text
+#: dpkg-split.1:52
 #, fuzzy, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--info>, B<-I>"
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6896,7 +6984,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6904,17 +6992,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
+# type: TP
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6922,25 +7016,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:92
-#, fuzzy, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--info>, B<-I>"
+#: dpkg-split.1:76
+#, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6948,21 +7042,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6970,18 +7064,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 #, fuzzy, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--list> I<link>"
+msgid "B<-l>, B<--listq>"
+msgstr "B<-l, --license>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -6989,103 +7083,77 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 #, fuzzy, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--build>, B<-b>"
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: dpkg-split.1:148
-#, fuzzy
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-"B<dpkg-deb> の使用方法、つまりすべてのオプションとその使い方の要約を表示す"
-"る。"
-
-# type: Plain text
-#: dpkg-split.1:153
-#, fuzzy
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "B<dpkg-deb> のバージョン番号を表示する。"
-
-# type: Plain text
-#: dpkg-split.1:160
-#, fuzzy
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-"B<dpkg-deb> の著作権と無保証に関する情報を表示する(アメリカ式の綴りである "
-"B<--license> もサポートしている)。"
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, fuzzy, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--altdir> I<directory>"
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:166
-#, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
-msgstr ""
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
+msgstr "B<-a>|B<--startas> I<pathname>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 #, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 #, fuzzy, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--build>, B<-b>"
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -7094,19 +7162,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -7114,20 +7182,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "終了ステータス"
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -7135,14 +7203,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -7150,28 +7218,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -7179,19 +7247,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -7199,13 +7267,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 #, fuzzy
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 #, fuzzy
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
@@ -7237,26 +7305,12 @@ msgstr "dpkg-statoverride - ファイルの所有権やモードを変更する"
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-
-# type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr ""
-"B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg> [I<options>] I<action>"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -7273,7 +7327,7 @@ msgstr ""
 "定のグループのみに実行許可を与えるようにしたりできる。"
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -7282,19 +7336,20 @@ msgstr ""
 "る。 override を追加・削除・表示するという、3 つの基本機能がある。"
 
 # type: TP
-#: dpkg-statoverride.8:34
-#, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#: dpkg-statoverride.8:25
+#, fuzzy, no-wrap
+msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
+#, fuzzy
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 "B<E<lt>fileE<gt>> の override を追加する。 B<E<lt>fileE<gt>> はコマンドの実行"
 "時には存在していなくてもよい。override は保存され、後で用いられる。ユーザとグ"
@@ -7302,37 +7357,33 @@ msgstr ""
 "`B<#>' 文字をつけた数字(例えば B<#0> とか B<#65534> とか)でも指定できる。"
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
+#, fuzzy
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 "--update を指定し、B<E<lt>fileE<gt>> が存在する場合は、すぐにその所有者とモー"
 "ドを新しい値に変更する。"
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--remove>I< E<lt>fileE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
+#, fuzzy
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 "B<E<lt>fileE<gt>> の override を削除する。B<E<lt>fileE<gt>> の状態はこのコマ"
 "ンドでは変化しない。"
 
 # type: TP
-#: dpkg-statoverride.8:48
-#, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+#: dpkg-statoverride.8:39
+#, fuzzy, no-wrap
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<E<lt>glob-patternE<gt>>]"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
@@ -7342,14 +7393,23 @@ msgstr ""
 "override のみを出力する。override が全くない場合や、glob にマッチするものがひ"
 "とつもなかった場合は、B<dpkg-statoverride> は終了コード 1 で終了する。"
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+"dpkg データベースのディレクトリを変更する。statoverride のファイルもここに保"
+"存される。デフォルトは I</var/lib/dpkg>。"
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
@@ -7358,13 +7418,13 @@ msgstr ""
 "既存の override を変更する場合には、これを指定する必要がある。"
 
 # type: TP
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
@@ -7372,43 +7432,18 @@ msgstr ""
 "る。"
 
 # type: Plain text
-#: dpkg-statoverride.8:64
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "動作を無口に行う。"
 
-# type: Plain text
-#: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr "利用方法に関する情報を表示する。"
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr "バージョンと著作権に関する情報を表示する。"
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr "B<--admindir>"
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
-msgstr ""
-"dpkg データベースのディレクトリを変更する。statoverride のファイルもここに保"
-"存される。デフォルトは I</var/lib/dpkg>。"
-
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -7419,7 +7454,7 @@ msgstr ""
 "しょに置かれる。"
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
@@ -7428,7 +7463,7 @@ msgstr ""
 "\"-old\" を追加した名前で保存する。"
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
 
@@ -7523,6 +7558,12 @@ msgstr ""
 "はコマンドラインオプションからダッシュを除いたもの) か、コメント (行が B<#> "
 "で始まる場合) を記述する。"
 
+# type: TP
+#: dselect.1:52
+#, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir>I< E<lt>directoryE<gt>>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7754,6 +7795,16 @@ msgid ""
 "successfully."
 msgstr "B<dselect> の著作権情報とライセンス情報を表示し、正常終了する。"
 
+# type: Plain text
+#: dselect.1:131
+#, fuzzy
+msgid "Print version information and exit successfully."
+msgstr ""
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"バージョン情報を表示し、正常終了する。\n"
+"#-#-#-#-#  ja.po (dpkg man pages)  #-#-#-#-#\n"
+"バージョン情報を表示して正常終了する。"
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -9071,27 +9122,13 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr "start-stop-daemon - システムデーモンプログラムの起動、停止"
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
 
 # type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -9103,15 +9140,40 @@ msgstr ""
 "定することで、実行中のプロセスを見つけることができる。"
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:36
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
+msgstr ""
+"注意: B<--pidfile> を指定しない場合、B<start-stop-daemon> は B<killall>(1) と"
+"似た動きをする。B<start-stop-daemon> は、(指定されていれば)プロセス名、uid、"
+"および gid にマッチするプロセスをプロセステーブルから検索する。B<--start> が"
+"指定されている場合にマッチするプロセスがあれば、デーモンは起動されない。B<--"
+"stop> が指定されていれば、マッチするプロセスすべてに KILL シグナルが送られ"
+"る。そのため、B<--stop> を与えられても生き延びる必要があるような、長生きする"
+"子プロセスを持つデーモンには、 pidfile を指定しなければならない。"
+
+# type: Plain text
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
+
+# type: Plain text
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 "B<--start> を使用すると、 B<start-stop-daemon> は指定されたプロセスが存在する"
 "かを調べる。該当するプロセスが存在する場合、 B<start-stop-daemon> は何もせ"
@@ -9121,15 +9183,22 @@ msgstr ""
 "ンドライン上で B<--> 以降に与えられた任意の引数は起動されるプログラムにそのま"
 "ま引き渡される。"
 
+# type: TP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-o>|B<--oknodo>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 "B<--stop> を使用すると、 B<start-stop-daemon> は指定されたプロセスが存在する"
 "かを調べる。該当するプロセスが存在する場合、 B<start-stop-daemon> は B<--"
@@ -9139,33 +9208,38 @@ msgstr ""
 "B<--retry> を指定した場合、B<start-stop-daemon> はそのプロセスが終了したこと"
 "を確認する。"
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-H>|B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
-msgstr ""
-"注意: B<--pidfile> を指定しない場合、B<start-stop-daemon> は B<killall>(1) と"
-"似た動きをする。B<start-stop-daemon> は、(指定されていれば)プロセス名、uid、"
-"および gid にマッチするプロセスをプロセステーブルから検索する。B<--start> が"
-"指定されている場合にマッチするプロセスがあれば、デーモンは起動されない。B<--"
-"stop> が指定されていれば、マッチするプロセスすべてに KILL シグナルが送られ"
-"る。そのため、B<--stop> を与えられても生き延びる必要があるような、長生きする"
-"子プロセスを持つデーモンには、 pidfile を指定しなければならない。"
+#: start-stop-daemon.8:76
+#, fuzzy
+msgid "Show usage information and exit."
+msgstr "利用方法に関する情報を表示する。"
+
+# type: TP
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "バージョンと著作権に関する情報を表示する。"
 
 # type: TP
-#: start-stop-daemon.8:90
-#, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<executable>"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -9173,48 +9247,48 @@ msgstr ""
 "(B</proc/>I<pid>B</exe> により)指定された executable のプロセスを調べる。"
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>|B<--pidfile> I<pid-file>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "I<pid-file> で指定されるプロセス ID を持つプロセスを調べる。"
 
 # type: TP
-#: start-stop-daemon.8:98
-#, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>|B<--user> I<username>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 "I<username> または I<uid> で指定されるユーザが所有するプロセスを調べる。"
 
 # type: TP
-#: start-stop-daemon.8:104
-#, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>|B<--group> I<group>|I<gid>"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "プロセスを開始する時点で、I<group> や I<gid> を変更する。"
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<process-name>"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -9222,13 +9296,13 @@ msgstr ""
 "(B</proc/>I<pid>B</stat> により) I<process-name> という名のプロセスを調べる。"
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<signal>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -9237,13 +9311,13 @@ msgstr ""
 "る (デフォルトは 15)。"
 
 # type: TP
-#: start-stop-daemon.8:118
-#, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>|B<--retry> I<timeout>|I<schedule>"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -9256,7 +9330,7 @@ msgstr ""
 "が実行される。"
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -9267,7 +9341,7 @@ msgstr ""
 "指定されるシグナルである。"
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -9282,7 +9356,7 @@ msgstr ""
 "ことを意味する。"
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -9293,13 +9367,13 @@ msgstr ""
 "れば、 B<--signal> で指定したシグナルは無視される。"
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<pathname>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -9309,13 +9383,13 @@ msgstr ""
 "トになる。"
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -9324,37 +9398,37 @@ msgstr ""
 "の処理は行わない。"
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "処理が何も行われない(又は、行なわれようともしなかった)場合、終了ステータス 1 "
 "のかわりに 0 を返す。"
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr "参考情報を出力しない。エラーメッセージのみ表示。"
 
 # type: TP
-#: start-stop-daemon.8:183
-#, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c>|B<--chuid> I<username>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -9374,13 +9448,13 @@ msgstr ""
 "する場合にのみ使用する。"
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -9389,13 +9463,13 @@ msgstr ""
 "chroot 後に、書き出されることに注意すること。"
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<path>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -9406,13 +9480,13 @@ msgstr ""
 "stop-daemon は、プロセスを開始する前に root ディレクトリに chdir する。"
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -9431,35 +9505,35 @@ msgstr ""
 "使用を意図している。"
 
 # type: TP
-#: start-stop-daemon.8:226
-#, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+#: start-stop-daemon.8:217
+#, fuzzy, no-wrap
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<int>"
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "プロセスを開始する前にプロセスのプライオリティを変更する。"
 
 # type: TP
-#: start-stop-daemon.8:229
-#, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+#: start-stop-daemon.8:220
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>|B<--umask> I<mask>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr "プロセスを開始する前にプロセスの umask を設定する。"
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -9478,40 +9552,18 @@ msgstr ""
 "用である。"
 
 # type: TP
-#: start-stop-daemon.8:247
-#, no-wrap
-msgid "B<-v>|B<--verbose>"
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "詳しい情報を出力する。"
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr "ヘルプ情報を出力して終了する。"
-
-# type: TP
-#: start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
 # type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr "バージョン情報を出力して終了する。"
-
-# type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -9521,7 +9573,7 @@ msgstr ""
 "成。"
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -9535,12 +9587,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -9550,56 +9596,13 @@ msgstr ""
 "する"
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr "B<update-alternatives> [I<options>] B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--auto> I<name>"
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--display> I<name>"
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--list> I<name>"
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--config> I<name>"
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr "B<update-alternatives> [I<options>] B<--set> I<name path>"
-
-# type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -9608,7 +9611,7 @@ msgstr ""
 "ンクを生成・削除・管理したり、リンクの情報を表示したりする。"
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -9625,7 +9628,7 @@ msgstr ""
 "抱えることになる。"
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -9649,7 +9652,7 @@ msgstr ""
 "alternatives システムはその設定を変更しない。"
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -9666,7 +9669,7 @@ msgstr ""
 "る。"
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -9680,7 +9683,7 @@ msgstr ""
 "Debian パッケージの B<postinst> または B<prerm> スクリプトから呼び出される。"
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -9699,7 +9702,7 @@ msgstr ""
 "関連づけされた slave とは、 I<リンクグループ> を形成する。"
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -9715,7 +9718,7 @@ msgstr ""
 "ステムはリンクを変更しない。システム管理者が行った決定がずっと保存される。"
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -9729,7 +9732,7 @@ msgstr ""
 "モードに切り換わる。"
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -9740,7 +9743,7 @@ msgstr ""
 "る選択肢になる。"
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -9758,7 +9761,7 @@ msgstr ""
 "は、 I<--auto> オプションを用いる必要がある。"
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
@@ -9767,7 +9770,7 @@ msgstr ""
 "照)。"
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -9776,13 +9779,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "用語"
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -9791,13 +9794,13 @@ msgstr ""
 "明し、動作の理解の助けとしたい。"
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr "一般名 (generic name)"
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -9806,13 +9809,13 @@ msgstr ""
 "つ複数のファイルのどれかひとつを参照する。"
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr "symlink"
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -9822,13 +9825,13 @@ msgstr ""
 "クを意味する。システム管理者が調整の対象とするものである。"
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr "選択肢 (alternative)"
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -9837,24 +9840,24 @@ msgstr ""
 "らアクセスされるようにできる。"
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr "alternatives ディレクトリ"
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr "symlink を保持するディレクトリ。デフォルトは I</etc/alternatives>。"
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr "administrative ディレクトリ"
 
 # type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -9863,24 +9866,24 @@ msgstr ""
 "lib/dpkg/alternatives>。"
 
 # type: TP
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr "リンクグループ"
 
 # type: Plain text
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr "関連する symlink のセット。グループごと更新するためのもの。"
 
 # type: TP
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr "master リンク"
 
 # type: Plain text
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
@@ -9888,26 +9891,26 @@ msgstr ""
 "リンクグループに属するリンクで、グループの他のリンクの設定を決定するもの。"
 
 # type: TP
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr "slave リンク"
 
 # type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
 msgstr ""
 "リンクグループに属するリンクで、 master リンクの設定によって制御されるもの。"
 
 # type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr "automatic モード"
 
 # type: Plain text
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -9918,13 +9921,13 @@ msgstr ""
 "整は alternatives システムが自動的に行う。"
 
 # type: TP
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr "manual モード"
 
 # type: Plain text
-#: update-alternatives.8:245
+#: update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -9932,145 +9935,14 @@ msgstr ""
 "リンクグループが manual モードにあるときは、 alternatives システムはシステム"
 "管理者の設定を一切変更しない。"
 
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-"例えば B<nvi> や B<vim> のように、テキストエディタ B<vi> と互換性のあるプログ"
-"ラムを提供するパッケージが複数ある。どのパッケージが使われるかは、リンクグ"
-"ループ B<vi> によって制御される。リンクグループ B<vi> にはプログラム自身のリ"
-"ンクと、関連する man ページのリンクが含まれる。"
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-"B<vi> を提供するパッケージとその現在の設定を表示するには、 I<--display> アク"
-"ションを使う。"
-
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr "update-alternatives --display vi"
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-"特定の B<vi> 実装を選ぶには、root としてこのコマンドを実行し、そして一覧から"
-"数字を選ぶ。"
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr "update-alternatives --config vi"
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-"B<vi> 実装の選択を自動的に行なうように戻すには、root としてこのコマンドを実行"
-"する。"
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr "update-alternatives --auto vi"
-
-# type: Plain text
-#: update-alternatives.8:290
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-"B<update-alternatives> に何らかの意味のある仕事をさせるには、アクションを 1 "
-"つだけ指定しなければならない。共通オプションは、どのアクションともいっしょ"
-"に、いくつでも指定してかまわない。"
-
-# type: TP
-#: update-alternatives.8:291
-#, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--verbose>"
-
-# type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr ""
-"B<update-alternatives> が行っている作業に付いて、より詳細なコメントを生成す"
-"る。"
-
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr "エラー以外のコメントを出さない。このオプションはまだ実装されていない。"
-
-# type: Plain text
-#: update-alternatives.8:304
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-"実際の作業は何もせず、行う予定の作業について表示する。このオプションはまだ実"
-"装されていない。"
-
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
-msgstr "利用法に関する表示を行う。"
-
-# type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr "B<update-alternatives> のバージョンを表示する。"
-
-# type: TP
-#: update-alternatives.8:312
-#, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--altdir> I<directory>"
-
-# type: Plain text
-#: update-alternatives.8:316
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr "alternatives ディレクトリをデフォルトから変えたいときに指定する。"
-
-# type: TP
-#: update-alternatives.8:316
-#, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir> I<directory>"
-
-# type: Plain text
-#: update-alternatives.8:320
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr "administrative ディレクトリをデフォルトから変えたいときに指定する。"
-
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -10087,7 +9959,7 @@ msgstr ""
 "と、それにに続く 3 つの引数のセットは、 0 個以上いくつでも指定してよい。"
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -10105,13 +9977,13 @@ msgstr ""
 "ときには、 symlink は新たに追加された選択肢を参照するように更新される。"
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<name path>"
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
@@ -10120,13 +9992,13 @@ msgstr ""
 "が、こちらは非対話的であるため、スクリプト向けである。"
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<name path>"
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -10146,13 +10018,13 @@ msgstr ""
 "の変更は行われない。その選択肢の情報が削除されるだけである。"
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<name>"
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -10161,24 +10033,24 @@ msgstr ""
 "は、alternative ディレクトリの名前である。"
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr "B<--config> をすべての選択肢について呼び出す。"
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -10189,13 +10061,13 @@ msgstr ""
 "alterantive のうち、もっとも priority の高いものを参照するように更新される。"
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--display> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -10209,40 +10081,89 @@ msgstr ""
 "トールされている選択肢のうち、もっとも priority の高いもの、である。"
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--list> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr "リンクグループのすべてのターゲットを表示する。"
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--config> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
 "out of I<auto> mode."
 msgstr ""
-"リンクグループの利用可能なすべての選択肢を表示し、対話的に選択肢の 1 つを選べ"
-"るようにする。リンクグループは更新され、 I<auto> モードではなくなる。"
+"リンクグループの利用可能なすべての選択肢を表示し、対話的に選択肢の 1 つを選べ"
+"るようにする。リンクグループは更新され、 I<auto> モードではなくなる。"
+
+# type: TP
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--altdir> I<directory>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr "alternatives ディレクトリをデフォルトから変えたいときに指定する。"
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr "administrative ディレクトリをデフォルトから変えたいときに指定する。"
+
+# type: TP
+#: update-alternatives.8:311
+#, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+"B<update-alternatives> が行っている作業に付いて、より詳細なコメントを生成す"
+"る。"
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr "エラー以外のコメントを出さない。このオプションはまだ実装されていない。"
+
+# type: Plain text
+#: update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+"実際の作業は何もせず、行う予定の作業について表示する。このオプションはまだ実"
+"装されていない。"
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
@@ -10251,13 +10172,13 @@ msgstr ""
 "きる。"
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
@@ -10266,24 +10187,24 @@ msgstr ""
 "更できる。"
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr "リクエストされたアクションが正しく実行された。"
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -10291,7 +10212,7 @@ msgstr ""
 "コマンドラインの解釈を行うときか、アクションを実行するときに問題が起こった。"
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -10305,7 +10226,66 @@ msgstr ""
 "めばわかるはずである。もしわからなければ、バグとして報告して欲しい。"
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+#, fuzzy
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+"例えば B<nvi> や B<vim> のように、テキストエディタ B<vi> と互換性のあるプログ"
+"ラムを提供するパッケージが複数ある。どのパッケージが使われるかは、リンクグ"
+"ループ B<vi> によって制御される。リンクグループ B<vi> にはプログラム自身のリ"
+"ンクと、関連する man ページのリンクが含まれる。"
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+"B<vi> を提供するパッケージとその現在の設定を表示するには、 I<--display> アク"
+"ションを使う。"
+
+# type: Plain text
+#: update-alternatives.8:367
+#, fuzzy
+msgid "B<update-alternatives --display vi>"
+msgstr "update-alternatives --display vi"
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+"特定の B<vi> 実装を選ぶには、root としてこのコマンドを実行し、そして一覧から"
+"数字を選ぶ。"
+
+# type: Plain text
+#: update-alternatives.8:374
+#, fuzzy
+msgid "B<update-alternatives --config vi>"
+msgstr "update-alternatives --config vi"
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+"B<vi> 実装の選択を自動的に行なうように戻すには、root としてこのコマンドを実行"
+"する。"
+
+# type: Plain text
+#: update-alternatives.8:381
+#, fuzzy
+msgid "B<update-alternatives --auto vi>"
+msgstr "update-alternatives --auto vi"
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
@@ -10314,7 +10294,7 @@ msgstr ""
 "が無理なら、著者に直接電子メールで送って欲しい。"
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -10324,7 +10304,7 @@ msgstr ""
 "ば、実装か文書、どちらかのバグである。レポートをお願いしたい。"
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -10335,7 +10315,7 @@ msgstr ""
 "conditions. There is NO warranty."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -10346,7 +10326,7 @@ msgstr ""
 "copying conditions. There is NO WARRANTY."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
@@ -10355,6 +10335,477 @@ msgstr ""
 "system."
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
+
+# type: Plain text
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr ""
+#~ "I<ARPAインターネットテキストメッセージのフォーマットの標準 (Standard for "
+#~ "the Format of ARPA Internet Text Messages)> (RFC822),"
+
+# type: Plain text
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<インターネットホストへの要求事項 -- アプリケーションとサポート "
+#~ "(Requirements for Internet Hosts -- Application and Support)> (RFC1123) "
+#~ "5.2.14 節,"
+
+# type: Plain text
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> とこのマニュアルページは Ian Jackson によって書かれた。そし"
+#~ "て、彼の手によって public domain とされている。"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
+#~ "[I<E<lt>dirnameE<gt>>]"
+#~ msgstr ""
+#~ "B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] [I<E<lt>"
+#~ "ディレクトリ名E<gt>>]"
+
+# type: Plain text
+#~ msgid "Output the help screen and exit successfully."
+#~ msgstr "ヘルプを表示し、正常終了する。"
+
+# type: Plain text
+#~ msgid "Output version and exit successfully."
+#~ msgstr "バージョンを表示し、正常終了する。"
+
+# type: Plain text
+#~ msgid "Print a usage message."
+#~ msgstr "利用方法を表示する。"
+
+# type: TH
+#~ msgid "2006-05-23"
+#~ msgstr "2006-05-23"
+
+# type: Plain text
+#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#~ msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+
+# type: SH
+#~ msgid "ACTION OPTIONS"
+#~ msgstr "アクション・オプション"
+
+# type: TP
+#~ msgid "B<--build>, B<-b>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#~ msgid ""
+#~ "You can specify the compression level used by adding a B<-z#> option.  "
+#~ "B<dpkg-deb> will pass that option on to gzip."
+#~ msgstr ""
+#~ "圧縮レベルを指定する場合は、 B<-z#> オプションを追加する。 B<dpkg-deb> "
+#~ "は、このオプションを gzip に渡す。"
+
+# type: TP
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: TP
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--field>, B<-f>"
+
+# type: TP
+#~ msgid "B<--contents>, B<-c>"
+#~ msgstr "B<--contents>, B<-c>"
+
+# type: TP
+#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+
+# type: TP
+#~ msgid "B<--fsys-tarfile>"
+#~ msgstr "B<--fsys-tarfile>"
+
+# type: TP
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "B<--control>, B<-e>"
+
+# type: TP
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "B<dpkg-deb> の使用方法、つまりすべてのオプションとその使い方の要約を表示す"
+#~ "る。"
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "B<dpkg-deb> のバージョン番号を表示する。"
+
+# type: TP
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported)."
+#~ msgstr ""
+#~ "B<dpkg-deb> の著作権と無保証に関する情報を表示する(アメリカ式の綴りである "
+#~ "B<--license> もサポートしている)。"
+
+# type: SH
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "その他のオプション"
+
+# type: TP
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--debug>, B<-D>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-divert> is the utility used to set up and update the list of "
+#~ "diversions. It functions in three basic modes - adding, removing, and "
+#~ "listing diversions.  The options are B<--add>, B<--remove>, and B<--"
+#~ "list>, respectively. Additionally, it can print out the real name for a "
+#~ "diverted file with B<--truename>. Other options (listed below) may also "
+#~ "be specified."
+#~ msgstr ""
+#~ "B<dpkg-divert> は diversions のリストを設定、更新するためのユーティリティ"
+#~ "である。これは 3 つの基本モードの機能をもっている。diversion の追加、削"
+#~ "除、リストである。それぞれ B<--add>、B<--remove>、B<--list> オプションで指"
+#~ "定する。さらに B<--truename> によって退避されたファイルの実際の名前を表示"
+#~ "することもできる。以下にあげられている他オプションも指定することができる。"
+
+# type: Plain text
+#~ msgid "Output short usage instructions, and exit successfully."
+#~ msgstr "バージョンと簡単な利用法を表示して正常終了する。"
+
+# type: Plain text
+#~ msgid "Output program name and version and exit successfully."
+#~ msgstr "プログラム名とバージョンを表示して正常終了する。"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+#~ msgstr ""
+#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
+#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
+#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+
+# type: TP
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<-h, --help>"
+
+# type: Plain text
+#~ msgid "Print a usage message and exit successfully."
+#~ msgstr "利用方法を表示して正常終了する。"
+
+# type: Plain text
+#~ msgid ""
+#~ "Print copyright information and (a reference to GNU) license information "
+#~ "and exit successfully."
+#~ msgstr "著作権情報、ライセンス情報(GNU への参照)を表示して正常終了する。"
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
+
+# type: Plain text
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg-query> B<--version>"
+
+# type: Plain text
+#~ msgid "Display licence and copyright information."
+#~ msgstr "ライセンスと著作権情報を表示する。"
+
+# type: Plain text
+#~ msgid "Display version information."
+#~ msgstr "バージョン情報を表示する。"
+
+# type: TH
+#~ msgid "2006-05-10"
+#~ msgstr "2006-05-10"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
+#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#~ msgstr ""
+#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
+#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+
+# type: Plain text
+#~ msgid ""
+#~ "When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for "
+#~ "all debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+#~ msgstr ""
+#~ "B<-a>I<E<lt>archE<gt>> を指定した場合は、すべての deb ファイルをスキャンす"
+#~ "る代わりに、*_all.deb や *_arch.deb パターンにマッチするファイルを対象とす"
+#~ "る。"
+
+# type: SH
+#~ msgid "THE OVERRIDE FILE"
+#~ msgstr "OVERRIDE ファイル"
+
+# type: SS
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "共通オプション"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "その他のオプション"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<-B>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<--remove>I< E<lt>fileE<gt>>"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "その他のオプション"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#~ msgstr "B<822-date> には引数やオプションはない。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#~ msgstr "B<822-date> には引数やオプションはない。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#~ msgstr "B<822-date> には引数やオプションはない。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
+#~ "arguments."
+#~ msgstr "B<822-date> には引数やオプションはない。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO warranty."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--auto>, B<-a>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--list> I<link>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "B<dpkg-deb> の使用方法、つまりすべてのオプションとその使い方の要約を表示す"
+#~ "る。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "B<dpkg-deb> のバージョン番号を表示する。"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported.)"
+#~ msgstr ""
+#~ "B<dpkg-deb> の著作権と無保証に関する情報を表示する(アメリカ式の綴りである "
+#~ "B<--license> もサポートしている)。"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
+#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
+#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+
+# type: Plain text
+#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+#~ msgstr "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#~ msgstr ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+
+# type: TP
+#~ msgid "B<--admindir>"
+#~ msgstr "B<--admindir>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+
+# type: TP
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "Print help information; then exit."
+#~ msgstr "ヘルプ情報を出力して終了する。"
+
+# type: Plain text
+#~ msgid "Print version information; then exit."
+#~ msgstr "バージョン情報を出力して終了する。"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+#~ msgstr ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--display> I<name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--list> I<name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--config> I<name>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--set> I<name path>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Exactly one action must be specified if B<update-alternatives> is to "
+#~ "perform any meaningful task.  Any number of the common options may be "
+#~ "specified together with any action."
+#~ msgstr ""
+#~ "B<update-alternatives> に何らかの意味のある仕事をさせるには、アクションを "
+#~ "1 つだけ指定しなければならない。共通オプションは、どのアクションともいっ"
+#~ "しょに、いくつでも指定してかまわない。"
+
+# type: Plain text
+#~ msgid "Give some usage information."
+#~ msgstr "利用法に関する表示を行う。"
+
+# type: Plain text
+#~ msgid "Tell which version of B<update-alternatives> this is."
+#~ msgstr "B<update-alternatives> のバージョンを表示する。"
diff --git a/man/po/pl.po b/man/po/pl.po
index b03cfbdf..fd9704cc 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.0\n"
-"POT-Creation-Date: 2007-03-20 22:08+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2007-03-20 21:58+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -15,106 +15,99 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../822-date.1:2
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "822-date"
 
 # type: TH
-#: ../822-date.1:2
+#: 822-date.1:2
 #, no-wrap
 msgid "2007-01-24"
 msgstr "2007-01-24"
 
 # type: TH
-#: ../822-date.1:2 ../cleanup-info.8:1 ../deb.5:1 ../deb-control.5:3
-#: ../deb-old.5:1 ../deb-override.5:16 ../deb-shlibs.5:16 ../deb-substvars.5:2
-#: ../dpkg.1:1 ../dpkg-architecture.1:1 ../dpkg.cfg.5:1
-#: ../dpkg-buildpackage.1:1 ../dpkg-checkbuilddeps.1:1 ../dpkg-distaddfile.1:1
-#: ../dpkg-deb.1:1 ../dpkg-divert.8:1 ../dpkg-genchanges.1:1
-#: ../dpkg-gencontrol.1:1 ../dpkg-name.1:6 ../dpkg-parsechangelog.1:1
-#: ../dpkg-query.1:1 ../dpkg-scanpackages.1:16 ../dpkg-scansources.1:1
-#: ../dpkg-shlibdeps.1:1 ../dpkg-source.1:2 ../dpkg-split.1:2 ../dselect.1:1
-#: ../dselect.cfg.5:1 ../install-info.8:5 ../start-stop-daemon.8:1
-#: ../update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Projekt Debiana"
 
 # type: TH
-#: ../822-date.1:2 ../cleanup-info.8:1 ../deb-override.5:16 ../deb-shlibs.5:16
-#: ../deb-substvars.5:2 ../dpkg-architecture.1:1 ../dpkg-buildpackage.1:1
-#: ../dpkg-checkbuilddeps.1:1 ../dpkg-distaddfile.1:1 ../dpkg-divert.8:1
-#: ../dpkg-genchanges.1:1 ../dpkg-gencontrol.1:1 ../dpkg-name.1:6
-#: ../dpkg-parsechangelog.1:1 ../dpkg-scanpackages.1:16
-#: ../dpkg-scansources.1:1 ../dpkg-shlibdeps.1:1 ../dpkg-source.1:2
-#: ../dpkg-split.1:2 ../dpkg-statoverride.8:1 ../install-info.8:5
-#: ../start-stop-daemon.8:1 ../update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "u¿ytki dpkg"
 
 # type: SH
-#: ../822-date.1:3 ../cleanup-info.8:2 ../deb.5:2 ../deb-control.5:4
-#: ../deb-old.5:2 ../deb-override.5:17 ../deb-shlibs.5:17 ../deb-substvars.5:3
-#: ../dpkg.1:2 ../dpkg-architecture.1:2 ../dpkg.cfg.5:2
-#: ../dpkg-buildpackage.1:2 ../dpkg-checkbuilddeps.1:2 ../dpkg-distaddfile.1:2
-#: ../dpkg-deb.1:2 ../dpkg-divert.8:2 ../dpkg-genchanges.1:2
-#: ../dpkg-gencontrol.1:2 ../dpkg-name.1:7 ../dpkg-parsechangelog.1:2
-#: ../dpkg-query.1:2 ../dpkg-scanpackages.1:17 ../dpkg-scansources.1:2
-#: ../dpkg-shlibdeps.1:2 ../dpkg-source.1:3 ../dpkg-split.1:3
-#: ../dpkg-statoverride.8:2 ../dselect.1:2 ../dselect.cfg.5:2
-#: ../install-info.8:6 ../start-stop-daemon.8:2 ../update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NAZWA"
 
 # type: Plain text
 #
-#: ../822-date.1:5
+#: 822-date.1:5
 msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - Drukuje datê i czas w formacie RFC2822"
 
 # type: SH
-#: ../822-date.1:6 ../cleanup-info.8:5 ../deb.5:4 ../deb-control.5:7
-#: ../deb-old.5:5 ../deb-override.5:20 ../deb-shlibs.5:20 ../deb-substvars.5:7
-#: ../dpkg.1:5 ../dpkg-architecture.1:5 ../dpkg-buildpackage.1:5
-#: ../dpkg-checkbuilddeps.1:5 ../dpkg-distaddfile.1:5 ../dpkg-deb.1:5
-#: ../dpkg-divert.8:5 ../dpkg-genchanges.1:5 ../dpkg-gencontrol.1:5
-#: ../dpkg-name.1:10 ../dpkg-parsechangelog.1:5 ../dpkg-query.1:5
-#: ../dpkg-scanpackages.1:20 ../dpkg-scansources.1:5 ../dpkg-shlibdeps.1:5
-#: ../dpkg-source.1:7 ../dpkg-split.1:6 ../dpkg-statoverride.8:5
-#: ../dselect.1:5 ../install-info.8:9 ../start-stop-daemon.8:5
-#: ../update-alternatives.8:12
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
+#: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SK£ADNIA"
 
 # type: Plain text
 #
-#: ../822-date.1:8
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: ../822-date.1:9 ../cleanup-info.8:11 ../deb.5:6 ../deb-control.5:10
-#: ../deb-old.5:8 ../deb-override.5:23 ../deb-shlibs.5:23
-#: ../deb-substvars.5:10 ../dpkg.1:19 ../dpkg-architecture.1:11
-#: ../dpkg.cfg.5:5 ../dpkg-buildpackage.1:9 ../dpkg-checkbuilddeps.1:10
-#: ../dpkg-distaddfile.1:9 ../dpkg-deb.1:10 ../dpkg-divert.8:10
-#: ../dpkg-genchanges.1:10 ../dpkg-gencontrol.1:9 ../dpkg-name.1:16
-#: ../dpkg-parsechangelog.1:9 ../dpkg-query.1:9 ../dpkg-scanpackages.1:29
-#: ../dpkg-scansources.1:14 ../dpkg-shlibdeps.1:11 ../dpkg-source.1:12
-#: ../dpkg-split.1:11 ../dpkg-statoverride.8:10 ../dselect.1:18
-#: ../dselect.cfg.5:5 ../install-info.8:25 ../start-stop-daemon.8:10
-#: ../update-alternatives.8:17
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
 # type: Plain text
 #
-#: ../822-date.1:15
+#: 822-date.1:15
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
 "RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
@@ -124,7 +117,7 @@ msgstr ""
 "opcj± B<-R>."
 
 # type: Plain text
-#: ../822-date.1:19
+#: 822-date.1:19
 msgid ""
 "B<Using 822-date is deprecated since> B<date>(1)  provides the same "
 "functionality when called with the B<-R>."
@@ -133,70 +126,65 @@ msgstr ""
 "uruchomiony z opcj± B<-R> dostarcza tej samej funkcjonalno¶ci."
 
 # type: SH
-#: ../822-date.1:20 ../cleanup-info.8:30 ../dpkg.1:293
-#: ../dpkg-architecture.1:68 ../dpkg-buildpackage.1:14
-#: ../dpkg-checkbuilddeps.1:18 ../dpkg-distaddfile.1:27 ../dpkg-deb.1:172
-#: ../dpkg-divert.8:38 ../dpkg-genchanges.1:17 ../dpkg-gencontrol.1:16
-#: ../dpkg-name.1:28 ../dpkg-parsechangelog.1:15 ../dpkg-query.1:69
-#: ../dpkg-scanpackages.1:70 ../dpkg-scansources.1:45 ../dpkg-shlibdeps.1:36
-#: ../dpkg-source.1:67 ../dpkg-split.1:137 ../dpkg-statoverride.8:51
-#: ../dselect.1:45 ../install-info.8:39 ../start-stop-daemon.8:80
-#: ../update-alternatives.8:302
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPCJE"
 
 # type: Plain text
 #
-#: ../822-date.1:23
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> nie wymaga podania ¿adnej opcji."
 
 # type: SH
-#: ../822-date.1:24 ../cleanup-info.8:48 ../deb-substvars.5:126 ../dpkg.1:609
-#: ../dpkg-buildpackage.1:181 ../dpkg-deb.1:221 ../dpkg-name.1:87
-#: ../dpkg-source.1:264 ../dpkg-split.1:200 ../dselect.1:427
-#: ../update-alternatives.8:383
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "B£ÊDY"
 
 # type: Plain text
 #
-#: ../822-date.1:27
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "To polecenie powinno byæ czê¶ci± polecenia B<date>(1)."
 
 # type: SH
-#: ../822-date.1:28 ../cleanup-info.8:51 ../deb.5:67 ../deb-control.5:204
-#: ../deb-old.5:51 ../deb-override.5:67 ../deb-shlibs.5:29
-#: ../deb-substvars.5:130 ../dpkg.1:599 ../dpkg-architecture.1:268
-#: ../dpkg.cfg.5:21 ../dpkg-deb.1:238 ../dpkg-divert.8:118 ../dpkg-name.1:97
-#: ../dpkg-query.1:158 ../dpkg-scanpackages.1:95 ../dpkg-scansources.1:65
-#: ../dpkg-shlibdeps.1:127 ../dpkg-source.1:275 ../dpkg-split.1:226
-#: ../dpkg-statoverride.8:78 ../dselect.1:443 ../dselect.cfg.5:21
-#: ../install-info.8:277 ../update-alternatives.8:403
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
 
 # type: Plain text
-#: ../822-date.1:32
+#: 822-date.1:32
 msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr "I<Internet Message Format> (RFC2822), B<date>(1)."
 
 # type: SH
-#: ../822-date.1:33 ../cleanup-info.8:54 ../deb-substvars.5:137
-#: ../dpkg-architecture.1:272 ../dpkg.cfg.5:17 ../dpkg-checkbuilddeps.1:31
-#: ../dpkg-deb.1:244 ../dpkg-divert.8:121 ../dpkg-query.1:149
-#: ../dpkg-scansources.1:69 ../dpkg-split.1:232 ../dpkg-statoverride.8:81
-#: ../dselect.cfg.5:17 ../update-alternatives.8:392
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: Plain text
-#: ../822-date.1:40
+#: 822-date.1:40
 #, fuzzy
 msgid ""
 "B<822-date> is a really simple wrapper around B<date>(1).  By its "
@@ -207,33 +195,32 @@ msgid ""
 msgstr "B<822-date>"
 
 # type: TH
-#: ../cleanup-info.8:1
+#: cleanup-info.8:1
 #, no-wrap
 msgid "cleanup-info"
 msgstr "cleanup-info"
 
 # type: TH
-#: ../cleanup-info.8:1 ../deb-substvars.5:2 ../dpkg-architecture.1:1
-#: ../dpkg-checkbuilddeps.1:1 ../dpkg-divert.8:1 ../dpkg-name.1:6
-#: ../dpkg-query.1:1 ../dpkg-scanpackages.1:16 ../dpkg-scansources.1:1
-#: ../dpkg-split.1:2 ../dpkg-statoverride.8:1 ../start-stop-daemon.8:1
-#: ../update-alternatives.8:8
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "2007-03-06"
 msgstr "2007-03-06"
 
 # type: Plain text
-#: ../cleanup-info.8:4
+#: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr "cleanup-info - robi porz±dek po dzia³aniu fa³szywego install-info"
 
 # type: Plain text
-#: ../cleanup-info.8:10
+#: cleanup-info.8:10
 msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
 msgstr "B<cleanup-info> [I<opcje>] [B<-->] [I<nazwa_katalogu>]"
 
 # type: Plain text
-#: ../cleanup-info.8:18
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -242,21 +229,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../cleanup-info.8:21
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: ../cleanup-info.8:24
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: ../cleanup-info.8:29
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -265,104 +252,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../cleanup-info.8:31
+#: cleanup-info.8:31
 #, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--unsafe>"
 
 # type: Plain text
-#: ../cleanup-info.8:34
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr "Ustawia kilka opcji dodatkowych, a byæ mo¿e u¿ytecznych."
 
 # type: Plain text
-#: ../cleanup-info.8:36
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr "B<Ostrze¿enie: opcja `--unsafe' mo¿e uszkodziæ poprawny plik!>"
 
 # type: TP
-#: ../cleanup-info.8:36 ../dpkg-architecture.1:61 ../dpkg-divert.8:67
-#: ../dpkg-scansources.1:60 ../dpkg-statoverride.8:44 ../dselect.1:121
-#: ../install-info.8:195 ../update-alternatives.8:295
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
-#: ../cleanup-info.8:39 ../dpkg-architecture.1:64 ../dpkg-buildpackage.1:177
-#: ../dpkg-checkbuilddeps.1:30 ../dpkg-distaddfile.1:35 ../dpkg-deb.1:165
-#: ../dpkg-divert.8:70 ../dpkg-genchanges.1:142 ../dpkg-gencontrol.1:101
-#: ../dpkg-name.1:59 ../dpkg-parsechangelog.1:36 ../dpkg-query.1:62
-#: ../dpkg-scanpackages.1:84 ../dpkg-scansources.1:62 ../dpkg-shlibdeps.1:112
-#: ../dpkg-source.1:63 ../dpkg-split.1:130 ../dpkg-statoverride.8:47
-#: ../update-alternatives.8:298
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
 msgid "Show the usage message and exit."
 msgstr "Wy¶wietla informacjê o u¿ytkowaniu i koñczy dzia³anie."
 
 # type: TP
-#: ../cleanup-info.8:39 ../dpkg-architecture.1:64 ../dpkg-buildpackage.1:177
-#: ../dpkg-distaddfile.1:35 ../dpkg-deb.1:165 ../dpkg-divert.8:70
-#: ../dpkg-genchanges.1:142 ../dpkg-gencontrol.1:101
-#: ../dpkg-parsechangelog.1:36 ../dpkg-query.1:62 ../dpkg-scanpackages.1:84
-#: ../dpkg-scansources.1:62 ../dpkg-shlibdeps.1:112 ../dpkg-source.1:63
-#: ../dpkg-split.1:130 ../dpkg-statoverride.8:47 ../dselect.1:128
-#: ../install-info.8:200 ../update-alternatives.8:298
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #
-#: ../cleanup-info.8:42 ../dpkg-architecture.1:67 ../dpkg-buildpackage.1:180
-#: ../dpkg-distaddfile.1:38 ../dpkg-deb.1:168 ../dpkg-divert.8:73
-#: ../dpkg-genchanges.1:145 ../dpkg-gencontrol.1:104 ../dpkg-name.1:62
-#: ../dpkg-parsechangelog.1:39 ../dpkg-query.1:65 ../dpkg-scanpackages.1:87
-#: ../dpkg-scansources.1:64 ../dpkg-shlibdeps.1:115 ../dpkg-source.1:66
-#: ../dpkg-split.1:133 ../dpkg-statoverride.8:50 ../update-alternatives.8:301
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
 msgid "Show the version and exit."
 msgstr "Wy¶wietla informacjê o wersji i pomy¶lnie koñczy dzia³anie."
 
 # type: SH
-#: ../cleanup-info.8:43 ../deb-substvars.5:121 ../dpkg.1:496 ../dpkg.cfg.5:12
-#: ../dpkg-buildpackage.1:186 ../dpkg-distaddfile.1:39 ../dpkg-divert.8:108
-#: ../dpkg-genchanges.1:146 ../dpkg-gencontrol.1:105
-#: ../dpkg-parsechangelog.1:40 ../dpkg-shlibdeps.1:116 ../dpkg-split.1:215
-#: ../dpkg-statoverride.8:68 ../dselect.cfg.5:12 ../update-alternatives.8:325
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "PLIKI"
 
 # type: TP
-#: ../cleanup-info.8:44
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "I</usr/info/dir> lub I<E<lt>katalogE<gt>/dir>"
 
 # type: Plain text
-#: ../cleanup-info.8:47
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: ../cleanup-info.8:50
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr "Prawdopodobnie wiele."
 
 # type: Plain text
-#: ../cleanup-info.8:54
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr "B<install-info>(8), B<info>(1)."
 
 # type: Plain text
-#: ../cleanup-info.8:56
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr "Copyright (C) 1996 Kim-Minh Kaplan."
 
 # type: Plain text
-#: ../cleanup-info.8:58 ../dpkg-checkbuilddeps.1:38 ../dpkg-divert.8:125
-#: ../dpkg-query.1:157 ../dpkg-statoverride.8:88
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -372,37 +357,37 @@ msgstr ""
 "warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
 # type: TH
-#: ../deb.5:1
+#: deb.5:1
 #, no-wrap
 msgid "deb"
 msgstr "deb"
 
 # type: TH
-#: ../deb.5:1 ../deb-control.5:3 ../deb-old.5:1 ../dpkg.cfg.5:1 ../dselect.1:1
-#: ../dselect.cfg.5:1 ../install-info.8:5
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
 #, no-wrap
 msgid "2006-02-28"
 msgstr "2006-02-28"
 
 # type: TH
-#: ../deb.5:1 ../deb-control.5:3 ../deb-old.5:1 ../dselect.1:1
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
 msgid "Debian"
 msgstr "Debian"
 
 # type: Plain text
 #
-#: ../deb.5:4
+#: deb.5:4
 msgid "deb - Debian binary package format"
 msgstr "deb - format binarnego pakietu Debiana"
 
 # type: Plain text
-#: ../deb.5:6 ../deb-old.5:7
+#: deb.5:6 deb-old.5:7
 msgid "I<filename>B<.deb>"
 msgstr "I<nazwa_pliku>B<.deb>"
 
 # type: Plain text
-#: ../deb.5:12
+#: deb.5:12
 msgid ""
 "The B<.deb> format is the Debian binary package file format. It is "
 "understood by dpkg 0.93.76 and later, and is generated by default by all "
@@ -410,25 +395,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:16
+#: deb.5:16
 msgid ""
 "The format described here is used since Debian 0.93; details of the old "
 "format are described in B<deb-old>(5)."
 msgstr ""
 
 # type: SH
-#: ../deb.5:16 ../deb-old.5:18
+#: deb.5:16 deb-old.5:18
 #, no-wrap
 msgid "FORMAT"
 msgstr "FORMAT"
 
 # type: Plain text
-#: ../deb.5:21
+#: deb.5:21
 msgid "The file is an B<ar> archive with a magic number of B<!E<lt>archE<gt>>."
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:31
+#: deb.5:31
 msgid ""
 "The first member is named B<debian-binary> and contains a series of lines, "
 "separated by newlines. Currently only one line is present, the format "
@@ -439,7 +424,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:36
+#: deb.5:36
 msgid ""
 "If the major number has changed, an incompatible change has been made and "
 "the program should stop. If it has not, then the program should be able to "
@@ -448,7 +433,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:46
+#: deb.5:46
 msgid ""
 "The second required member is named B<control.tar.gz>.  It is a gzipped tar "
 "archive containing the package control information, as a series of plain "
@@ -458,14 +443,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:50
+#: deb.5:50
 msgid ""
 "The third, last required member is named B<data.tar.gz>.  It contains the "
 "filesystem archive as a gzipped tar archive."
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:61
+#: deb.5:61
 msgid ""
 "These members must occur in this exact order. Current implementations should "
 "ignore any additional members after B<data.tar.gz>.  Further members may be "
@@ -476,7 +461,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb.5:67
+#: deb.5:67
 msgid ""
 "Those new members which won't be able to be safely ignored will be inserted "
 "before B<data.tar.gz> with names starting with something other than "
@@ -486,29 +471,29 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../deb.5:70
+#: deb.5:70
 msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 # type: TP
-#: ../deb-control.5:3
+#: deb-control.5:3
 #, no-wrap
 msgid "deb-control"
 msgstr "deb-control"
 
 # type: Plain text
 #
-#: ../deb-control.5:6
+#: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
 msgstr "deb-control - format g³ównego pliku pakietu Debiana"
 
 # type: TP
-#: ../deb-control.5:9
+#: deb-control.5:9
 msgid "control"
 msgstr "control"
 
 # type: Plain text
-#: ../deb-control.5:23
+#: deb-control.5:23
 msgid ""
 "Each Debian package contains the master `control' file, which contains a "
 "number of fields. Each field begins with a tag, such as B<Package> or "
@@ -520,32 +505,32 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../deb-control.5:24
+#: deb-control.5:24
 #, no-wrap
 msgid "REQUIRED FIELDS"
 msgstr "POLA WYMAGANE"
 
 # type: TP
-#: ../deb-control.5:25
+#: deb-control.5:25
 #, no-wrap
 msgid "B<Package:> E<lt>package nameE<gt>"
 msgstr "B<Package:> E<lt>nazwa pakietuE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:29
+#: deb-control.5:29
 msgid ""
 "The value of this field determines the package name, and is used to generate "
 "file names by most installation tools."
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:29
+#: deb-control.5:29
 #, no-wrap
 msgid "B<Version:> E<lt>version stringE<gt>"
 msgstr "B<Version:> E<lt>oznaczenie wersjiE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:36
+#: deb-control.5:36
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
@@ -555,13 +540,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:36
+#: deb-control.5:36
 #, no-wrap
 msgid "B<Maintainer:> E<lt>fullname emailE<gt>"
 msgstr "B<Maintainer:> E<lt>pe³na-nazwa e-mailE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:41
+#: deb-control.5:41
 msgid ""
 "Should be in the format `Joe Bloggs E<lt>jbloggs@foo.comE<gt>', and is "
 "typically the person who created the package, as opposed to the author of "
@@ -572,18 +557,18 @@ msgstr ""
 "programu)."
 
 # type: TP
-#: ../deb-control.5:41
+#: deb-control.5:41
 #, no-wrap
 msgid "B<Description:> E<lt>short descriptionE<gt>"
 msgstr "B<Description:> E<lt>krótki opisE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:44
+#: deb-control.5:44
 msgid "B< >E<lt>long descriptionE<gt>"
 msgstr "B< >E<lt>d³ugi opisE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:50
+#: deb-control.5:50
 msgid ""
 "The format for the package description is a short brief summary on the first "
 "line (after the \"Description\" field). The following lines should be used "
@@ -593,19 +578,19 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../deb-control.5:51
+#: deb-control.5:51
 #, no-wrap
 msgid "OPTIONAL FIELDS"
 msgstr "POLA NIEWYMAGANE"
 
 # type: TP
-#: ../deb-control.5:52
+#: deb-control.5:52
 #, no-wrap
 msgid "B<Section:> E<lt>sectionE<gt>"
 msgstr "B<Section:> E<lt>sekcjaE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:57
+#: deb-control.5:57
 msgid ""
 "This is a general field that gives the package a category based on the "
 "software that it installs. Some common sections are `utils', `net', `mail', "
@@ -613,20 +598,20 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:57
+#: deb-control.5:57
 #, no-wrap
 msgid "B<Priority:> E<lt>priorityE<gt>"
 msgstr "B<Priority:> E<lt>priorytet<gt>"
 
 # type: Plain text
-#: ../deb-control.5:61
+#: deb-control.5:61
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are `required', `standard', `optional', `extra' etc."
 msgstr ""
 
 # type: Plain text
-#: ../deb-control.5:71
+#: deb-control.5:71
 msgid ""
 "In Debian, the B<Section> and B<Priority> fields have a defined set of "
 "accepted values based on the Policy Manual.  They are used to decide how the "
@@ -635,13 +620,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:71
+#: deb-control.5:71
 #, no-wrap
 msgid "B<Essential:> E<lt>yes|noE<gt>"
 msgstr "B<Essential:> E<lt>yes|noE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:78
+#: deb-control.5:78
 msgid ""
 "This field is usually only needed when the answer is `yes'. It denotes a "
 "package that is required for proper operation of the system. Dpkg or any "
@@ -650,13 +635,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:78
+#: deb-control.5:78
 #, no-wrap
 msgid "B<Architecture:> E<lt>arch|allE<gt>"
 msgstr "B<Architecture:> E<lt>architektura|allE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:86
+#: deb-control.5:86
 msgid ""
 "The architecture specifies which type of hardware this package was compiled "
 "for. Common architectures are `i386', `m68k', `sparc', `alpha', `powerpc' "
@@ -666,26 +651,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:86
+#: deb-control.5:86
 #, no-wrap
 msgid "B<Source:> E<lt>source nameE<gt>"
 msgstr "B<Source:> E<lt>nazwa ¼ród³aE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:90
+#: deb-control.5:90
 msgid ""
 "The name of the source package that this binary package came from, if "
 "different than the name of the package itself."
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:90
+#: deb-control.5:90
 #, no-wrap
 msgid "B<Depends:> E<lt>package listE<gt>"
 msgstr "B<Depends:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:100
+#: deb-control.5:100
 msgid ""
 "List of packages that are required for this package to provide a non-trivial "
 "amount of functionality. The package maintenance software will not allow a "
@@ -696,13 +681,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:100
+#: deb-control.5:100
 #, no-wrap
 msgid "B<Pre-Depends:> E<lt>package listE<gt>"
 msgstr "B<Pre-Depends:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:107
+#: deb-control.5:107
 msgid ""
 "List of packages that must be installed B<and> configured before this one "
 "can be installed. This is usually used in the case where this package "
@@ -710,13 +695,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:107
+#: deb-control.5:107
 #, no-wrap
 msgid "B<Recommends:> E<lt>package listE<gt>"
 msgstr "B<Recommends:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:114
+#: deb-control.5:114
 msgid ""
 "Lists packages that would be found together with this one in all but unusual "
 "installations. The package maintenance software will warn the user if they "
@@ -724,13 +709,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:114
+#: deb-control.5:114
 #, no-wrap
 msgid "B<Suggests:> E<lt>package listE<gt>"
 msgstr "B<Suggests:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:119
+#: deb-control.5:119
 msgid ""
 "Lists packages that are related to this one and can perhaps enhance its "
 "usefulness, but without which installing this package is perfectly "
@@ -738,7 +723,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-control.5:131
+#: deb-control.5:131
 msgid ""
 "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
 "fields is a list of groups of alternative packages. Each group is a list of "
@@ -749,7 +734,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-control.5:137
+#: deb-control.5:137
 msgid ""
 "A version number may start with a `E<gt>E<gt>', in which case any later "
 "version will match, and may specify or omit the Debian packaging revision "
@@ -759,13 +744,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:137
+#: deb-control.5:137
 #, no-wrap
 msgid "B<Conflicts:> E<lt>package listE<gt>"
 msgstr "B<Conflicts:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:145
+#: deb-control.5:145
 msgid ""
 "Lists packages that conflict with this one, for example by containing files "
 "with the same names. The package maintenance software will not allow "
@@ -774,13 +759,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:145
+#: deb-control.5:145
 #, no-wrap
 msgid "B<Replaces:> E<lt>package listE<gt>"
 msgstr "B<Replaces:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:153
+#: deb-control.5:153
 msgid ""
 "List of packages files from which this one replaces. This is used for "
 "allowing this package to overwrite the files of another package and is "
@@ -789,13 +774,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-control.5:153
+#: deb-control.5:153
 #, no-wrap
 msgid "B<Provides:> E<lt>package listE<gt>"
 msgstr "B<Provides:> E<lt>lista pakietówE<gt>"
 
 # type: Plain text
-#: ../deb-control.5:163
+#: deb-control.5:163
 msgid ""
 "This is a list of virtual packages that this one provides. Usually this is "
 "used in the case of several packages all providing the same service.  For "
@@ -808,7 +793,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-control.5:178
+#: deb-control.5:178
 msgid ""
 "The syntax of B<Conflicts>, B<Replaces> and B<Provides> is a list of package "
 "names, separated by commas (and optional whitespace).  In the B<Conflicts> "
@@ -818,13 +803,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../deb-control.5:179
+#: deb-control.5:179
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "PRZYK£AD"
 
 # type: Plain text
-#: ../deb-control.5:201
+#: deb-control.5:201
 #, no-wrap
 msgid ""
 "Package: grep\n"
@@ -869,24 +854,24 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../deb-control.5:207
+#: deb-control.5:207
 msgid "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: TH
-#: ../deb-old.5:1
+#: deb-old.5:1
 #, no-wrap
 msgid "deb-old"
 msgstr "deb-old"
 
 # type: Plain text
 #
-#: ../deb-old.5:4
+#: deb-old.5:4
 msgid "deb-old - old style Debian binary package format"
 msgstr "deb-old - stary format binarnego pakietu Debiana"
 
 # type: Plain text
-#: ../deb-old.5:17
+#: deb-old.5:17
 msgid ""
 "The B<.deb> format is the Debian binary package file format. This manual "
 "page describes the B<old> format, used before Debian 0.93. Please see B<deb>"
@@ -894,33 +879,33 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:21
+#: deb-old.5:21
 msgid ""
 "The file is two lines of format information as ASCII text, followed by two "
 "concatenated gzipped ustar files."
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:25
+#: deb-old.5:25
 msgid ""
 "The first line is the format version number padded to 8 digits, and is "
 "B<0.939000> for all old-format archives."
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:28
+#: deb-old.5:28
 msgid ""
 "The second line is a decimal string (without leading zeroes) giving the "
 "length of the first gzipped tarfile."
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:30
+#: deb-old.5:30
 msgid "Each of these lines is terminated with a single newline character."
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:35
+#: deb-old.5:35
 msgid ""
 "The first tarfile contains the control information, as a series of ordinary "
 "files. The file B<control> must be present, as it contains the core control "
@@ -928,7 +913,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:46
+#: deb-old.5:46
 msgid ""
 "In some very old archives, the files in the control tarfile may optionally "
 "be in a B<DEBIAN> subdirectory. In that case, the B<DEBIAN> subdirectory "
@@ -938,7 +923,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-old.5:50
+#: deb-old.5:50
 msgid ""
 "The second gzipped tarfile is the filesystem archive, containing pathnames "
 "relative to the root directory of the system to be installed on. The "
@@ -947,36 +932,36 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../deb-old.5:54
+#: deb-old.5:54
 msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 # type: TP
-#: ../deb-override.5:16
+#: deb-override.5:16
 #, no-wrap
 msgid "deb-override"
 msgstr "deb-override"
 
 # type: TH
-#: ../deb-override.5:16 ../dpkg-buildpackage.1:1 ../dpkg-distaddfile.1:1
-#: ../dpkg-genchanges.1:1 ../dpkg-gencontrol.1:1 ../dpkg-parsechangelog.1:1
-#: ../dpkg-shlibdeps.1:1 ../dpkg-source.1:2
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
 #, no-wrap
 msgid "2007-03-07"
 msgstr "2007-03-07"
 
 # type: Plain text
-#: ../deb-override.5:19
+#: deb-override.5:19
 msgid "deb-override - Debian archive override file"
 msgstr "deb-override - plik nadpisañ archiwum Debiana"
 
 # type: TP
-#: ../deb-override.5:22
+#: deb-override.5:22
 msgid "override"
 msgstr "override"
 
 # type: Plain text
-#: ../deb-override.5:29
+#: deb-override.5:29
 msgid ""
 "While most information about a package can be found in the control file, "
 "some must be filled in by the distribution czars rather than by the "
@@ -986,26 +971,26 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:33
+#: deb-override.5:33
 msgid ""
 "The override file has a simple whitespace-delimited format. Comments are "
 "allowed (denoted with a B<#>)."
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:39
+#: deb-override.5:39
 msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr "I<pakiet> I<priorytet> I<sekcja> [I<informacje-o-opiekunie>]"
 
 # type: Plain text
-#: ../deb-override.5:44
+#: deb-override.5:44
 msgid ""
 "I<package> is the name of the package. Entries in the override file for "
 "packages not found in the tree of binary packages are ignored."
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:53
+#: deb-override.5:53
 msgid ""
 "I<priority> and I<section> place the package within the release tree; these "
 "ought not to be found in the control file. If the package is found in a "
@@ -1013,7 +998,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:61
+#: deb-override.5:61
 msgid ""
 "I<maintainerinfo>, if present, can be either the name of a maintainer for an "
 "unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
@@ -1021,74 +1006,74 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:66
+#: deb-override.5:66
 msgid ""
 "The override files used to make the official Packages lists may be found in "
 "the I<indices> directory on any Debian mirror."
 msgstr ""
 
 # type: Plain text
-#: ../deb-override.5:70
+#: deb-override.5:70
 msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
 msgstr "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
 
 # type: TH
-#: ../deb-shlibs.5:16
+#: deb-shlibs.5:16
 #, no-wrap
 msgid "deb-shlibs"
 msgstr "deb-shlibs"
 
 # type: TH
-#: ../deb-shlibs.5:16
+#: deb-shlibs.5:16
 #, no-wrap
 msgid "2007-03-08"
 msgstr "2007-03-08"
 
 # type: Plain text
-#: ../deb-shlibs.5:19
+#: deb-shlibs.5:19
 msgid "deb-shlibs - Debian shared library information file"
 msgstr ""
 
 # type: Plain text
-#: ../deb-shlibs.5:22
+#: deb-shlibs.5:22
 msgid "shlibs"
 msgstr "shlibs"
 
 # type: Plain text
-#: ../deb-shlibs.5:26
+#: deb-shlibs.5:26
 msgid ""
 "The format for a shared library dependency information entry in these files "
 "is (see the Debian Policy Manual for details):"
 msgstr ""
 
 # type: Plain text
-#: ../deb-shlibs.5:28
+#: deb-shlibs.5:28
 msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
 msgstr ""
 
 # type: TP
-#: ../deb-shlibs.5:30
+#: deb-shlibs.5:30
 msgid "B<dpkg-shlibdeps>(1)."
 msgstr "B<dpkg-shlibdeps>(1)."
 
 # type: TP
-#: ../deb-substvars.5:2
+#: deb-substvars.5:2
 #, no-wrap
 msgid "deb-substvars"
 msgstr "deb-substvars"
 
 # type: Plain text
-#: ../deb-substvars.5:6
+#: deb-substvars.5:6
 msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:9
+#: deb-substvars.5:9
 msgid "substvars"
 msgstr "substvars"
 
 # type: Plain text
-#: ../deb-substvars.5:20
+#: deb-substvars.5:20
 msgid ""
 "Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
 "control information (to the source control file B<.dsc> for B<dpkg-source> "
@@ -1097,7 +1082,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-substvars.5:27
+#: deb-substvars.5:27
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
 "names consist of alphanumerics, hyphens and colons and start with an "
@@ -1107,14 +1092,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-substvars.5:34
+#: deb-substvars.5:34
 msgid ""
 "After all the substitutions have been done each occurrence of the string B<"
 "${}> (which is not a legal substitution) is replaced with a B<$> sign."
 msgstr ""
 
 # type: Plain text
-#: ../deb-substvars.5:47
+#: deb-substvars.5:47
 msgid ""
 "Variables can be set using the B<-V> common option. They can be also "
 "specified in the file B<debian/substvars> (or whatever other file is "
@@ -1124,67 +1109,67 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../deb-substvars.5:49
+#: deb-substvars.5:49
 msgid "Additionally, the following standard variables are available:"
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:49
+#: deb-substvars.5:49
 #, no-wrap
 msgid "B<Arch>"
 msgstr "B<Arch>"
 
 # type: Plain text
-#: ../deb-substvars.5:53
+#: deb-substvars.5:53
 msgid "The current build architecture (from B<dpkg --print-architecture>)."
 msgstr "Bie¿±ca architektura budowania (z B<dpkg --print-architecture>)."
 
 # type: TP
-#: ../deb-substvars.5:53
+#: deb-substvars.5:53
 #, no-wrap
 msgid "B<source:Version>"
 msgstr "B<source:Version>"
 
 # type: Plain text
 #
-#: ../deb-substvars.5:56
+#: deb-substvars.5:56
 msgid "The source package version."
 msgstr "Wersja pakietu ¼ród³owego"
 
 # type: TP
-#: ../deb-substvars.5:56
+#: deb-substvars.5:56
 #, no-wrap
 msgid "B<source:Upstream-Version>"
 msgstr "B<source:Upstream-Version>"
 
 # type: Plain text
-#: ../deb-substvars.5:60
+#: deb-substvars.5:60
 msgid ""
 "The upstream source package version, including the Debian version epoch if "
 "any."
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:60
+#: deb-substvars.5:60
 #, no-wrap
 msgid "B<binary:Version>"
 msgstr "B<binary:Version>"
 
 # type: Plain text
-#: ../deb-substvars.5:64
+#: deb-substvars.5:64
 msgid ""
 "The binary package version (which may differ from source:Version in a binNMU "
 "for example)."
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:64
+#: deb-substvars.5:64
 #, no-wrap
 msgid "B<Source-Version>"
 msgstr "B<Source-Version>"
 
 # type: Plain text
-#: ../deb-substvars.5:69
+#: deb-substvars.5:69
 msgid ""
 "The source package version (from the changelog file). This variable is now "
 "B<deprecated> as its meaning is different from its function, please use the "
@@ -1192,13 +1177,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:69
+#: deb-substvars.5:69
 #, no-wrap
 msgid "B<Installed-Size>"
 msgstr "B<Installed-Size>"
 
 # type: Plain text
-#: ../deb-substvars.5:78
+#: deb-substvars.5:78
 msgid ""
 "The total size of the package's installed files. This value is copied into "
 "the corresponding control file field; setting it will modify the value of "
@@ -1207,13 +1192,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:78
+#: deb-substvars.5:78
 #, no-wrap
 msgid "B<Extra-Size>"
 msgstr "B<Extra-Size>"
 
 # type: Plain text
-#: ../deb-substvars.5:87
+#: deb-substvars.5:87
 msgid ""
 "Additional disk space used when the package is installed. If this variable "
 "is set its value is added to that of the B<Installed-Size> variable (whether "
@@ -1222,13 +1207,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:87
+#: deb-substvars.5:87
 #, no-wrap
 msgid "B<F:>I<fieldname>"
 msgstr "B<F:>I<nazwa-pola>"
 
 # type: Plain text
-#: ../deb-substvars.5:94
+#: deb-substvars.5:94
 msgid ""
 "The value of the output field I<fieldname> (which must be given in the "
 "canonical capitalisation). Setting these variables has no effect other than "
@@ -1236,13 +1221,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:94
+#: deb-substvars.5:94
 #, no-wrap
 msgid "B<Format>"
 msgstr "B<Format>"
 
 # type: Plain text
-#: ../deb-substvars.5:104
+#: deb-substvars.5:104
 msgid ""
 "The B<.changes> file format version generated by this version of the source "
 "packaging scripts. If you set this variable the contents of the B<Format> "
@@ -1250,73 +1235,73 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:104
+#: deb-substvars.5:104
 #, no-wrap
 msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr "B<Newline>, B<Space>, B<Tab>"
 
 # type: Plain text
-#: ../deb-substvars.5:107
+#: deb-substvars.5:107
 msgid "These variables each hold the corresponding character."
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:107
+#: deb-substvars.5:107
 #, no-wrap
 msgid "B<shlibs:>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: ../deb-substvars.5:111
+#: deb-substvars.5:111
 msgid ""
 "Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:111
+#: deb-substvars.5:111
 #, no-wrap
 msgid "B<dpkg:Upstream-Version>"
 msgstr "B<dpkg:Upstream-Version>"
 
 # type: Plain text
-#: ../deb-substvars.5:114
+#: deb-substvars.5:114
 #, fuzzy
 msgid "The upstream version of dpkg."
 msgstr "B<dpkg-query> B<--version>"
 
 # type: TP
-#: ../deb-substvars.5:114
+#: deb-substvars.5:114
 #, no-wrap
 msgid "B<dpkg:Version>"
 msgstr "B<dpkg:Version>"
 
 # type: Plain text
-#: ../deb-substvars.5:117
+#: deb-substvars.5:117
 msgid "The full version of dpkg."
 msgstr "Pe³na wersja programu dpkg."
 
 # type: Plain text
-#: ../deb-substvars.5:120
+#: deb-substvars.5:120
 msgid ""
 "If a variable is referred to but not defined it generates a warning and an "
 "empty value is assumed."
 msgstr ""
 
 # type: TP
-#: ../deb-substvars.5:122
+#: deb-substvars.5:122
 #, no-wrap
 msgid "B<debian/substvars>"
 msgstr "B<debian/substvars>"
 
 # type: Plain text
 #
-#: ../deb-substvars.5:125
+#: deb-substvars.5:125
 #, fuzzy
 msgid "List of substitution variables and values."
 msgstr "Lista dostêpnych pakietów."
 
 # type: Plain text
-#: ../deb-substvars.5:129 ../dpkg-source.1:267
+#: deb-substvars.5:129 dpkg-source.1:267
 msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
@@ -1324,7 +1309,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../deb-substvars.5:136
+#: deb-substvars.5:136
 msgid ""
 "B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
 "(1), B<dpkg-source>(1)."
@@ -1333,34 +1318,34 @@ msgstr ""
 "(1), B<dpkg-source>(1)."
 
 # type: Plain text
-#: ../deb-substvars.5:139
+#: deb-substvars.5:139
 msgid "The utilities and this manpage were written by Ian Jackson."
 msgstr ""
 
 # type: SH
-#: ../deb-substvars.5:140 ../dpkg-name.1:105 ../install-info.8:281
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "PRAWA AUTORSKIE"
 
 # type: Plain text
-#: ../deb-substvars.5:142 ../dpkg-buildpackage.1:195 ../dpkg-distaddfile.1:49
-#: ../dpkg-genchanges.1:158 ../dpkg-gencontrol.1:121
-#: ../dpkg-parsechangelog.1:50 ../dpkg-shlibdeps.1:132 ../dpkg-source.1:282
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
 msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr "Copyright (C) 1995-1996 Ian Jackson"
 
 # type: Plain text
-#: ../deb-substvars.5:144 ../dpkg-buildpackage.1:197 ../dpkg-distaddfile.1:51
-#: ../dpkg-genchanges.1:160 ../dpkg-gencontrol.1:123
-#: ../dpkg-parsechangelog.1:52 ../dpkg-shlibdeps.1:134 ../dpkg-source.1:284
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
 msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr "Copyright (C) 2000 Wichert Akkerman"
 
 # type: Plain text
-#: ../deb-substvars.5:146 ../dpkg-buildpackage.1:199 ../dpkg-distaddfile.1:53
-#: ../dpkg-genchanges.1:162 ../dpkg-gencontrol.1:125
-#: ../dpkg-parsechangelog.1:54 ../dpkg-shlibdeps.1:136 ../dpkg-source.1:286
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO WARRANTY."
@@ -1370,45 +1355,44 @@ msgstr ""
 "warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
 # type: TH
-#: ../dpkg.1:1
+#: dpkg.1:1
 #, no-wrap
 msgid "dpkg"
 msgstr "dpkg"
 
 # type: TH
-#: ../dpkg.1:1
+#: dpkg.1:1
 #, no-wrap
 msgid "2006-04-09"
 msgstr "2006-04-09"
 
 # type: TH
-#: ../dpkg.1:1 ../dpkg.cfg.5:1 ../dpkg-deb.1:1 ../dpkg-query.1:1
-#: ../dselect.cfg.5:1
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
 msgid "dpkg suite"
 msgstr "u¿ytki dpkg"
 
 # type: Plain text
 #
-#: ../dpkg.1:4
+#: dpkg.1:4
 msgid "dpkg - package manager for Debian"
 msgstr "dpkg - mened¿er pakietów Debiana"
 
 # type: Plain text
 #
-#: ../dpkg.1:8
+#: dpkg.1:8
 msgid "B<dpkg> [I<options>] I<action>"
 msgstr "B<dpkg> [I<opcje>] I<dzia³anie>"
 
 # type: SH
-#: ../dpkg.1:9
+#: dpkg.1:9
 #, no-wrap
 msgid "WARNING"
 msgstr "UWAGA"
 
 # type: Plain text
 #
-#: ../dpkg.1:13
+#: dpkg.1:13
 msgid ""
 "This manual is intended for users wishing to understand B<dpkg>'s command "
 "line options and package states in more detail than that provided by B<dpkg "
@@ -1420,7 +1404,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:18
+#: dpkg.1:18
 msgid ""
 "It should I<not> be used by package maintainers wishing to understand how "
 "B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
@@ -1432,7 +1416,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:26
+#: dpkg.1:26
 msgid ""
 "B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
 "primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
@@ -1450,7 +1434,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:31
+#: dpkg.1:31
 msgid ""
 "B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
 "are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
@@ -1461,7 +1445,7 @@ msgstr ""
 "u¿yte, to B<dpkg> uruchomi B<dpkg-deb> i przeka¿e mu odpowiednie parametry:"
 
 # type: Plain text
-#: ../dpkg.1:40
+#: dpkg.1:40
 #, no-wrap
 msgid ""
 "    B<-b>, B<--build>,\n"
@@ -1484,19 +1468,19 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:42
+#: dpkg.1:42
 msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
 msgstr "Dzia³ania te s± opisane w osobnym podrêczniku do B<dpkg-deb>(1)."
 
 # type: SH
-#: ../dpkg.1:43
+#: dpkg.1:43
 #, no-wrap
 msgid "INFORMATION ABOUT PACKAGES"
 msgstr "INFORMACJE O PAKIETACH"
 
 # type: Plain text
 #
-#: ../dpkg.1:48
+#: dpkg.1:48
 msgid ""
 "B<dpkg> maintains some usable information about available packages. The "
 "information is divided in three classes: B<states>, B<selection states> and "
@@ -1507,32 +1491,32 @@ msgstr ""
 "Warto¶ci te mog± zostaæ zmienione za pomoc± programu B<dselect>."
 
 # type: SS
-#: ../dpkg.1:48
+#: dpkg.1:48
 #, no-wrap
 msgid "PACKAGE STATES"
 msgstr "STAN BIE¯¡CY PAKIETÓW"
 
 # type: TP
-#: ../dpkg.1:49
+#: dpkg.1:49
 #, no-wrap
 msgid "B<installed>"
 msgstr "B<installed (zainstalowany)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:52
+#: dpkg.1:52
 msgid "The package is unpacked and configured OK."
 msgstr "Pakiet jest rozpakowany i poprawnie skonfigurowany."
 
 # type: TP
-#: ../dpkg.1:52
+#: dpkg.1:52
 #, no-wrap
 msgid "B<half-installed>"
 msgstr "B<half-installed (wpó³zainstalowany)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:56
+#: dpkg.1:56
 msgid ""
 "The installation of the package has been started, but not completed for some "
 "reason."
@@ -1540,38 +1524,38 @@ msgstr ""
 "Instalacja pakietu zosta³a rozpoczêta, ale niedokoñczona z pewnych powodów."
 
 # type: TP
-#: ../dpkg.1:56
+#: dpkg.1:56
 #, no-wrap
 msgid "B<not-installed>"
 msgstr "B<not-installed (niezainstalowany)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:59
+#: dpkg.1:59
 msgid "The package is not installed on your system."
 msgstr "Pakiet nie jest zainstalowany w systemie."
 
 # type: TP
-#: ../dpkg.1:59
+#: dpkg.1:59
 #, no-wrap
 msgid "B<unpacked>"
 msgstr "B<unpacked (rozpakowany)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:62
+#: dpkg.1:62
 msgid "The package is unpacked, but not configured."
 msgstr "Pakiet jest rozpakowany, ale nie skonfigurowany."
 
 # type: TP
-#: ../dpkg.1:62
+#: dpkg.1:62
 #, no-wrap
 msgid "B<half-configured>"
 msgstr "B<half-configured (wpó³skonfigurowany)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:66
+#: dpkg.1:66
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
@@ -1580,44 +1564,44 @@ msgstr ""
 "niedokoñczona z pewnych powodów."
 
 # type: TP
-#: ../dpkg.1:66
+#: dpkg.1:66
 #, no-wrap
 msgid "B<config-files>"
 msgstr "B<config-files (pliki-konfiguracyjne)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:69
+#: dpkg.1:69
 msgid "Only the configuration files of the package exist on the system."
 msgstr "Tylko pliki konfiguracyjne pakietu zosta³y w systemie."
 
 # type: SS
-#: ../dpkg.1:69
+#: dpkg.1:69
 #, no-wrap
 msgid "PACKAGE SELECTION STATES"
 msgstr "STAN WYBORU PAKIETÓW"
 
 # type: TP
-#: ../dpkg.1:70
+#: dpkg.1:70
 #, no-wrap
 msgid "B<install>"
 msgstr "B<install (instalacja)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:73
+#: dpkg.1:73
 msgid "The package is selected for installation."
 msgstr "Pakiet zosta³ wybrany do zainstalowania."
 
 # type: TP
-#: ../dpkg.1:73
+#: dpkg.1:73
 #, no-wrap
 msgid "B<deinstall>"
 msgstr "B<deinstall (deinstalacja)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:77
+#: dpkg.1:77
 msgid ""
 "The package is selected for deinstallation (i.e. we want to remove all "
 "files, except configuration files)."
@@ -1626,14 +1610,14 @@ msgstr ""
 "wszystkie pliki pakietu, oprócz plików konfiguracyjnych)."
 
 # type: TP
-#: ../dpkg.1:77
+#: dpkg.1:77
 #, no-wrap
 msgid "B<purge>"
 msgstr "B<purge (wyczyszczenie)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:81
+#: dpkg.1:81
 msgid ""
 "The package is selected to be purged (i.e. we want to remove everything, "
 "even configuration files)."
@@ -1642,20 +1626,20 @@ msgstr ""
 "wszystko, w³±cznie z plikami konfiguracyjnymi)."
 
 # type: SS
-#: ../dpkg.1:81
+#: dpkg.1:81
 #, no-wrap
 msgid "PACKAGE FLAGS"
 msgstr "FLAGI PAKIETÓW"
 
 # type: TP
-#: ../dpkg.1:82
+#: dpkg.1:82
 #, no-wrap
 msgid "B<hold>"
 msgstr "B<hold (wstrzymanie)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:86
+#: dpkg.1:86
 msgid ""
 "A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
 "to do that with option B<--force-hold>."
@@ -1664,14 +1648,14 @@ msgstr ""
 "chyba ¿e u¿yje siê opcji B<--force-hold>."
 
 # type: TP
-#: ../dpkg.1:86
+#: dpkg.1:86
 #, no-wrap
 msgid "B<reinst-required>"
 msgstr "B<reinst-required (konieczna-reinstalacja)>"
 
 # type: Plain text
 #
-#: ../dpkg.1:91
+#: dpkg.1:91
 msgid ""
 "A package marked B<reinst-required> is broken and requires reinstallation. "
 "These packages cannot be removed, unless forced with option B<--force-remove-"
@@ -1682,20 +1666,20 @@ msgstr ""
 "B<--force-remove-reinstreq>."
 
 # type: SH
-#: ../dpkg.1:92
+#: dpkg.1:92
 #, no-wrap
 msgid "ACTIONS"
 msgstr "AKCJE"
 
 # type: TP
-#: ../dpkg.1:93
+#: dpkg.1:93
 #, no-wrap
 msgid "B<dpkg -i> | B<--install> I<package_file>..."
 msgstr "B<dpkg -i> | B<--install> I<plik_pakietu>..."
 
 # type: Plain text
 #
-#: ../dpkg.1:97
+#: dpkg.1:97
 msgid ""
 "Install the package. If B<--recursive> or B<-R> option is specified, "
 "I<package_file> must refer to a directory instead."
@@ -1705,19 +1689,19 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:99
+#: dpkg.1:99
 msgid "Installation consists of the following steps:"
 msgstr "Instalacja sk³ada siê z nastêpuj±cych kroków:"
 
 # type: Plain text
 #
-#: ../dpkg.1:102
+#: dpkg.1:102
 msgid "B<1.> Extract the control files of the new package."
 msgstr "B<1.> Rozpakowanie plików kontrolnych nowego pakietu."
 
 # type: Plain text
 #
-#: ../dpkg.1:106
+#: dpkg.1:106
 msgid ""
 "B<2.> If another version of the same package was installed before the new "
 "installation, execute I<prerm> script of the old package."
@@ -1727,13 +1711,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:109
+#: dpkg.1:109
 msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgstr "B<3.> Uruchomienie skryptu I<preinst>, je¶li pakiet go zawiera."
 
 # type: Plain text
 #
-#: ../dpkg.1:113
+#: dpkg.1:113
 msgid ""
 "B<4.> Unpack the new files, and at the same time back up the old files, so "
 "that if something goes wrong, they can be restored."
@@ -1743,7 +1727,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:120
+#: dpkg.1:120
 msgid ""
 "B<5.> If another version of the same package was installed before the new "
 "installation, execute the I<postrm> script of the old package. Note that "
@@ -1757,7 +1741,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:124
+#: dpkg.1:124
 msgid ""
 "B<6.> Configure the package. See B<--configure> for detailed information "
 "about how this is done."
@@ -1766,14 +1750,14 @@ msgstr ""
 "opisie parametru B<--configure>."
 
 # type: TP
-#: ../dpkg.1:124
+#: dpkg.1:124
 #, no-wrap
 msgid "B<dpkg --unpack >I<package_file> ..."
 msgstr "B<dpkg --unpack >I<plik_pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg.1:129
+#: dpkg.1:129
 msgid ""
 "Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
 "option is specified, I<package_file> must refer to a directory instead."
@@ -1782,14 +1766,14 @@ msgstr ""
 "B<--recursive> lub B<-R>, I<plik_pakietu> musi oznaczaæ wybrany katalog."
 
 # type: TP
-#: ../dpkg.1:129
+#: dpkg.1:129
 #, no-wrap
 msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
 msgstr "B<dpkg --configure >I<pakiet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
 #
-#: ../dpkg.1:134
+#: dpkg.1:134
 msgid ""
 "Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
 "of I<package>, all unpacked but unconfigured packages are configured."
@@ -1800,13 +1784,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:136
+#: dpkg.1:136
 msgid "Configuring consists of the following steps:"
 msgstr "Konfigurowanie sk³ada siê z nastêpuj±cych kroków:"
 
 # type: Plain text
 #
-#: ../dpkg.1:141
+#: dpkg.1:141
 msgid ""
 "B<1.> Unpack the configuration files, and at the same time back up the old "
 "configuration files, so that they can be restored if something goes wrong."
@@ -1816,19 +1800,19 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:144
+#: dpkg.1:144
 msgid "B<2.> Run I<postinst> script, if provided by the package."
 msgstr "B<2.> Uruchomienie skryptu I<postinst>, je¶li pakiet go zawiera."
 
 # type: TP
-#: ../dpkg.1:144
+#: dpkg.1:144
 #, no-wrap
 msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
 msgstr "B<dpkg -r> | B<--remove> | B<-P> | B< --purge >I<pakiet> ... | B<-a> | B<--pending>"
 
 # type: Plain text
 #
-#: ../dpkg.1:155
+#: dpkg.1:155
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "configuration files. This may avoid having to reconfigure the package if it "
@@ -1850,37 +1834,37 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:157
+#: dpkg.1:157
 msgid "Removing of a package consists of the following steps:"
 msgstr "Usuniêcie pakietu sk³ada siê z nastêpuj±cych kroków:"
 
 # type: Plain text
 #
-#: ../dpkg.1:160
+#: dpkg.1:160
 msgid "B<1.> Run I<prerm> script"
 msgstr "B<1.> Uruchomienie skryptu I<prerm>"
 
 # type: Plain text
 #
-#: ../dpkg.1:163
+#: dpkg.1:163
 msgid "B<2.> Remove the installed files"
 msgstr "B<2.> Usuniêcie zainstalowanych plików"
 
 # type: Plain text
 #
-#: ../dpkg.1:166
+#: dpkg.1:166
 msgid "B<3.> Run I<postrm> script"
 msgstr "B<3.> Uruchomienie skryptu I<postrm>"
 
 # type: TP
-#: ../dpkg.1:167
+#: dpkg.1:167
 #, no-wrap
 msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
 msgstr "B<dpkg --update-avail> | B<--merge-avail> I<plik_pakietów>"
 
 # type: Plain text
 #
-#: ../dpkg.1:176
+#: dpkg.1:176
 msgid ""
 "Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
 "action B<--merge-avail>, old information is combined with information from "
@@ -1899,7 +1883,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:179
+#: dpkg.1:179
 msgid ""
 "A simpler one-shot command to retrieve and update the I<available> file is "
 "B<dselect update>."
@@ -1908,14 +1892,14 @@ msgstr ""
 "B<dselect update>."
 
 # type: TP
-#: ../dpkg.1:179
+#: dpkg.1:179
 #, no-wrap
 msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
 msgstr "B<dpkg -A> | B<--record-avail> I<plik_pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg.1:185
+#: dpkg.1:185
 msgid ""
 "Update B<dpkg> and B<dselect>'s idea of which packages are available with "
 "information from the package I<package_file>. If B<--recursive> or B<-R> "
@@ -1927,40 +1911,40 @@ msgstr ""
 "oznaczaæ wybrany katalog."
 
 # type: TP
-#: ../dpkg.1:185
+#: dpkg.1:185
 #, no-wrap
 msgid "B<dpkg --forget-old-unavail>"
 msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
 #
-#: ../dpkg.1:188
+#: dpkg.1:188
 msgid "Forget about uninstalled unavailable packages."
 msgstr ""
 "Skasowanie informacji o wszystkich niezainstalowanych i niedostêpnych "
 "pakietach."
 
 # type: TP
-#: ../dpkg.1:188
+#: dpkg.1:188
 #, no-wrap
 msgid "B<dpkg --clear-avail>"
 msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
 #
-#: ../dpkg.1:191
+#: dpkg.1:191
 msgid "Erase the existing information about what packages are available."
 msgstr "Skasowanie informacji o dostêpnych pakietach."
 
 # type: TP
-#: ../dpkg.1:191
+#: dpkg.1:191
 #, no-wrap
 msgid "B<dpkg -C> | B<--audit>"
 msgstr "B<dpkg -C> | B<--audit>"
 
 # type: Plain text
 #
-#: ../dpkg.1:196
+#: dpkg.1:196
 msgid ""
 "Searches for packages that have been installed only partially on your "
 "system. B<dpkg> will suggest what to do with them to get them working."
@@ -1969,14 +1953,14 @@ msgstr ""
 "B<dpkg> zasugeruje, co mo¿na zrobiæ z tymi pakietami, aby w pe³ni dzia³a³y."
 
 # type: TP
-#: ../dpkg.1:196
+#: dpkg.1:196
 #, no-wrap
 msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
 msgstr "B<dpkg --get-selections> [I<wzorzec-nazwy-pakietu>...]"
 
 # type: Plain text
 #
-#: ../dpkg.1:200
+#: dpkg.1:200
 msgid ""
 "Get list of package selections, and write it to stdout. Without a pattern, "
 "packages marked with state purge will not be shown."
@@ -1986,13 +1970,13 @@ msgstr ""
 "wyczyszczenia (purge). "
 
 # type: TP
-#: ../dpkg.1:200
+#: dpkg.1:200
 #, no-wrap
 msgid "B<dpkg --set-selections>"
 msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: ../dpkg.1:206
+#: dpkg.1:206
 msgid ""
 "Set package selections using file read from stdin. This file should be in "
 "the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
@@ -2006,13 +1990,13 @@ msgstr ""
 "od '#'."
 
 # type: TP
-#: ../dpkg.1:206
+#: dpkg.1:206
 #, no-wrap
 msgid "B<dpkg --clear-selections>"
 msgstr "B<dpkg --clear-selections>"
 
 # type: Plain text
-#: ../dpkg.1:211
+#: dpkg.1:211
 msgid ""
 "Set the requested state of every non-essential package to deinstall.  This "
 "is intended to be used immediately before --set-selections, to deinstall any "
@@ -2024,14 +2008,14 @@ msgstr ""
 "selections."
 
 # type: TP
-#: ../dpkg.1:211
+#: dpkg.1:211
 #, no-wrap
 msgid "B<dpkg --yet-to-unpack>"
 msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
 #
-#: ../dpkg.1:215
+#: dpkg.1:215
 msgid ""
 "Searches for packages selected for installation, but which for some reason "
 "still haven't been installed."
@@ -2040,14 +2024,14 @@ msgstr ""
 "powodów nie mog³y zostaæ zainstalowane."
 
 # type: TP
-#: ../dpkg.1:216
+#: dpkg.1:216
 #, no-wrap
 msgid "B<dpkg --print-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
 #
-#: ../dpkg.1:219
+#: dpkg.1:219
 msgid ""
 "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
@@ -2055,14 +2039,14 @@ msgstr ""
 "\")."
 
 # type: TP
-#: ../dpkg.1:219
+#: dpkg.1:219
 #, no-wrap
 msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
 msgstr "B<dpkg --compare-versions >I<wersja1 op wersja2>"
 
 # type: Plain text
 #
-#: ../dpkg.1:230
+#: dpkg.1:230
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "success (zero result) if the specified condition is satisfied, and failure "
@@ -2084,14 +2068,14 @@ msgstr ""
 "kontrolnym: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 # type: TP
-#: ../dpkg.1:230
+#: dpkg.1:230
 #, no-wrap
 msgid "B<dpkg --command-fd E<lt>nE<gt>>"
 msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
 #
-#: ../dpkg.1:235
+#: dpkg.1:235
 msgid ""
 "Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
 "additional options set on the command line, and thru this file descriptor, "
@@ -2103,80 +2087,80 @@ msgstr ""
 "wykonywanych podczas tego samego przebiegu."
 
 # type: TP
-#: ../dpkg.1:235
+#: dpkg.1:235
 #, no-wrap
 msgid "B<dpkg --help>"
 msgstr "B<dpkg --help>"
 
 # type: Plain text
 #
-#: ../dpkg.1:238
+#: dpkg.1:238
 msgid "Display a brief help message."
 msgstr "Wy¶wietlenie krótkiego komunikatu pomocy."
 
 # type: TP
-#: ../dpkg.1:238
+#: dpkg.1:238
 #, no-wrap
 msgid "B<dpkg --force-help>"
 msgstr "B<dpkg --force-help>"
 
 # type: Plain text
 #
-#: ../dpkg.1:241
+#: dpkg.1:241
 msgid "Give help about the B<--force->I<thing> options."
 msgstr "Wy¶wietlenie opisu opcji B<--force->I<dzia³anie>."
 
 # type: TP
-#: ../dpkg.1:241
+#: dpkg.1:241
 #, no-wrap
 msgid "B<dpkg -Dh >|B< --debug=help>"
 msgstr "B<dpkg -Dh >|B< --debug=help>"
 
 # type: Plain text
 #
-#: ../dpkg.1:244
+#: dpkg.1:244
 msgid "Give help about debugging options."
 msgstr "Wy¶wietlenie opisu opcji debuggera."
 
 # type: TP
-#: ../dpkg.1:244
+#: dpkg.1:244
 #, no-wrap
 msgid "B<dpkg --licence> | B<dpkg --license>"
 msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
 #
-#: ../dpkg.1:247
+#: dpkg.1:247
 msgid "Display B<dpkg> licence."
 msgstr "Wy¶wietlenie licencji B<dpkg>."
 
 # type: TP
-#: ../dpkg.1:247
+#: dpkg.1:247
 #, no-wrap
 msgid "B<dpkg --version>"
 msgstr "B<dpkg --version>"
 
 # type: Plain text
 #
-#: ../dpkg.1:250
+#: dpkg.1:250
 msgid "Display B<dpkg> version information."
 msgstr "Wy¶wietlenie informacji o wersji B<dpkg>."
 
 # type: TP
-#: ../dpkg.1:250
+#: dpkg.1:250
 #, no-wrap
 msgid "B<dpkg-deb actions>"
 msgstr "B<akcje dpkg-deb>"
 
 # type: Plain text
 #
-#: ../dpkg.1:253
+#: dpkg.1:253
 msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
 "Zajrzyj do B<dpkg-deb>(1), aby poznaæ pe³ny opis nastêpuj±cych dzia³añ."
 
 # type: Plain text
-#: ../dpkg.1:273
+#: dpkg.1:273
 #, no-wrap
 msgid ""
 "B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
@@ -2216,21 +2200,21 @@ msgstr ""
 "    Rozpakowanie pakietu i podanie nazw plików, które zawiera pakiet.\n"
 
 # type: TP
-#: ../dpkg.1:275
+#: dpkg.1:275
 #, no-wrap
 msgid "B<dpkg-query actions>"
 msgstr "B<akcje dpkg-query>"
 
 # type: Plain text
 #
-#: ../dpkg.1:278
+#: dpkg.1:278
 msgid "See B<dpkg-query>(1) for more information about the following actions."
 msgstr ""
 "Proszê przeczytaæ B<dpkg-query>(8), aby uzyskaæ szczegó³owe informacje o "
 "nastêpuj±cych dzia³aniach."
 
 # type: Plain text
-#: ../dpkg.1:291
+#: dpkg.1:291
 #, no-wrap
 msgid ""
 "B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
@@ -2258,7 +2242,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:298
+#: dpkg.1:298
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
@@ -2271,28 +2255,28 @@ msgstr ""
 "pocz±tkowych my¶lników), albo komentarzem (je¿eli zaczyna siê od B<#>)."
 
 # type: TP
-#: ../dpkg.1:299
+#: dpkg.1:299
 #, no-wrap
 msgid "B<--abort-after=>I<number>"
 msgstr "B<--abort-after=>I<liczba>"
 
 # type: Plain text
 #
-#: ../dpkg.1:302
+#: dpkg.1:302
 msgid "Change after how many errors B<dpkg> will abort. The default is 50."
 msgstr ""
 "Zmiana liczby b³êdów, po których B<dpkg> zaprzestanie dzia³ania. Domy¶lna "
 "warto¶æ to 50."
 
 # type: TP
-#: ../dpkg.1:302
+#: dpkg.1:302
 #, no-wrap
 msgid "B<-B>|B<--auto-deconfigure>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
 #
-#: ../dpkg.1:308
+#: dpkg.1:308
 msgid ""
 "When a package is removed, there is a possibility that another installed "
 "package depended on the removed package. Specifying this option will cause "
@@ -2304,14 +2288,14 @@ msgstr ""
 "automatyczne dekonfigurowanie pakietów, które s± zale¿ne od usuwanego."
 
 # type: TP
-#: ../dpkg.1:308
+#: dpkg.1:308
 #, no-wrap
 msgid "B<-D>I<octal>B< | --debug=>I<octal>"
 msgstr "B<-D>I<oktal>B< | --debug=>I<oktal>"
 
 # type: Plain text
 #
-#: ../dpkg.1:314
+#: dpkg.1:314
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
 "together from the list below (note that these values may change in future "
@@ -2323,7 +2307,7 @@ msgstr ""
 "warto¶ci."
 
 # type: Plain text
-#: ../dpkg.1:326
+#: dpkg.1:326
 #, no-wrap
 msgid ""
 " number  description\n"
@@ -2351,14 +2335,14 @@ msgstr ""
 " 2000   Reszta szczegó³owych informacji\n"
 
 # type: TP
-#: ../dpkg.1:326
+#: dpkg.1:326
 #, no-wrap
 msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 msgstr "B<--force->I<dzia³anie> | B<--no-force->I<dzia³anie> | B<--refuse->I<dzia³anie>"
 
 # type: Plain text
 #
-#: ../dpkg.1:333
+#: dpkg.1:333
 msgid ""
 "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
 "things. I<things> is a comma separated list of things specified below. B<--"
@@ -2372,7 +2356,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:337
+#: dpkg.1:337
 msgid ""
 "I<Warning: These options are mostly intended to be used by experts only. "
 "Using them without fully understanding their effects may break your whole "
@@ -2384,13 +2368,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:340
+#: dpkg.1:340
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: W³±cza (lub wy³±cza) wszystkie opcje typu \"force\"."
 
 # type: Plain text
 #
-#: ../dpkg.1:343
+#: dpkg.1:343
 msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
@@ -2400,7 +2384,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:350
+#: dpkg.1:350
 msgid ""
 "I<Warning: At present dpkg does not do any dependency checking on downgrades "
 "and therefore will not warn you if the downgrade breaks the dependency of "
@@ -2417,7 +2401,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:354
+#: dpkg.1:354
 msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
@@ -2427,7 +2411,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:357
+#: dpkg.1:357
 msgid "B<hold>: Process packages even when marked \"hold\"."
 msgstr ""
 "B<hold>: Dzia³anie obejmie tak¿e pakiety oznaczone jako \"wstrzymane"
@@ -2435,7 +2419,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:362
+#: dpkg.1:362
 msgid ""
 "B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
 "require reinstallation. This may, for example, cause parts of the package to "
@@ -2447,7 +2431,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:367
+#: dpkg.1:367
 msgid ""
 "B<remove-essential>: Remove, even if the package is considered essential. "
 "Essential packages contain mostly very basic Unix commands. Removing them "
@@ -2460,14 +2444,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:370
+#: dpkg.1:370
 msgid "B<depends>: Turn all dependency problems into warnings."
 msgstr ""
 "B<depends>: Zamiana wszystkich problemów z zale¿no¶ciami na ostrze¿enia."
 
 # type: Plain text
 #
-#: ../dpkg.1:373
+#: dpkg.1:373
 msgid ""
 "B<depends-version>: Don't care about versions when checking dependencies."
 msgstr ""
@@ -2476,7 +2460,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:377
+#: dpkg.1:377
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files."
@@ -2487,7 +2471,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:382
+#: dpkg.1:382
 msgid ""
 "B<confmiss>: Always install a missing configuration file. This is dangerous, "
 "since it means not preserving a change (removing) made to the file."
@@ -2498,7 +2482,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:387
+#: dpkg.1:387
 msgid ""
 "B<confnew>: If a conffile has been modified always install the new version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2510,7 +2494,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:392
+#: dpkg.1:392
 msgid ""
 "B<confold>: If a conffile has been modified always keep the old version "
 "without prompting, unless the B<--force-confdef> is also specified, in which "
@@ -2522,7 +2506,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:398
+#: dpkg.1:398
 msgid ""
 "B<confdef>: If a conffile has been modified always choose the default "
 "action. If there is no default action it will stop to ask the user unless "
@@ -2536,7 +2520,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:401
+#: dpkg.1:401
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
 "B<overwrite>: Nadpisanie plików z innych pakietów, w przypadku gdy dany plik "
@@ -2544,7 +2528,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:404
+#: dpkg.1:404
 msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
 "B<overwrite-dir> Nadpisanie katalogów z innych pakietów, w przypadku gdy "
@@ -2552,7 +2536,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:407
+#: dpkg.1:407
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
@@ -2560,13 +2544,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:410
+#: dpkg.1:410
 msgid "B<architecture>: Process even packages with the wrong architecture."
 msgstr "B<architecture>: Dzia³anie obejmie pakiety z niepoprawn± architektur±."
 
 # type: Plain text
 #
-#: ../dpkg.1:413
+#: dpkg.1:413
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
@@ -2575,7 +2559,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:416
+#: dpkg.1:416
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
 "B<not-root>: Próba (de)instalacji, gdy dpkg nie jest uruchamiany z konta "
@@ -2583,21 +2567,21 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:419
+#: dpkg.1:419
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
 "B<bad-verify>: Instalowanie pakietu, nawet je¿eli nie powiedzie siê "
 "sprawdzenie jego autentyczno¶ci."
 
 # type: TP
-#: ../dpkg.1:420
+#: dpkg.1:420
 #, no-wrap
 msgid "B<--ignore-depends>=I<package>,..."
 msgstr "B<--ignore-depends>=I<pakiet>,..."
 
 # type: Plain text
 #
-#: ../dpkg.1:424
+#: dpkg.1:424
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
 "performed, but only warnings about conflicts are given, nothing else)."
@@ -2607,14 +2591,14 @@ msgstr ""
 "tylko ostrze¿enie)."
 
 # type: TP
-#: ../dpkg.1:424
+#: dpkg.1:424
 #, no-wrap
 msgid "B<--new> | B<--old>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
 #
-#: ../dpkg.1:428
+#: dpkg.1:428
 msgid ""
 "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
@@ -2622,14 +2606,14 @@ msgstr ""
 "przes³ana do B<dpkg-deb>(1)."
 
 # type: TP
-#: ../dpkg.1:428 ../dpkg-deb.1:211
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
 #
-#: ../dpkg.1:432
+#: dpkg.1:432
 msgid ""
 "Don't read or check contents of control file while building a package.  This "
 "is a B<dpkg-deb>(1) option."
@@ -2638,14 +2622,14 @@ msgstr ""
 "opcja jest przes³ana do B<dpkg-deb>(1)."
 
 # type: TP
-#: ../dpkg.1:432
+#: dpkg.1:432
 #, no-wrap
 msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
 msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
 #
-#: ../dpkg.1:437
+#: dpkg.1:437
 msgid ""
 "Do everything which is supposed to be done, but don't write any changes. "
 "This is used to see what would happen with the specified action, without "
@@ -2657,7 +2641,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:442
+#: dpkg.1:442
 msgid ""
 "Be sure to give B<--no-act> before the action-parameter, or you might end up "
 "with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
@@ -2671,14 +2655,14 @@ msgstr ""
 "nie zrobi)."
 
 # type: TP
-#: ../dpkg.1:442
+#: dpkg.1:442
 #, no-wrap
 msgid "B<-R> | B<--recursive>"
 msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
 #
-#: ../dpkg.1:448
+#: dpkg.1:448
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -2689,14 +2673,14 @@ msgstr ""
 "B<--install>, B<--unpack> oraz B<--avail>."
 
 # type: TP
-#: ../dpkg.1:448
+#: dpkg.1:448
 #, no-wrap
 msgid "B<-G>"
 msgstr "B<-G>"
 
 # type: Plain text
 #
-#: ../dpkg.1:452
+#: dpkg.1:452
 msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
@@ -2705,14 +2689,14 @@ msgstr ""
 "Jest to dok³adnie to samo, co B<--refuse-downgrade>."
 
 # type: TP
-#: ../dpkg.1:452
+#: dpkg.1:452
 #, no-wrap
 msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 msgstr "B<--root=>I<katalog> | B<--admindir=>I<katalog> | B<--instdir=>I<katalog>"
 
 # type: Plain text
 #
-#: ../dpkg.1:463
+#: dpkg.1:463
 msgid ""
 "Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
 "contains many files that give information about status of installed or "
@@ -2734,14 +2718,14 @@ msgstr ""
 "na I<katalog>B</var/lib/dpkg>."
 
 # type: TP
-#: ../dpkg.1:463
+#: dpkg.1:463
 #, no-wrap
 msgid "B<-O> | B<--selected-only>"
 msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
 #
-#: ../dpkg.1:469
+#: dpkg.1:469
 msgid ""
 "Only process the packages that are selected for installation. The actual "
 "marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
@@ -2754,14 +2738,14 @@ msgstr ""
 "wybrany do odinstalowania."
 
 # type: TP
-#: ../dpkg.1:469
+#: dpkg.1:469
 #, no-wrap
 msgid "B<-E> | B<--skip-same-version>"
 msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
 #
-#: ../dpkg.1:473
+#: dpkg.1:473
 msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
@@ -2770,14 +2754,14 @@ msgstr ""
 "systemie."
 
 # type: TP
-#: ../dpkg.1:473
+#: dpkg.1:473
 #, no-wrap
 msgid "B<--status-fd >I<E<lt>nE<gt>>"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
 #
-#: ../dpkg.1:480
+#: dpkg.1:480
 msgid ""
 "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
 "given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
@@ -2795,13 +2779,13 @@ msgstr ""
 "distedited'"
 
 # type: TP
-#: ../dpkg.1:480
+#: dpkg.1:480
 #, no-wrap
 msgid "B<--log=>I<filename>"
 msgstr "B<--log=>I<nazwa-pliku>"
 
 # type: Plain text
-#: ../dpkg.1:492
+#: dpkg.1:492
 msgid ""
 "Log status change updates and actions to I<filename>, instead of the default "
 "I</var/log/dpkg.log>. If this option is given multiple times, the last "
@@ -2826,42 +2810,42 @@ msgstr ""
 "install (instalacja nowej wersji), albo keep (zachowanie poprzedniej wersji)."
 
 # type: TP
-#: ../dpkg.1:492
+#: dpkg.1:492
 #, no-wrap
 msgid "B<--no-debsig>"
 msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: ../dpkg.1:495
+#: dpkg.1:495
 msgid "Do not try to verify package signatures."
 msgstr "Nie próbuje weryfikowaæ sygnatur pakietu."
 
 # type: TP
-#: ../dpkg.1:497 ../dpkg.cfg.5:14
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
 msgid "I</etc/dpkg/dpkg.cfg>"
 msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
 #
-#: ../dpkg.1:500
+#: dpkg.1:500
 msgid "Configuration file with default options."
 msgstr "Plik konfiguracyjny zawieraj±cy domy¶lne opcje."
 
 # type: TP
-#: ../dpkg.1:500
+#: dpkg.1:500
 #, no-wrap
 msgid "I</var/log/dpkg.log>"
 msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: ../dpkg.1:504
+#: dpkg.1:504
 msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr "Domy¶lny plik logu (patrz I</etc/dpkg/dpkg.cfg>(5) i opcja B<--log>)."
 
 # type: Plain text
 #
-#: ../dpkg.1:507
+#: dpkg.1:507
 msgid ""
 "The other files listed below are in their default directories, see option "
 "B<--admindir> to see how to change locations of these files."
@@ -2870,26 +2854,26 @@ msgstr ""
 "katalogów. Opcja B<--admindir> mo¿e zmieniæ lokalizacjê tych plików."
 
 # type: TP
-#: ../dpkg.1:507
+#: dpkg.1:507
 #, no-wrap
 msgid "I</var/lib/dpkg/available>"
 msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
 #
-#: ../dpkg.1:510
+#: dpkg.1:510
 msgid "List of available packages."
 msgstr "Lista dostêpnych pakietów."
 
 # type: TP
-#: ../dpkg.1:510
+#: dpkg.1:510
 #, no-wrap
 msgid "I</var/lib/dpkg/status>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
 #
-#: ../dpkg.1:516
+#: dpkg.1:516
 msgid ""
 "Statuses of available packages. This file contains information about whether "
 "a package is marked for removing or not, whether it is installed or not, "
@@ -2901,7 +2885,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:519
+#: dpkg.1:519
 msgid ""
 "The following files are components of a binary package. See B<deb>(5)  for "
 "more information about them:"
@@ -2910,56 +2894,56 @@ msgstr ""
 "nich mo¿na znale¼æ w B<deb>(5)."
 
 # type: TP
-#: ../dpkg.1:519
+#: dpkg.1:519
 #, no-wrap
 msgid "I<control>"
 msgstr "I<control>"
 
 # type: TP
-#: ../dpkg.1:521
+#: dpkg.1:521
 #, no-wrap
 msgid "I<conffiles>"
 msgstr "I<conffiles>"
 
 # type: TP
-#: ../dpkg.1:523
+#: dpkg.1:523
 #, no-wrap
 msgid "I<preinst>"
 msgstr "I<preinst>"
 
 # type: TP
-#: ../dpkg.1:525
+#: dpkg.1:525
 #, no-wrap
 msgid "I<postinst>"
 msgstr "I<postinst>"
 
 # type: TP
-#: ../dpkg.1:527
+#: dpkg.1:527
 #, no-wrap
 msgid "I<prerm>"
 msgstr "I<prerm>"
 
 # type: TP
-#: ../dpkg.1:529
+#: dpkg.1:529
 #, no-wrap
 msgid "I<postrm>"
 msgstr "I<postrm>"
 
 # type: SH
-#: ../dpkg.1:532
+#: dpkg.1:532
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "ZMIENNE ¦RODOWISKA"
 
 # type: TP
-#: ../dpkg.1:533
+#: dpkg.1:533
 #, no-wrap
 msgid "B<DPKG_NO_TSTP>"
 msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
 #
-#: ../dpkg.1:537
+#: dpkg.1:537
 msgid ""
 "Define this to something if you prefer B<dpkg> starting a new shell rather "
 "than suspending itself, while doing a shell escape."
@@ -2968,27 +2952,27 @@ msgstr ""
 "zamiast usuwaæ B<dpkg> w t³o, gdy potrzeba wykonaæ co¶ w pow³oce."
 
 # type: TP
-#: ../dpkg.1:537
+#: dpkg.1:537
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 # type: Plain text
 #
-#: ../dpkg.1:540
+#: dpkg.1:540
 msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
 "Program uruchamiany przez B<dpkg>, gdy trzeba uruchomiæ now± sesjê pow³oki."
 
 # type: TP
-#: ../dpkg.1:540 ../dpkg-query.1:144
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
 
 # type: Plain text
 #
-#: ../dpkg.1:544
+#: dpkg.1:544
 msgid ""
 "Sets the number of columns B<dpkg> should use when displaying formatted "
 "text. Currently only used by -l."
@@ -2997,69 +2981,69 @@ msgstr ""
 "sformatowanego tekstu. Obecnie u¿ywane tylko przez opcjê -l."
 
 # type: SH
-#: ../dpkg.1:545 ../dpkg-architecture.1:246 ../dpkg-divert.8:87
-#: ../dpkg-name.1:66 ../update-alternatives.8:356
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "PRZYK£ADY"
 
 # type: Plain text
 #
-#: ../dpkg.1:547
+#: dpkg.1:547
 msgid "To list packages related to the editor B<vi>(1):"
 msgstr ""
 "Wy¶wietlenie wszystkich pakietów mog±cych byæ zwi±zanymi z edytorem B<vi>(1):"
 
 # type: Plain text
 #
-#: ../dpkg.1:549
+#: dpkg.1:549
 #, no-wrap
 msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
 msgstr "    B<dpkg -l \\(aq*vi*\\(aq>\n"
 
 # type: Plain text
 #
-#: ../dpkg.1:552
+#: dpkg.1:552
 msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
 msgstr ""
 "Wy¶wietlenie informacji z pliku I</var/lib/dpkg/available> o dwóch pakietach:"
 
 # type: Plain text
 #
-#: ../dpkg.1:554
+#: dpkg.1:554
 #, no-wrap
 msgid "     B<dpkg --print-avail elvis vim | less>\n"
 msgstr "     B<dpkg --print-avail elvis vim | less>\n"
 
 # type: Plain text
 #
-#: ../dpkg.1:557
+#: dpkg.1:557
 msgid "To search the listing of packages yourself:"
 msgstr "Samodzielne przeszukanie informacji o pakietach:"
 
 # type: Plain text
 #
-#: ../dpkg.1:559
+#: dpkg.1:559
 #, no-wrap
 msgid "     B<less /var/lib/dpkg/available>\n"
 msgstr "     B<less /var/lib/dpkg/available>\n"
 
 # type: Plain text
 #
-#: ../dpkg.1:562
+#: dpkg.1:562
 msgid "To remove an installed elvis package:"
 msgstr "Wykasowanie zainstalowanego pakietu elvis:"
 
 # type: Plain text
 #
-#: ../dpkg.1:564
+#: dpkg.1:564
 #, no-wrap
 msgid "     B<dpkg -r elvis>\n"
 msgstr "     B<dpkg -r elvis>\n"
 
 # type: Plain text
 #
-#: ../dpkg.1:569
+#: dpkg.1:569
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "\"available\" file shows that the vim package is in section \"editors\":"
@@ -3069,7 +3053,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:572
+#: dpkg.1:572
 #, no-wrap
 msgid ""
 "     B<cd /cdrom/hamm/hamm/binary/editors>\n"
@@ -3080,20 +3064,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:575
+#: dpkg.1:575
 msgid "To make a local copy of the package selection states:"
 msgstr "Aby stworzyæ kopiê lokalnie wybranych pakietów:"
 
 # type: Plain text
 #
-#: ../dpkg.1:577
+#: dpkg.1:577
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
 msgstr "     B<dpkg --get-selections E<gt>mojepakiety>\n"
 
 # type: Plain text
 #
-#: ../dpkg.1:581
+#: dpkg.1:581
 msgid ""
 "You might transfer this file to another computer, and install it there with:"
 msgstr ""
@@ -3101,7 +3085,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:584
+#: dpkg.1:584
 #, no-wrap
 msgid ""
 "     B<dpkg --clear-selections>\n"
@@ -3112,7 +3096,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:590
+#: dpkg.1:590
 msgid ""
 "Note that this will not actually install or remove anything, but just set "
 "the selection state on the requested packages. You will need some other "
@@ -3127,7 +3111,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:593
+#: dpkg.1:593
 msgid ""
 "Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
 "to modify the package selection states."
@@ -3136,14 +3120,14 @@ msgstr ""
 "mo¿liwo¶ci zmiany ich stanu."
 
 # type: SH
-#: ../dpkg.1:595
+#: dpkg.1:595
 #, no-wrap
 msgid "ADDITIONAL FUNCTIONALITY"
 msgstr "DODATKOWA FUNKCJONALNO¦Æ"
 
 # type: Plain text
 #
-#: ../dpkg.1:598
+#: dpkg.1:598
 msgid ""
 "Additional functionality can be gained by installing any of the following "
 "packages: I<apt>, I<aptitude> and I<debsums>."
@@ -3153,7 +3137,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:608
+#: dpkg.1:608
 msgid ""
 "B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
 "(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
@@ -3163,21 +3147,21 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg.1:611
+#: dpkg.1:611
 msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> podaje raczej zbyt ma³o pomocnych informacji."
 
 # type: SH
-#: ../dpkg.1:612 ../dpkg-buildpackage.1:193 ../dpkg-distaddfile.1:47
-#: ../dpkg-genchanges.1:156 ../dpkg-gencontrol.1:119
-#: ../dpkg-parsechangelog.1:48 ../dpkg-shlibdeps.1:130 ../dpkg-source.1:280
-#: ../dselect.1:449 ../start-stop-daemon.8:242
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORZY"
 
 # type: Plain text
-#: ../dpkg.1:616
+#: dpkg.1:616
 #, no-wrap
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
@@ -3187,39 +3171,39 @@ msgstr ""
 "siê do rozwoju programu B<dpkg>.\n"
 
 # type: TP
-#: ../dpkg-architecture.1:1
+#: dpkg-architecture.1:1
 #, no-wrap
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
 # type: Plain text
-#: ../dpkg-architecture.1:4
+#: dpkg-architecture.1:4
 msgid ""
 "dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-architecture.1:9
+#: dpkg-architecture.1:9
 msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
 msgstr "B<dpkg-architecture> [I<opcje>] [I<polecenia>]"
 
 # type: Plain text
-#: ../dpkg-architecture.1:14
+#: dpkg-architecture.1:14
 msgid ""
 "dpkg-architecture does provide a facility to determine and set the build and "
 "host architecture for package building."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:17
+#: dpkg-architecture.1:17
 msgid ""
 "The build architecture is always determined by an external call to B<dpkg>"
 "(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:26
+#: dpkg-architecture.1:26
 msgid ""
 "You can specify the host architecture by providing one or both of the "
 "options B<-a> and B<-t>. The default is determined by an external call to "
@@ -3231,35 +3215,34 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../dpkg-architecture.1:27 ../dpkg-deb.1:28 ../dpkg-divert.8:24
-#: ../dpkg-query.1:13 ../dpkg-source.1:20 ../dpkg-split.1:32
-#: ../dpkg-statoverride.8:24 ../start-stop-daemon.8:37
-#: ../update-alternatives.8:203
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
 msgid "COMMANDS"
 msgstr "POLECENIA"
 
 # type: TP
-#: ../dpkg-architecture.1:28
+#: dpkg-architecture.1:28
 #, no-wrap
 msgid "B<-l>"
 msgstr "B<-l>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:32
+#: dpkg-architecture.1:32
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
 msgstr ""
 
 # type: TP
-#: ../dpkg-architecture.1:32
+#: dpkg-architecture.1:32
 #, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<-e>I<architektura-debiana>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:38
+#: dpkg-architecture.1:38
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -3268,13 +3251,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-architecture.1:38
+#: dpkg-architecture.1:38
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr "B<-i>I<architecture-wildcard>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:44
+#: dpkg-architecture.1:44
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -3283,48 +3266,48 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-architecture.1:44
+#: dpkg-architecture.1:44
 #, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<-q>I<nazwa-zmiennej>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:47
+#: dpkg-architecture.1:47
 msgid "Print the value of a single variable."
 msgstr "Wy¶wietla warto¶æ pojedynczej zmiennej."
 
 # type: TP
-#: ../dpkg-architecture.1:47
+#: dpkg-architecture.1:47
 #, no-wrap
 msgid "B<-s>"
 msgstr "B<-s>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:51
+#: dpkg-architecture.1:51
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
 msgstr ""
 
 # type: TP
-#: ../dpkg-architecture.1:51
+#: dpkg-architecture.1:51
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:54
+#: dpkg-architecture.1:54
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 # type: TP
-#: ../dpkg-architecture.1:54
+#: dpkg-architecture.1:54
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr "B<-c>I< polecenie>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:58
+#: dpkg-architecture.1:58
 #, fuzzy
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
@@ -3332,46 +3315,46 @@ msgid ""
 msgstr "Wykonuje I<polecenie> w ¶rodowisku"
 
 # type: TP
-#: ../dpkg-architecture.1:58
+#: dpkg-architecture.1:58
 #, no-wrap
 msgid "B<-L>"
 msgstr "B<-L>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:61
+#: dpkg-architecture.1:61
 msgid "Print a list of valid architecture names."
 msgstr "Wy¶wietla listê poprawnych nazw architektur."
 
 # type: TP
-#: ../dpkg-architecture.1:69
+#: dpkg-architecture.1:69
 #, no-wrap
 msgid "B<-a>I<debian-architecture>"
 msgstr "B<-a>I<architektura-debiana>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:72
+#: dpkg-architecture.1:72
 msgid "Set the Debian architecture."
 msgstr "Ustawia architekturê Debiana."
 
 # type: TP
-#: ../dpkg-architecture.1:72
+#: dpkg-architecture.1:72
 #, no-wrap
 msgid "B<-t>I<gnu-system-type>"
 msgstr "B<-t>I<typ-systemu-gnu>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:75
+#: dpkg-architecture.1:75
 msgid "Set the GNU system type."
 msgstr "Ustawia typ systemu GNU."
 
 # type: TP
-#: ../dpkg-architecture.1:75
+#: dpkg-architecture.1:75
 #, no-wrap
 msgid "B<-f>"
 msgstr "B<-f>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:82
+#: dpkg-architecture.1:82
 msgid ""
 "Values set by existing environment variables with the same name as used by "
 "the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
@@ -3381,54 +3364,54 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../dpkg-architecture.1:83
+#: dpkg-architecture.1:83
 #, no-wrap
 msgid "TERMS"
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:84
+#: dpkg-architecture.1:84
 #, fuzzy, no-wrap
 msgid "build machine"
 msgstr "Komputer niewieloprocesorowy...\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:86
+#: dpkg-architecture.1:86
 msgid "The machine the package is built on."
 msgstr "Komputer, na którym pakiet jest budowany."
 
 # type: IP
-#: ../dpkg-architecture.1:86
+#: dpkg-architecture.1:86
 #, fuzzy, no-wrap
 msgid "host machine"
 msgstr "Nieznany komputer: %s"
 
 # type: Plain text
-#: ../dpkg-architecture.1:88
+#: dpkg-architecture.1:88
 msgid "The machine the package is built for."
 msgstr "Architektura, dla której pakiet jest budowany."
 
 # type: TH
-#: ../dpkg-architecture.1:88
+#: dpkg-architecture.1:88
 #, no-wrap
 msgid "Debian architecture"
 msgstr "architektura Debiana"
 
 # type: Plain text
-#: ../dpkg-architecture.1:91
+#: dpkg-architecture.1:91
 msgid ""
 "The Debian architecture string, which specifies the binary tree in the \\s-"
 "1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:91
+#: dpkg-architecture.1:91
 #, fuzzy, no-wrap
 msgid "architecture wildcard"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: ../dpkg-architecture.1:95
+#: dpkg-architecture.1:95
 msgid ""
 "An architecture wildcard is a special architecture string that will match "
 "any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
@@ -3436,13 +3419,13 @@ msgid ""
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:95
+#: dpkg-architecture.1:95
 #, no-wrap
 msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:99
+#: dpkg-architecture.1:99
 msgid ""
 "An architecture specification string consisting of two parts separated by a "
 "dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
@@ -3450,156 +3433,156 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../dpkg-architecture.1:100
+#: dpkg-architecture.1:100
 #, no-wrap
 msgid "VARIABLES"
 msgstr "ZMIENNE"
 
 # type: Plain text
-#: ../dpkg-architecture.1:102
+#: dpkg-architecture.1:102
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr "B<dpkg-architecture> ustawia nastêpuj±ce zmienne:"
 
 # type: IP
-#: ../dpkg-architecture.1:102
+#: dpkg-architecture.1:102
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:104
+#: dpkg-architecture.1:104
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:104
+#: dpkg-architecture.1:104
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:106
+#: dpkg-architecture.1:106
 msgid "The Debian system name of the build machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:106
+#: dpkg-architecture.1:106
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:108
+#: dpkg-architecture.1:108
 msgid "The Debian cpu name of the build machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:108
+#: dpkg-architecture.1:108
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:110
+#: dpkg-architecture.1:110
 msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:110
+#: dpkg-architecture.1:110
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_CPU\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:112
+#: dpkg-architecture.1:112
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr "Czê¶æ dotycz±ca \\s-1CPU\\s0 z \\s-1DEB_BUILD_GNU_TYPE\\s0"
 
 # type: IP
-#: ../dpkg-architecture.1:112
+#: dpkg-architecture.1:112
 #, no-wrap
 msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:114
+#: dpkg-architecture.1:114
 msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr "Cze¶æ dotycz±ca systemu z \\s-1DEB_BUILD_GNU_TYPE\\s0."
 
 # type: IP
-#: ../dpkg-architecture.1:114
+#: dpkg-architecture.1:114
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr "\\s-1DEB_HOST_ARCH\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:116
+#: dpkg-architecture.1:116
 msgid "The Debian architecture of the host machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:116
+#: dpkg-architecture.1:116
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr "\\s-1DEB_BUILD_ARCH_OS\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:118
+#: dpkg-architecture.1:118
 msgid "The Debian system name of the host machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:118
+#: dpkg-architecture.1:118
 #, no-wrap
 msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr "\\s-1DEB_HOST_ARCH_CPU\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:120
+#: dpkg-architecture.1:120
 msgid "The Debian cpu name of the host machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:120
+#: dpkg-architecture.1:120
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr "\\s-1DEB_HOST_GNU_TYPE\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:122
+#: dpkg-architecture.1:122
 msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:122
+#: dpkg-architecture.1:122
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr "\\s-1DEB_HOST_GNU_CPU\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:124
+#: dpkg-architecture.1:124
 msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
 # type: IP
-#: ../dpkg-architecture.1:124
+#: dpkg-architecture.1:124
 #, no-wrap
 msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 
 # type: Plain text
-#: ../dpkg-architecture.1:126
+#: dpkg-architecture.1:126
 msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr "Czê¶æ dotycz±ca systemu z \\s-1DEB_HOST_GNU_TYPE\\s0."
 
 # type: SH
-#: ../dpkg-architecture.1:127
+#: dpkg-architecture.1:127
 #, no-wrap
 msgid "DEBIAN/RULES"
 msgstr "DEBIAN/RULES"
 
 # type: Plain text
-#: ../dpkg-architecture.1:135
+#: dpkg-architecture.1:135
 msgid ""
 "The environment variables set by B<dpkg-architecture> are passed to I<debian/"
 "rules> as make variables (see make documentation). However, you should not "
@@ -3610,12 +3593,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:138 ../dpkg-architecture.1:155
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
 msgid "Instead of:"
 msgstr "Zamiast:"
 
 # type: Plain text
-#: ../dpkg-architecture.1:142
+#: dpkg-architecture.1:142
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -3625,12 +3608,12 @@ msgstr ""
 "configure $(\\s-1ARCH\\s0)-linux\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:145
+#: dpkg-architecture.1:145
 msgid "please use the following:"
 msgstr "proszê u¿ywaæ:"
 
 # type: Plain text
-#: ../dpkg-architecture.1:149
+#: dpkg-architecture.1:149
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
@@ -3640,13 +3623,13 @@ msgstr ""
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:151
+#: dpkg-architecture.1:151
 #, no-wrap
 msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:161
+#: dpkg-architecture.1:161
 #, no-wrap
 msgid ""
 "ARCH=\\`dpkg --print-architecture\\`\n"
@@ -3660,18 +3643,18 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:164
+#: dpkg-architecture.1:164
 msgid "please use:"
 msgstr "proszê u¿ywaæ:"
 
 # type: Plain text
-#: ../dpkg-architecture.1:167
+#: dpkg-architecture.1:167
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:171
+#: dpkg-architecture.1:171
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
@@ -3683,14 +3666,14 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:175
+#: dpkg-architecture.1:175
 msgid ""
 "or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
 "or DEB_HOST_ARCH_OS variables."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:180
+#: dpkg-architecture.1:180
 msgid ""
 "In general, calling dpkg in the rules file to get architecture information "
 "is deprecated (unless you want to provide backward compatibility, see "
@@ -3699,13 +3682,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../dpkg-architecture.1:181
+#: dpkg-architecture.1:181
 #, no-wrap
 msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:187
+#: dpkg-architecture.1:187
 msgid ""
 "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
 "relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
@@ -3715,7 +3698,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:192
+#: dpkg-architecture.1:192
 msgid ""
 "Where I<debian/rules> files check these variables to decide how or what to "
 "compile, this should be updated to use the new variables and values.  You "
@@ -3724,7 +3707,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:196
+#: dpkg-architecture.1:196
 #, no-wrap
 msgid ""
 "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
@@ -3734,7 +3717,7 @@ msgstr ""
 "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:210
+#: dpkg-architecture.1:210
 #, no-wrap
 msgid ""
 "# Take account of old dpkg-architecture output.\n"
@@ -3766,19 +3749,19 @@ msgstr ""
 "endif\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:213
+#: dpkg-architecture.1:213
 msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr "i Podobnie dla DEB_BUILD_ARCH_CPU oraz DEB_BUILD_ARCH_OS."
 
 # type: Plain text
-#: ../dpkg-architecture.1:216
+#: dpkg-architecture.1:216
 msgid ""
 "If you still wish to support versions of dpkg-dev that did not include "
 "B<dpkg-architecture>, the following does the job:"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:226
+#: dpkg-architecture.1:226
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
@@ -3800,7 +3783,7 @@ msgstr ""
 "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:231
+#: dpkg-architecture.1:231
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
@@ -3814,14 +3797,14 @@ msgstr ""
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 
 # type: Plain text
-#: ../dpkg-architecture.1:235
+#: dpkg-architecture.1:235
 msgid ""
 "Put a subset of these lines at the top of your debian/rules file; these "
 "default values will be overwritten if dpkg-architecture is used."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:242
+#: dpkg-architecture.1:242
 msgid ""
 "You don't need the full set. Choose a consistent set which contains the "
 "values you use in the rules file. For example, if you only need the host "
@@ -3832,88 +3815,88 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:245
+#: dpkg-architecture.1:245
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:249
+#: dpkg-architecture.1:249
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:251
+#: dpkg-architecture.1:251
 msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 msgstr ""
 "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 
 # type: Plain text
-#: ../dpkg-architecture.1:253
+#: dpkg-architecture.1:253
 msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
 msgstr "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
 
 # type: Plain text
-#: ../dpkg-architecture.1:256
+#: dpkg-architecture.1:256
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:258
+#: dpkg-architecture.1:258
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 # type: Plain text
-#: ../dpkg-architecture.1:260
+#: dpkg-architecture.1:260
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 # type: Plain text
-#: ../dpkg-architecture.1:263
+#: dpkg-architecture.1:263
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-architecture.1:265
+#: dpkg-architecture.1:265
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 # type: Plain text
-#: ../dpkg-architecture.1:267
+#: dpkg-architecture.1:267
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 # type: Plain text
-#: ../dpkg-architecture.1:271
+#: dpkg-architecture.1:271
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 # type: Plain text
-#: ../dpkg-architecture.1:276
+#: dpkg-architecture.1:276
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
 
 # type: TH
-#: ../dpkg.cfg.5:1
+#: dpkg.cfg.5:1
 #, no-wrap
 msgid "dpkg.cfg"
 msgstr "dpkg.cfg"
 
 # type: Plain text
-#: ../dpkg.cfg.5:4
+#: dpkg.cfg.5:4
 msgid "dpkg.cfg - dpkg configuration file"
 msgstr "dpkg.cfg - plik konfiguracyjny programu dpkg "
 
 # type: Plain text
-#: ../dpkg.cfg.5:11
+#: dpkg.cfg.5:11
 msgid ""
 "This file contains default options for dpkg. Each line contains a single "
 "option which is exactly the same as a normal command line option for dpkg "
@@ -3926,12 +3909,12 @@ msgstr ""
 "u¿ywaæ komentarzy, zaczynaj±c liniê znakiem hasha (\"B<#>\")."
 
 # type: Plain text
-#: ../dpkg.cfg.5:16
+#: dpkg.cfg.5:16
 msgid "I<~/.dpkg.cfg>"
 msgstr "I<~/.dpkg.cfg>"
 
 # type: Plain text
-#: ../dpkg.cfg.5:20
+#: dpkg.cfg.5:20
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dpkg>."
@@ -3940,75 +3923,74 @@ msgstr ""
 "przyczyni³y siê do rozwoju programu B<dpkg>."
 
 # type: Plain text
-#: ../dpkg.cfg.5:22 ../dpkg-divert.8:120 ../dpkg-query.1:160
-#: ../dpkg-statoverride.8:80
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
 msgid "B<dpkg>(1)."
 msgstr "B<dpkg>(1)."
 
 # type: TH
-#: ../dpkg-buildpackage.1:1
+#: dpkg-buildpackage.1:1
 #, no-wrap
 msgid "dpkg-buildpackage"
 msgstr "dpkg-buildpackage"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:4
+#: dpkg-buildpackage.1:4
 msgid "dpkg-buildpackage - build source packages"
 msgstr "dpkg-buildpackage - buduje pakiety ¼ród³owe"
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:8
+#: dpkg-buildpackage.1:8
 msgid "B<dpkg-buildpackage> [I<options>]"
 msgstr "B<dpkg-buildpackage>  [I<opcje>]"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:13
+#: dpkg-buildpackage.1:13
 msgid ""
 "B<dpkg-buildpackage> is a control script which can be used to help automate "
 "the building of a package."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:15
+#: dpkg-buildpackage.1:15
 #, no-wrap
 msgid "B<-b>"
 msgstr "B<-b>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:19
+#: dpkg-buildpackage.1:19
 msgid ""
 "Specifies a binary-only build, no source files are to be built and/or "
 "distributed, and"
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:19 ../dpkg-checkbuilddeps.1:23
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
 #, no-wrap
 msgid "B<-B>"
 msgstr "B<-B>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:23
+#: dpkg-buildpackage.1:23
 msgid ""
 "Specifies a binary-only build, no architecture independent binary package "
 "files are to be distributed either."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:23
+#: dpkg-buildpackage.1:23
 #, no-wrap
 msgid "B<-S>"
 msgstr "B<-S>"
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:26
+#: dpkg-buildpackage.1:26
 msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr "Okre¶la "
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:33 ../dpkg-source.1:145
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
 "These options control whether the original source archive is included in the "
 "upload generated by B<dpkg-buildpackage> if any source is being generated (i."
@@ -4016,13 +3998,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:33
+#: dpkg-buildpackage.1:33
 #, no-wrap
 msgid "B<-si>"
 msgstr "B<-si>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:40
+#: dpkg-buildpackage.1:40
 msgid ""
 "Include the original source if the version number ends in B<-0> or B<-1>, i."
 "e. if the Debian revision part of the version number is B<0> or B<1>.  "
@@ -4030,35 +4012,35 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:40
+#: dpkg-buildpackage.1:40
 #, no-wrap
 msgid "B<-sa>"
 msgstr "B<-sa>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:43
+#: dpkg-buildpackage.1:43
 msgid "Forces the inclusion of the original source."
 msgstr "Wymusza do³±czenie oryginalnego pakietu ¼ród³owego."
 
 # type: TP
-#: ../dpkg-buildpackage.1:43
+#: dpkg-buildpackage.1:43
 #, no-wrap
 msgid "B<-sd>"
 msgstr "B<-sd>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:46
+#: dpkg-buildpackage.1:46
 msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:46
+#: dpkg-buildpackage.1:46
 #, no-wrap
 msgid "B<-a>I<architecture>"
 msgstr "B<-a>I<architecture>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:51
+#: dpkg-buildpackage.1:51
 msgid ""
 "Specify the Debian architecture we build for. The architecture of the "
 "machine we build on is determined automatically, and is also the default for "
@@ -4066,39 +4048,39 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:51 ../dpkg-genchanges.1:18 ../dpkg-gencontrol.1:17
-#: ../dpkg-parsechangelog.1:29
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
 #, no-wrap
 msgid "B<-v>I<version>"
 msgstr "B<-v>I<version>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:55 ../dpkg-parsechangelog.1:33
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
 msgid ""
 "Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:55 ../dpkg-genchanges.1:23
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
 #, no-wrap
 msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:60 ../dpkg-genchanges.1:29
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 msgid ""
 "Read the description of the changes from the file I<changesdescription> "
 "rather than using the information from the source tree's changelog file."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:60 ../dpkg-genchanges.1:29
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
 msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:66 ../dpkg-genchanges.1:35
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this package, rather than using the information from the source tree's "
@@ -4106,13 +4088,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:66 ../dpkg-genchanges.1:35
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, no-wrap
 msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:72 ../dpkg-genchanges.1:41
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 msgid ""
 "Use I<maintaineraddress> as the name and email address of the maintainer for "
 "this upload, rather than using the information from the source tree's "
@@ -4120,86 +4102,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:72
+#: dpkg-buildpackage.1:72
 #, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:75
+#: dpkg-buildpackage.1:75
 msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:75
+#: dpkg-buildpackage.1:75
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: SS
-#: ../dpkg-buildpackage.1:78
+#: dpkg-buildpackage.1:78
 msgid "Do not check build dependencies and conflicts."
 msgstr "Nie sprawdza zale¿no¶ci czasu budowania ani konfliktów."
 
 # type: TP
-#: ../dpkg-buildpackage.1:78 ../dpkg-source.1:103
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, no-wrap
 msgid "B<-W>"
 msgstr "B<-W>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:84
+#: dpkg-buildpackage.1:84
 msgid ""
 "Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:84 ../dpkg-source.1:106
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:92
+#: dpkg-buildpackage.1:92
 msgid ""
 "Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
 "buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:92
+#: dpkg-buildpackage.1:92
 #, no-wrap
 msgid "B<-nc>"
 msgstr "B<-nc>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:95
+#: dpkg-buildpackage.1:95
 msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:95
+#: dpkg-buildpackage.1:95
 #, no-wrap
 msgid "B<-tc>"
 msgstr "B<-tc>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:101
+#: dpkg-buildpackage.1:101
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:101
+#: dpkg-buildpackage.1:101
 #, no-wrap
 msgid "B<-r>I<gain-root-command>"
 msgstr "B<-r>I<polecenie-uzyskiwania-praw-administratora>"
 
 # type: Plain text
 #.  what happens, if it contains spaces? (hs)
-#: ../dpkg-buildpackage.1:127
+#: dpkg-buildpackage.1:127
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -4214,13 +4196,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:127
+#: dpkg-buildpackage.1:127
 #, no-wrap
 msgid "B<-p>I<sign-command>"
 msgstr "B<-p>I<polecenie-podpisywania>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:152
+#: dpkg-buildpackage.1:152
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
 "control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
@@ -4232,73 +4214,73 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:152
+#: dpkg-buildpackage.1:152
 #, no-wrap
 msgid "B<-k>I<key-id>"
 msgstr "B<-k>I<id-klucza>"
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:155
+#: dpkg-buildpackage.1:155
 msgid "Specify a key-ID to use when signing packages."
 msgstr "Okre¶la ID klucza u¿ywanego do podpisywania pakietów."
 
 # type: TP
-#: ../dpkg-buildpackage.1:155
+#: dpkg-buildpackage.1:155
 #, no-wrap
 msgid "B<-us>"
 msgstr "B<-us>"
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:158
+#: dpkg-buildpackage.1:158
 msgid "Do not sign the source package."
 msgstr "Nie próbuje podpisywaæ pakietów."
 
 # type: TP
-#: ../dpkg-buildpackage.1:158
+#: dpkg-buildpackage.1:158
 #, no-wrap
 msgid "B<-uc>"
 msgstr "B<-uc>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:161
+#: dpkg-buildpackage.1:161
 msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:161 ../dpkg-source.1:110
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
 #, no-wrap
 msgid "B<-i>[I<regexp>]"
 msgstr "B<-i>[I<wyra¿-regul>]"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:165
+#: dpkg-buildpackage.1:165
 msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:165 ../dpkg-source.1:130
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
 #, no-wrap
 msgid "B<-I>I<filename>"
 msgstr "B<-I>I<nazwa_pliku>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:170
+#: dpkg-buildpackage.1:170
 msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
 # type: TP
-#: ../dpkg-buildpackage.1:170 ../dpkg-checkbuilddeps.1:19 ../dpkg-query.1:70
-#: ../dpkg-shlibdeps.1:105
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
 msgstr "B<--admindir=>I<katalog>"
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:174 ../dpkg-checkbuilddeps.1:23 ../dpkg-query.1:74
-#: ../dpkg-shlibdeps.1:109
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I</var/"
 "lib/dpkg>."
@@ -4306,16 +4288,16 @@ msgstr ""
 "Zmienia po³o¿enie bazy danych B<dpkg>. Domy¶lnie jest to I</var/lib/dpkg>."
 
 # type: TP
-#: ../dpkg-buildpackage.1:174 ../dpkg-distaddfile.1:32 ../dpkg-deb.1:162
-#: ../dpkg-genchanges.1:139 ../dpkg-gencontrol.1:98 ../dpkg-name.1:56
-#: ../dpkg-parsechangelog.1:33 ../dpkg-query.1:59 ../dpkg-scanpackages.1:81
-#: ../dpkg-shlibdeps.1:109 ../dpkg-source.1:60 ../dpkg-split.1:127
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
 
 # type: Plain text
-#: ../dpkg-buildpackage.1:185
+#: dpkg-buildpackage.1:185
 msgid ""
 "It should be possible to specify spaces and shell metacharacters in and "
 "initial arguments for I<gain-root-command> and I<sign-command>."
@@ -4323,7 +4305,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-buildpackage.1:192
+#: dpkg-buildpackage.1:192
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
 "(1), B<pgp>(1)."
@@ -4332,24 +4314,24 @@ msgstr ""
 "(1), B<pgp>(1)."
 
 # type: TH
-#: ../dpkg-checkbuilddeps.1:1
+#: dpkg-checkbuilddeps.1:1
 #, no-wrap
 msgid "dpkg-checkbuilddeps"
 msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:4
+#: dpkg-checkbuilddeps.1:4
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-checkbuilddeps.1:9
+#: dpkg-checkbuilddeps.1:9
 msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
 msgstr "B<dpkg-checkbuilddeps> [I<opcje>] [I<plik-kontrolny>]"
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:14
+#: dpkg-checkbuilddeps.1:14
 msgid ""
 "This program checks the installed packages in the system against the build "
 "dependencies and build conflicts listed in the control file. If any are not "
@@ -4357,72 +4339,72 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:17
+#: dpkg-checkbuilddeps.1:17
 msgid ""
 "By default, I<debian/control> is read, but an alternate control filename may "
 "be specified on the command line."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:27
+#: dpkg-checkbuilddeps.1:27
 msgid ""
 "Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
 "built."
 msgstr ""
 
 # type: TP
-#: ../dpkg-checkbuilddeps.1:27
+#: dpkg-checkbuilddeps.1:27
 #, no-wrap
 msgid "B<-h>"
 msgstr "B<-h>"
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:33
+#: dpkg-checkbuilddeps.1:33
 msgid "Copyright 2001 Joey Hess"
 msgstr "Copyright 2001 Joey Hess"
 
 # type: UR
-#: ../dpkg-checkbuilddeps.1:33
+#: dpkg-checkbuilddeps.1:33
 #, no-wrap
 msgid "mailto:joeyh@debian.org"
 msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
-#: ../dpkg-checkbuilddeps.1:35
+#: dpkg-checkbuilddeps.1:35
 msgid "E<lt>joeyh@debian.orgE<gt>."
 msgstr "E<lt>joeyh@debian.orgE<gt>."
 
 # type: TP
-#: ../dpkg-distaddfile.1:1
+#: dpkg-distaddfile.1:1
 #, no-wrap
 msgid "dpkg-distaddfile"
 msgstr "dpkg-distaddfile"
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:4
+#: dpkg-distaddfile.1:4
 msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-distaddfile.1:8
+#: dpkg-distaddfile.1:8
 msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
 msgstr "B<dpkg-distaddfile> [I<opcje>] I<plik sekcja priorytet>"
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:13
+#: dpkg-distaddfile.1:13
 msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:18
+#: dpkg-distaddfile.1:18
 msgid ""
 "It takes three non-option arguments, the filename and the section and "
 "priority for the B<.changes> file."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:26
+#: dpkg-distaddfile.1:26
 msgid ""
 "The filename should be specified relative to the directory where B<dpkg-"
 "genchanges> will expect to find the files, usually B<..>, rather than being "
@@ -4430,58 +4412,58 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-distaddfile.1:28 ../dpkg-genchanges.1:111 ../dpkg-gencontrol.1:46
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, no-wrap
 msgid "B<-f>I<fileslistfile>"
 msgstr "B<-f>I<plik-z-list±-plików>"
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:32 ../dpkg-gencontrol.1:50
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
 "Read or write the list of files to be uploaded here, rather than using "
 "B<debian/files>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-distaddfile.1:40 ../dpkg-genchanges.1:147 ../dpkg-gencontrol.1:111
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, no-wrap
 msgid "B<debian/files>"
 msgstr "B<debian/files>"
 
 # type: Plain text
-#: ../dpkg-distaddfile.1:46
+#: dpkg-distaddfile.1:46
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
 # type: TH
-#: ../dpkg-deb.1:1
+#: dpkg-deb.1:1
 #, no-wrap
 msgid "dpkg-deb"
 msgstr "dpkg-deb"
 
 # type: TH
-#: ../dpkg-deb.1:1
+#: dpkg-deb.1:1
 #, no-wrap
 msgid "2007-03-13"
 msgstr "2007-03-13"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:4
+#: dpkg-deb.1:4
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr "dpkg-deb - narzêdzie obs³ugi plików archiwum Debiana (.deb)"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:9
+#: dpkg-deb.1:9
 msgid "B<dpkg-deb> [I<options>] I<command>"
 msgstr "B<dpkg-deb> [I<opcje>] I<polecenie>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:13
+#: dpkg-deb.1:13
 msgid ""
 "B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
@@ -4490,13 +4472,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:17
+#: dpkg-deb.1:17
 msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr "Do instalowania i usuwania pakietów z systemu s³u¿y polecenie B<dpkg>."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:27
+#: dpkg-deb.1:27
 msgid ""
 "You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
 "want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
@@ -4508,14 +4490,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:29
+#: dpkg-deb.1:29
 #, no-wrap
 msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr "B<-b>, B<--build> I<katalog> [I<archiwum>|I<katalog>]"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:41
+#: dpkg-deb.1:41
 msgid ""
 "Creates a debian archive from the filesystem tree stored in I<directory>. "
 "I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
@@ -4531,7 +4513,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:53
+#: dpkg-deb.1:53
 msgid ""
 "Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
 "parse it. It will check it for syntax errors and other problems, and display "
@@ -4547,7 +4529,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:60
+#: dpkg-deb.1:60
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<directory>B<.deb>."
@@ -4557,13 +4539,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:62
+#: dpkg-deb.1:62
 msgid "If the archive to be created already exists it will be overwritten."
 msgstr "Je¿eli taki pakiet ju¿ istnieje, zostanie on nadpisany."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:78
+#: dpkg-deb.1:78
 msgid ""
 "If the second argument is a directory then B<dpkg-deb> will write to the "
 "file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
@@ -4581,20 +4563,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:78
+#: dpkg-deb.1:78
 #, no-wrap
 msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
 msgstr "B<-I>, B<--info> I<archiwum> [I<nazwa-pliku-kontrolnego> ...]"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:81
+#: dpkg-deb.1:81
 msgid "Provides information about a binary package archive."
 msgstr "Dostarcza informacji o pakiecie."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:86
+#: dpkg-deb.1:86
 msgid ""
 "If no I<control-file-name>s are specified then it will print a summary of "
 "the contents of the package as well as its control file."
@@ -4605,7 +4587,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:94
+#: dpkg-deb.1:94
 msgid ""
 "If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
 "in the order they were specified; if any of the components weren't present "
@@ -4618,14 +4600,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:94
+#: dpkg-deb.1:94
 #, no-wrap
 msgid "B<-W>, B<--show> I<archive>"
 msgstr "B<-W>, B<--show> I<archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:101
+#: dpkg-deb.1:101
 msgid ""
 "Provides information about a binary package archive in the format specified "
 "by the B<--showformat> argument. The default format displays the package's "
@@ -4637,20 +4619,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:101
+#: dpkg-deb.1:101
 #, no-wrap
 msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
 msgstr "B<-f>, B<--field> I<archiwum> [I<nazwa-pola-kontrolnego> ...]"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:104
+#: dpkg-deb.1:104
 msgid "Extracts control file information from a binary package archive."
 msgstr "Wy¶wietla zawarto¶æ pliku kontrolnego o nazwie control."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:108
+#: dpkg-deb.1:108
 msgid ""
 "If no B<control-file-field>s are specified then it will print the whole "
 "control file."
@@ -4660,7 +4642,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:117
+#: dpkg-deb.1:117
 msgid ""
 "If any are specified then B<dpkg-deb> will print their contents, in the "
 "order in which they appear in the control file. If more than one B<control-"
@@ -4674,21 +4656,21 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:119
+#: dpkg-deb.1:119
 msgid "No errors are reported for fields requested but not found."
 msgstr ""
 "Dla nieodnalezionych pól kontrolnych nie wy¶wietlane s± komunikaty b³êdów."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:119
+#: dpkg-deb.1:119
 #, no-wrap
 msgid "B<-c>, B<--contents> I<archive>"
 msgstr "B<-c>, B<--contents> I<archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:125
+#: dpkg-deb.1:125
 msgid ""
 "Lists the contents of the filesystem tree archive portion of the package "
 "archive. It is currently produced in the format generated by B<tar>'s "
@@ -4699,14 +4681,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:125
+#: dpkg-deb.1:125
 #, no-wrap
 msgid "B<-x>, B<--extract> I<archive directory>"
 msgstr "B<-x>, B<--extract> I<katalog archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:129
+#: dpkg-deb.1:129
 msgid ""
 "Extracts the filesystem tree from a package archive into the specified "
 "directory."
@@ -4714,7 +4696,7 @@ msgstr "Rozpakowuje zawarto
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:135
+#: dpkg-deb.1:135
 msgid ""
 "Note that extracting a package to the root directory will I<not> result in a "
 "correct installation! Use B<dpkg> to install packages."
@@ -4725,20 +4707,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:138
+#: dpkg-deb.1:138
 msgid "I<directory> (but not its parents) will be created if necessary."
 msgstr "Je¶li wskazany I<katalog> nie istnieje, zostanie utworzony."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:138
+#: dpkg-deb.1:138
 #, no-wrap
 msgid "B<-X>, B<--vextract> I<archive directory>"
 msgstr "B<-X>, B<--vextract> I<katalog archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:143
+#: dpkg-deb.1:143
 #, fuzzy
 msgid ""
 "Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
@@ -4750,14 +4732,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:143
+#: dpkg-deb.1:143
 #, no-wrap
 msgid "B<--fsys-tarfile> I<archive>"
 msgstr "B<--fsys-tarfile> I<archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:151
+#: dpkg-deb.1:151
 msgid ""
 "Extracts the filesystem tree data from a binary package and sends it to "
 "standard output in B<tar> format. Together with B<tar>(1)  this can be used "
@@ -4769,14 +4751,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:151
+#: dpkg-deb.1:151
 #, no-wrap
 msgid "B<-e>, B<--control> I<archive directory>"
 msgstr "B<-e>, B<--control> I<katalog archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:155
+#: dpkg-deb.1:155
 msgid ""
 "Extracts the control information files from a package archive into the "
 "specified directory."
@@ -4784,7 +4766,7 @@ msgstr "Rozpakowuje pliki kontrolne pakietu do podanego I<katalogu>."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:159
+#: dpkg-deb.1:159
 msgid ""
 "If no directory is specified then a subdirectory B<DEBIAN> in the current "
 "directory is used."
@@ -4794,31 +4776,31 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:162
+#: dpkg-deb.1:162
 msgid ""
 "The target directory (but not its parents) will be created if necessary."
 msgstr "W razie potrzeby, katalog docelowy bêdzie utworzony."
 
 # type: TP
-#: ../dpkg-deb.1:168 ../dpkg-query.1:65 ../dpkg-split.1:133
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
 #, no-wrap
 msgid "B<--license>, B<--licence>"
 msgstr "B<--license>, B<--licence>"
 
 # type: Plain text
-#: ../dpkg-deb.1:171 ../dpkg-name.1:65 ../dpkg-query.1:68 ../dpkg-split.1:136
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
 msgid "Show the copyright licensing terms and exit."
 msgstr ""
 "Pokazuje informacje o licencji i prawach autorskich o koñczy dzia³anie."
 
 # type: TP
-#: ../dpkg-deb.1:173
+#: dpkg-deb.1:173
 #, no-wrap
 msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 # type: Plain text
-#: ../dpkg-deb.1:178 ../dpkg-query.1:79
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -4828,7 +4810,7 @@ msgstr ""
 "listowanego pakietu."
 
 # type: Plain text
-#: ../dpkg-deb.1:187
+#: dpkg-deb.1:187
 msgid ""
 "The string may reference any status field using the \"${I<field-name>}\" "
 "form, a list of the valid fields can be easily produced using B<-I> on the "
@@ -4844,45 +4826,45 @@ msgstr ""
 "query>(1)."
 
 # type: Plain text
-#: ../dpkg-deb.1:189
+#: dpkg-deb.1:189
 msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr "Domy¶ln± warto¶ci± tego pola jest \"${Package}\\et${Version}\\en\"."
 
 # type: TP
-#: ../dpkg-deb.1:189
+#: dpkg-deb.1:189
 #, no-wrap
 msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-deb.1:193
+#: dpkg-deb.1:193
 msgid ""
 "Specify which compression level to pass to the compressor backend program, "
 "when building a package."
 msgstr ""
 
 # type: TP
-#: ../dpkg-deb.1:193
+#: dpkg-deb.1:193
 #, no-wrap
 msgid "B<-Z>I<compress_type>"
 msgstr "B<-Z>I<typ_kompresowania>"
 
 # type: Plain text
-#: ../dpkg-deb.1:198
+#: dpkg-deb.1:198
 msgid ""
 "Specify which compression type to use when building a package. Allowed "
 "values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
 
 # type: TP
-#: ../dpkg-deb.1:198
+#: dpkg-deb.1:198
 #, no-wrap
 msgid "B<--new>"
 msgstr "B<--new>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:203
+#: dpkg-deb.1:203
 msgid ""
 "Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
@@ -4890,14 +4872,14 @@ msgstr ""
 "domy¶lna."
 
 # type: TP
-#: ../dpkg-deb.1:203
+#: dpkg-deb.1:203
 #, no-wrap
 msgid "B<--old>"
 msgstr "B<--old>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:211
+#: dpkg-deb.1:211
 msgid ""
 "Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
 "is less easily parsed by non-Debian tools and is now obsolete; its only use "
@@ -4912,7 +4894,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:217
+#: dpkg-deb.1:217
 msgid ""
 "Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
 "archive. You can build any archive you want, no matter how broken, this way."
@@ -4922,20 +4904,20 @@ msgstr ""
 "potrzeba."
 
 # type: TP
-#: ../dpkg-deb.1:217
+#: dpkg-deb.1:217
 #, no-wrap
 msgid "B<-D>, B<--debug>"
 msgstr "B<-D>, B<--debug>"
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:220
+#: dpkg-deb.1:220
 msgid "Enables debugging output. This is not very interesting."
 msgstr "W³±cza opcjê debuggera. Nie jest to zbyt interesuj±ce."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:226
+#: dpkg-deb.1:226
 msgid ""
 "B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
@@ -4943,7 +4925,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:230
+#: dpkg-deb.1:230
 msgid ""
 "There is no authentication on B<.deb> files; in fact, there isn't even a "
 "straightforward checksum."
@@ -4953,7 +4935,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:237
+#: dpkg-deb.1:237
 msgid ""
 "Do not attempt to use just B<dpkg-deb> to install software! You must use "
 "B<dpkg> proper to ensure that all the files are correctly placed and the "
@@ -4965,13 +4947,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:243
+#: dpkg-deb.1:243
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
 #
-#: ../dpkg-deb.1:252
+#: dpkg-deb.1:252
 #, fuzzy
 msgid ""
 "B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
@@ -4985,31 +4967,31 @@ msgstr ""
 "share/common-licences/GPL>."
 
 # type: TH
-#: ../dpkg-divert.8:1
+#: dpkg-divert.8:1
 #, no-wrap
 msgid "dpkg-divert"
 msgstr "dpkg-divert"
 
 # type: Plain text
-#: ../dpkg-divert.8:4
+#: dpkg-divert.8:4
 msgid "dpkg-divert - override a package's version of a file"
 msgstr "dpkg-divert - nadpisywanie plików z pakietów"
 
 # type: Plain text
 #
-#: ../dpkg-divert.8:9
+#: dpkg-divert.8:9
 msgid "B<dpkg-divert> [I<options>] I<command>"
 msgstr "B<dpkg-divert> [I<opcje>] I<polecenie>"
 
 # type: Plain text
-#: ../dpkg-divert.8:13
+#: dpkg-divert.8:13
 msgid ""
 "B<dpkg-divert> is the utility used to set up and update the list of "
 "diversions."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-divert.8:23
+#: dpkg-divert.8:23
 #, fuzzy
 msgid ""
 "File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
@@ -5024,70 +5006,70 @@ msgstr ""
 "nieinstalowania pliku w "
 
 # type: TP
-#: ../dpkg-divert.8:25
+#: dpkg-divert.8:25
 #, no-wrap
 msgid "[B<--add>] I<file>"
 msgstr "[B<--add>] I<plik>"
 
 # type: Plain text
-#: ../dpkg-divert.8:28
+#: dpkg-divert.8:28
 msgid "Add a diversion for I<file>."
 msgstr "Dodaje nadpisanie I<pliku>."
 
 # type: TP
-#: ../dpkg-divert.8:28 ../dpkg-statoverride.8:35
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
 #, no-wrap
 msgid "B<--remove>I< file>"
 msgstr "B<--remove>I<plik>"
 
 # type: Plain text
-#: ../dpkg-divert.8:31
+#: dpkg-divert.8:31
 msgid "Remove a diversion for I<file>."
 msgstr "Usuwa nadpisanie I<pliku>."
 
 # type: TP
-#: ../dpkg-divert.8:31
+#: dpkg-divert.8:31
 #, no-wrap
 msgid "B<--list>I< glob-pattern>"
 msgstr "B<--list>I< wzorzec-glob>"
 
 # type: Plain text
-#: ../dpkg-divert.8:34
+#: dpkg-divert.8:34
 msgid "List diversions matching I<glob-pattern>."
 msgstr "Wy¶wietla nadpisania pasuj±ce do I<wzorca-glob>."
 
 # type: TP
-#: ../dpkg-divert.8:34
+#: dpkg-divert.8:34
 #, no-wrap
 msgid "B<--truename>I< file>"
 msgstr "B<--truename>I< plik>"
 
 # type: Plain text
-#: ../dpkg-divert.8:37
+#: dpkg-divert.8:37
 msgid "Print the real name for a diverted file."
 msgstr "Wy¶wietla rzeczywist± nazwê nadpisanego pliku."
 
 # type: TP
-#: ../dpkg-divert.8:39 ../dpkg-statoverride.8:52 ../update-alternatives.8:307
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
 #, no-wrap
 msgid "B<--admindir>I< directory>"
 msgstr "B<--admindir>I< katalog>"
 
 # type: Plain text
-#: ../dpkg-divert.8:42
+#: dpkg-divert.8:42
 msgid ""
 "Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 "Ustawia katalog bazy danych dpkg na I<katalog> (domy¶lnie I</var/lib/dpkg>)."
 
 # type: TP
-#: ../dpkg-divert.8:42
+#: dpkg-divert.8:42
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
 msgstr "B<--divert> I<nadpisz-do>"
 
 # type: Plain text
-#: ../dpkg-divert.8:46
+#: dpkg-divert.8:46
 #, fuzzy
 msgid ""
 "I<divert-to> is the location where the versions of I<file>, as provided by "
@@ -5095,13 +5077,13 @@ msgid ""
 msgstr "I<nadpisz-do> jest lokalizacj± "
 
 # type: TP
-#: ../dpkg-divert.8:46
+#: dpkg-divert.8:46
 #, no-wrap
 msgid "B<--local>"
 msgstr "B<--local>"
 
 # type: Plain text
-#: ../dpkg-divert.8:52
+#: dpkg-divert.8:52
 #, fuzzy
 msgid ""
 "Specifies that all packages' versions of this file are diverted.  This "
@@ -5111,13 +5093,13 @@ msgid ""
 msgstr "Okre¶la, ¿e wszystkie wersje paketów"
 
 # type: TP
-#: ../dpkg-divert.8:52
+#: dpkg-divert.8:52
 #, no-wrap
 msgid "B<--package>I< package>"
 msgstr "B<--package>I< pakiet>"
 
 # type: Plain text
-#: ../dpkg-divert.8:57
+#: dpkg-divert.8:57
 msgid ""
 "I<package> is the name of a package whose copy of I<file> will not be "
 "diverted. i.e. I<file> will be diverted for all packages except I<package>."
@@ -5127,52 +5109,52 @@ msgstr ""
 "I<pakietu>."
 
 # type: TP
-#: ../dpkg-divert.8:57 ../dpkg-statoverride.8:64 ../install-info.8:190
-#: ../update-alternatives.8:316
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
-#: ../dpkg-divert.8:60
+#: dpkg-divert.8:60
 #, fuzzy
 msgid "Quiet mode, i.e. no verbose output."
 msgstr "Tryb cichy, tzn. "
 
 # type: TP
-#: ../dpkg-divert.8:60
+#: dpkg-divert.8:60
 #, no-wrap
 msgid "B<--rename>"
 msgstr "B<--rename>"
 
 # type: Plain text
-#: ../dpkg-divert.8:64
+#: dpkg-divert.8:64
 msgid ""
 "Actually move the file aside (or back). dpkg-divert will abort operation in "
 "case the destination file already exists."
 msgstr ""
 
 # type: TP
-#: ../dpkg-divert.8:64 ../install-info.8:269 ../update-alternatives.8:320
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
 #, no-wrap
 msgid "B<--test>"
 msgstr "B<--test>"
 
 # type: Plain text
-#: ../dpkg-divert.8:67
+#: dpkg-divert.8:67
 msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 "Tryb testowy, tzn. nie wykonuje ¿adnych akcji, tylko pokazuje, co zosta³oby "
 "zrobione."
 
 # type: SH
-#: ../dpkg-divert.8:74
+#: dpkg-divert.8:74
 #, no-wrap
 msgid "NOTES"
 msgstr "UWAGI"
 
 # type: Plain text
-#: ../dpkg-divert.8:78
+#: dpkg-divert.8:78
 msgid ""
 "When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
 "distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
@@ -5183,12 +5165,12 @@ msgstr ""
 "local> i B<--divert>, je¶li zosta³y podane, to musz± pasowaæ."
 
 # type: Plain text
-#: ../dpkg-divert.8:80
+#: dpkg-divert.8:80
 msgid "Directories can't be diverted with B<dpkg-divert>."
 msgstr "Za pomoc± B<dpkg-divert> nie mo¿na nadpisaæ katalogów."
 
 # type: Plain text
-#: ../dpkg-divert.8:86
+#: dpkg-divert.8:86
 #, fuzzy
 msgid ""
 "Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
@@ -5199,7 +5181,7 @@ msgid ""
 msgstr "Nale¿y byæ ostro¿nym podczas nadpisywania bibliotek wspó³dzielonych . "
 
 # type: Plain text
-#: ../dpkg-divert.8:91
+#: dpkg-divert.8:91
 msgid ""
 "To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
 "e. directs all packages providing I</usr/bin/example> to install it as I</"
@@ -5211,22 +5193,22 @@ msgstr ""
 "pliku, je¶li jest to wymagane:"
 
 # type: Plain text
-#: ../dpkg-divert.8:93
+#: dpkg-divert.8:93
 msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr "dpkg-divert --divert /usr/bin/przyk³ad.foo --rename /usr/bin/przyk³ad"
 
 # type: Plain text
-#: ../dpkg-divert.8:95 ../dpkg-divert.8:105
+#: dpkg-divert.8:95 dpkg-divert.8:105
 msgid "To remove that diversion:"
 msgstr "Aby usun±æ to nadpisanie:"
 
 # type: Plain text
-#: ../dpkg-divert.8:97
+#: dpkg-divert.8:97
 msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr "dpkg-divert --rename --remove /usr/bin/przyk³ad"
 
 # type: Plain text
-#: ../dpkg-divert.8:101
+#: dpkg-divert.8:101
 msgid ""
 "To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
 "example.foo>, except your own I<wibble> package:"
@@ -5235,7 +5217,7 @@ msgstr ""
 "pakietom, próbuj±cym zainstalowaæ ten plik, oprócz pakietu I<wibble>:"
 
 # type: Plain text
-#: ../dpkg-divert.8:103
+#: dpkg-divert.8:103
 msgid ""
 "dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
 "example"
@@ -5244,18 +5226,18 @@ msgstr ""
 "bin/przyk³ad"
 
 # type: Plain text
-#: ../dpkg-divert.8:107
+#: dpkg-divert.8:107
 msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr "dpkg-divert --package wibble --rename --remove /usr/bin/przyk³ad"
 
 # type: TP
-#: ../dpkg-divert.8:109
+#: dpkg-divert.8:109
 #, no-wrap
 msgid "I</var/lib/dpkg/diversions>"
 msgstr "I</var/lib/dpkg/diversions>"
 
 # type: Plain text
-#: ../dpkg-divert.8:114
+#: dpkg-divert.8:114
 msgid ""
 "File which contains the current list of diversions of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -5266,7 +5248,7 @@ msgstr ""
 "takimi jak `status' lub `available'."
 
 # type: Plain text
-#: ../dpkg-divert.8:117
+#: dpkg-divert.8:117
 msgid ""
 "Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
 "old\", before replacing it with the new one."
@@ -5275,29 +5257,29 @@ msgstr ""
 "kopiê w pliku z rozszerzeniem \"-old\"."
 
 # type: Plain text
-#: ../dpkg-divert.8:123
+#: dpkg-divert.8:123
 msgid "Copyright (C) 1995 Ian Jackson."
 msgstr "Copyright (C) 1995 Ian Jackson."
 
 # type: TH
-#: ../dpkg-genchanges.1:1
+#: dpkg-genchanges.1:1
 #, no-wrap
 msgid "dpkg-genchanges"
 msgstr "dpkg-genchanges"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:4
+#: dpkg-genchanges.1:4
 msgid "dpkg-genchanges - generate Debian .changes files"
 msgstr "dpkg-genchanges  - tworzy pliki .changes"
 
 # type: Plain text
 #
-#: ../dpkg-genchanges.1:8
+#: dpkg-genchanges.1:8
 msgid "B<dpkg-genchanges> [I<options>]"
 msgstr "B<dpkg-genchanges>  [I<opcje>]"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:16
+#: dpkg-genchanges.1:16
 msgid ""
 "B<dpkg-genchanges> reads information from an unpacked and built Debian "
 "source tree and from the files it has generated and generates a Debian "
@@ -5305,20 +5287,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:23
+#: dpkg-genchanges.1:23
 msgid ""
 "Causes changelog information from all versions strictly later than "
 "I<version> to be used."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:41 ../dpkg-source.1:137
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, no-wrap
 msgid "B<-si>, B<-sa>, B<-sd>"
 msgstr "B<-si>, B<-sa>, B<-sd>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:49
+#: dpkg-genchanges.1:49
 msgid ""
 "These options control whether the original source archive is included in the "
 "upload generated by B<dpkg-genchanges> if any source is being generated (i."
@@ -5326,7 +5308,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:57 ../dpkg-source.1:153
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 msgid ""
 "By default, or if B<-si> is specified, the original source will be included "
 "if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
@@ -5334,69 +5316,69 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:62 ../dpkg-source.1:158
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 msgid ""
 "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
 "exclusion and includes only the diff."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:62 ../dpkg-gencontrol.1:20 ../dpkg-source.1:87
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
 #, no-wrap
 msgid "B<-V>I<name>B<=>I<value>"
 msgstr "B<-V>I<nazwa>B<=>I<warto¶æ>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:66 ../dpkg-source.1:91
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 msgid ""
 "Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
 "discussion of output substitution."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:66 ../dpkg-gencontrol.1:24 ../dpkg-shlibdeps.1:99
-#: ../dpkg-source.1:91
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
 #, fuzzy, no-wrap
 msgid "B<-T>I<substvarsfile>"
 msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:72 ../dpkg-gencontrol.1:30 ../dpkg-source.1:97
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
 "Read substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:72 ../dpkg-gencontrol.1:30 ../dpkg-source.1:97
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 #, no-wrap
 msgid "B<-D>I<field>B<=>I<value>"
 msgstr "B<-D>I<pole>B<=>I<warto¶æ>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:75 ../dpkg-gencontrol.1:33 ../dpkg-source.1:100
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
 msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:75 ../dpkg-gencontrol.1:33 ../dpkg-source.1:100
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
 #, no-wrap
 msgid "B<-U>I<field>"
 msgstr "B<-U>I<pole>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:78 ../dpkg-gencontrol.1:36 ../dpkg-source.1:103
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
 msgid "Remove an output control file field."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:78
+#: dpkg-genchanges.1:78
 #, no-wrap
 msgid "B<-b>, B<-B>, B<-S>"
 msgstr "B<-b>, B<-B>, B<-S>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:101
+#: dpkg-genchanges.1:101
 msgid ""
 "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
 "a binary-only build is taking place.  B<-b> indicates that no source files "
@@ -5410,50 +5392,49 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:101 ../dpkg-gencontrol.1:36 ../dpkg-source.1:68
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
 #, no-wrap
 msgid "B<-c>I<controlfile>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:106 ../dpkg-gencontrol.1:41
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:106 ../dpkg-gencontrol.1:41
-#: ../dpkg-parsechangelog.1:16 ../dpkg-source.1:75
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
 #, no-wrap
 msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:111 ../dpkg-gencontrol.1:46
-#: ../dpkg-parsechangelog.1:21
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:115
+#: dpkg-genchanges.1:115
 msgid ""
 "Read the list of files to be uploaded here, rather than using B<debian/"
 "files>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:115 ../dpkg-gencontrol.1:50
-#: ../dpkg-parsechangelog.1:21 ../dpkg-source.1:82
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
 #, no-wrap
 msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:120 ../dpkg-gencontrol.1:55
-#: ../dpkg-parsechangelog.1:26 ../dpkg-source.1:87
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
 "special line near the bottom of the changelog or failing that defaults to "
@@ -5461,13 +5442,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:120
+#: dpkg-genchanges.1:120
 #, no-wrap
 msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:131
+#: dpkg-genchanges.1:131
 msgid ""
 "Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
 "(B<dpkg-genchanges> needs to find these files so that it can include their "
@@ -5475,13 +5456,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-genchanges.1:131
+#: dpkg-genchanges.1:131
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 # type: Plain text
-#: ../dpkg-genchanges.1:139
+#: dpkg-genchanges.1:139
 msgid ""
 "Usually B<dpkg-genchanges> will produce informative messages on standard "
 "error, for example about how many of the package's source files are being "
@@ -5489,31 +5470,31 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-genchanges.1:155
+#: dpkg-genchanges.1:155
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:1
+#: dpkg-gencontrol.1:1
 #, no-wrap
 msgid "dpkg-gencontrol"
 msgstr "dpkg-gencontrol"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:4
+#: dpkg-gencontrol.1:4
 msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-gencontrol.1:8
+#: dpkg-gencontrol.1:8
 msgid "B<dpkg-gencontrol> [I<options>]"
 msgstr "B<dpkg-gencontrol> [I<opcje>]"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:15
+#: dpkg-gencontrol.1:15
 msgid ""
 "B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
 "generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
@@ -5521,25 +5502,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:20
+#: dpkg-gencontrol.1:20
 msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:24
+#: dpkg-gencontrol.1:24
 msgid ""
 "Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
 "of output substitution."
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:55
+#: dpkg-gencontrol.1:55
 #, no-wrap
 msgid "B<-p>I<package>"
 msgstr "B<-p>I<pakiet>"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:62
+#: dpkg-gencontrol.1:62
 msgid ""
 "Generate information for the binary package I<package>.  If the source "
 "control file lists only one binary package then this option may be omitted; "
@@ -5548,26 +5529,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:62
+#: dpkg-gencontrol.1:62
 #, no-wrap
 msgid "B<-n>I<filename>"
 msgstr "B<-n>I<nazwa_pliku>"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:67
+#: dpkg-gencontrol.1:67
 msgid ""
 "Assume the filename of the package will be I<filename> instead of the normal "
 "package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:67
+#: dpkg-gencontrol.1:67
 #, no-wrap
 msgid "B<-is>, B<-ip>, B<-isp>"
 msgstr "B<-is>, B<-ip>, B<-isp>"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:76
+#: dpkg-gencontrol.1:76
 msgid ""
 "These options are ignored for compatibility with older versions of dpkg-dev "
 "but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
@@ -5577,13 +5558,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:76
+#: dpkg-gencontrol.1:76
 #, no-wrap
 msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:89
+#: dpkg-gencontrol.1:89
 msgid ""
 "Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
 "instead of B<debian/tmp>.  This value is used to find the default value of "
@@ -5592,33 +5573,33 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:89 ../dpkg-shlibdeps.1:80
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
 #, no-wrap
 msgid "B<-O>"
 msgstr "B<-O>"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:98
+#: dpkg-gencontrol.1:98
 msgid ""
 "Print the control file to standard output, rather than to B<debian/tmp/"
 "DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
 # type: TP
-#: ../dpkg-gencontrol.1:106
+#: dpkg-gencontrol.1:106
 #, no-wrap
 msgid "B<debian/control>"
 msgstr "B<debian/control>"
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:111
+#: dpkg-gencontrol.1:111
 msgid ""
 "The main source control information file, giving version-independent "
 "information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-gencontrol.1:118
+#: dpkg-gencontrol.1:118
 msgid ""
 "The list of generated files which are part of the upload being prepared.  "
 "B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
@@ -5626,23 +5607,23 @@ msgid ""
 msgstr ""
 
 # type: TH
-#: ../dpkg-name.1:6
+#: dpkg-name.1:6
 #, no-wrap
 msgid "dpkg-name"
 msgstr "dpkg-name"
 
 # type: Plain text
-#: ../dpkg-name.1:9
+#: dpkg-name.1:9
 msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-name.1:15
+#: dpkg-name.1:15
 msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
 msgstr "B<dpkg-name> [I<opcje>] [B<-->] I<pliki>"
 
 # type: Plain text
-#: ../dpkg-name.1:27
+#: dpkg-name.1:27
 msgid ""
 "This manual page documents the B<dpkg-name> program which provides an easy "
 "way to rename B<Debian> packages into their full package names. A full "
@@ -5654,48 +5635,48 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:29
+#: dpkg-name.1:29
 #, no-wrap
 msgid "B<-a>, B<--no-architecture>"
 msgstr "B<-a>, B<--no-architecture>"
 
 # type: Plain text
-#: ../dpkg-name.1:32
+#: dpkg-name.1:32
 msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:32
+#: dpkg-name.1:32
 #, no-wrap
 msgid "B<-k>, B<--symlink>"
 msgstr "B<-k>, B<--symlink>"
 
 # type: Plain text
-#: ../dpkg-name.1:35
+#: dpkg-name.1:35
 msgid "Create a symlink, instead of moving."
 msgstr "Tworzy dowi±zanie symboliczne, zamiast przenosiæ plik."
 
 # type: TP
-#: ../dpkg-name.1:35
+#: dpkg-name.1:35
 #, no-wrap
 msgid "B<-o>, B<--overwrite>"
 msgstr "B<-o>, B<--overwrite>"
 
 # type: Plain text
-#: ../dpkg-name.1:39
+#: dpkg-name.1:39
 msgid ""
 "Existing files will be overwritten if they have the same name as the "
 "destination filename."
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:39
+#: dpkg-name.1:39
 #, no-wrap
 msgid "B<-s>, B<--subdir> [I<dir>]"
 msgstr "B<-s>, B<--subdir> [I<katalog>]"
 
 # type: Plain text
-#: ../dpkg-name.1:51
+#: dpkg-name.1:51
 msgid ""
 "Files will be moved into a subdirectory. If the directory given as argument "
 "exists the files will be moved into that directory otherwise the name of the "
@@ -5710,38 +5691,38 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:51
+#: dpkg-name.1:51
 #, no-wrap
 msgid "B<-c>, B<--create-dir>"
 msgstr "B<-c>, B<--create-dir>"
 
 # type: Plain text
-#: ../dpkg-name.1:56
+#: dpkg-name.1:56
 msgid ""
 "This option can used together with the -s option. If a target directory "
 "isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:59
+#: dpkg-name.1:59
 #, no-wrap
 msgid "B<-v>, B<--version>"
 msgstr "B<-v>, B<--version>"
 
 # type: TP
-#: ../dpkg-name.1:62
+#: dpkg-name.1:62
 #, no-wrap
 msgid "B<-l>, B<--license>"
 msgstr "B<-l>, B<--license>"
 
 # type: TP
-#: ../dpkg-name.1:67
+#: dpkg-name.1:67
 #, no-wrap
 msgid "B<dpkg-name bar-foo.deb>"
 msgstr "B<dpkg-name bar-foo.deb>"
 
 # type: Plain text
-#: ../dpkg-name.1:72
+#: dpkg-name.1:72
 msgid ""
 "The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
 "something similar (depending on whatever information is in the control part "
@@ -5749,13 +5730,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:72
+#: dpkg-name.1:72
 #, no-wrap
 msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 
 # type: Plain text
-#: ../dpkg-name.1:77
+#: dpkg-name.1:77
 msgid ""
 "All files with the extension `deb' in the directory /root/debian and its "
 "subdirectory's will be renamed by dpkg-name if required into names with no "
@@ -5763,32 +5744,32 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:77
+#: dpkg-name.1:77
 #, no-wrap
 msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 
 # type: Plain text
-#: ../dpkg-name.1:83
+#: dpkg-name.1:83
 msgid ""
 "B<Don't do this.> Your archive will be messed up completely because a lot of "
 "packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: ../dpkg-name.1:83
+#: dpkg-name.1:83
 #, no-wrap
 msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 
 # type: Plain text
 #
-#: ../dpkg-name.1:86
+#: dpkg-name.1:86
 msgid "This can be used when building new packages."
 msgstr "Mo¿e zostaæ u¿yte do budowania nowych pakietów."
 
 # type: Plain text
-#: ../dpkg-name.1:96
+#: dpkg-name.1:96
 msgid ""
 "Some packages don't follow the name structure "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
@@ -5799,7 +5780,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-name.1:104
+#: dpkg-name.1:104
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -5808,7 +5789,7 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: Plain text
-#: ../dpkg-name.1:111
+#: dpkg-name.1:111
 msgid ""
 "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
 "the GNU General Public Licence version 2 or later for copying conditions. "
@@ -5821,25 +5802,25 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-parsechangelog.1:1
+#: dpkg-parsechangelog.1:1
 #, no-wrap
 msgid "dpkg-parsechangelog"
 msgstr "dpkg-parsechangelog"
 
 # type: Plain text
-#: ../dpkg-parsechangelog.1:4
+#: dpkg-parsechangelog.1:4
 #, fuzzy
 msgid "dpkg-parsechangelog - parse Debian changelog files"
 msgstr "dpkg-parsechangelog - przetwarza plik zmian Debiana"
 
 # type: Plain text
 #
-#: ../dpkg-parsechangelog.1:8
+#: dpkg-parsechangelog.1:8
 msgid "B<dpkg-parsechangelog> [I<options>]"
 msgstr "B<dpkg-parsechangelog> [I<opcje>]"
 
 # type: Plain text
-#: ../dpkg-parsechangelog.1:14
+#: dpkg-parsechangelog.1:14
 msgid ""
 "B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
 "source tree and outputs the information in it to standard output in a "
@@ -5847,26 +5828,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-parsechangelog.1:26
+#: dpkg-parsechangelog.1:26
 #, no-wrap
 msgid "B<-L>I<libdir>"
 msgstr "B<-L>I<katalog-lib>"
 
 # type: Plain text
-#: ../dpkg-parsechangelog.1:29
+#: dpkg-parsechangelog.1:29
 #, fuzzy
 msgid "FIXME not used in the source!?"
 msgstr ""
 "Ró¿ne punkty s± oznaczone w ¼ród³ach jako \"FIXME\", czyli do poprawienia."
 
 # type: TP
-#: ../dpkg-parsechangelog.1:41
+#: dpkg-parsechangelog.1:41
 #, no-wrap
 msgid "B<debian/changelog>"
 msgstr "B<debian/changelog>"
 
 # type: Plain text
-#: ../dpkg-parsechangelog.1:47
+#: dpkg-parsechangelog.1:47
 msgid ""
 "The changelog file, used to obtain version-dependent information about the "
 "source package, such as the urgency and distribution of an upload, the "
@@ -5876,26 +5857,26 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-query.1:1
+#: dpkg-query.1:1
 #, no-wrap
 msgid "dpkg-query"
 msgstr "dpkg-query"
 
 # type: Plain text
 #
-#: ../dpkg-query.1:4
+#: dpkg-query.1:4
 msgid "dpkg-query - a tool to query the dpkg database"
 msgstr "dpkg-query - narzêdzie przepytywania bazy danych dpkg"
 
 # type: Plain text
 #
-#: ../dpkg-query.1:8
+#: dpkg-query.1:8
 msgid "B<dpkg-query> [I<option>...] I<command>"
 msgstr "B<dpkg-query> [I<opcja>...] I<polecenie>"
 
 # type: Plain text
 #
-#: ../dpkg-query.1:12
+#: dpkg-query.1:12
 msgid ""
 "B<dpkg-query> is a tool to show information about packages listed in the "
 "B<dpkg> database."
@@ -5904,14 +5885,14 @@ msgstr ""
 "wymienionych w bazie danych B<dpkg>."
 
 # type: TP
-#: ../dpkg-query.1:14
+#: dpkg-query.1:14
 #, no-wrap
 msgid "B<-l>, B<--list> I<package-name-pattern> ..."
 msgstr "B<-l>, B<--list> I<wzorzec-nazwy-pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg-query.1:23
+#: dpkg-query.1:23
 msgid ""
 "List packages matching given pattern. If no I<package-name-pattern> is "
 "given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
@@ -5930,13 +5911,13 @@ msgstr ""
 "``libc6'':"
 
 # type: Plain text
-#: ../dpkg-query.1:27
+#: dpkg-query.1:27
 #, no-wrap
 msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 msgstr " B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 
 # type: Plain text
-#: ../dpkg-query.1:33
+#: dpkg-query.1:33
 msgid ""
 "The output format of this option is not configurable, but varies "
 "automatically to fit the terminal width. It is intended for human readers, "
@@ -5950,14 +5931,14 @@ msgstr ""
 "wyj¶cia."
 
 # type: TP
-#: ../dpkg-query.1:33
+#: dpkg-query.1:33
 #, no-wrap
 msgid "B<-W>, B<--show> I<package-name-pattern> ..."
 msgstr "B<-W>, B<--show> I<wzorzec-nazwy-pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg-query.1:40
+#: dpkg-query.1:40
 msgid ""
 "Just like the B<--list> option this will list all packages matching the "
 "given pattern. However the output can be customized using the B<--"
@@ -5972,14 +5953,14 @@ msgstr ""
 "zawieraj±ca jego nazwê oraz - po znaku tabulacji - zainstalowan± wersjê."
 
 # type: TP
-#: ../dpkg-query.1:40
+#: dpkg-query.1:40
 #, no-wrap
 msgid "B<-s>, B<--status> I<package-name> ..."
 msgstr "B<-s>, B<--status> I<nazwa-pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg-query.1:44
+#: dpkg-query.1:44
 msgid ""
 "Report status of specified package. This just displays the entry in the "
 "installed package status database."
@@ -5988,14 +5969,14 @@ msgstr ""
 "informacje, które znajduj± siê w bazie danych pakietów."
 
 # type: TP
-#: ../dpkg-query.1:44
+#: dpkg-query.1:44
 #, no-wrap
 msgid "B<-L>, B<--listfiles> I<package-name> ..."
 msgstr "B<-L>, B<--listfiles> I<nazwa-pakietu> ..."
 
 # type: Plain text
 #
-#: ../dpkg-query.1:49
+#: dpkg-query.1:49
 msgid ""
 "List files installed to your system from B<package-name>.  However, note "
 "that files created by package-specific installation-scripts are not listed."
@@ -6004,14 +5985,14 @@ msgstr ""
 "zosta³y utworzone przez skrypty instalacyjne, nie bêd± podane."
 
 # type: TP
-#: ../dpkg-query.1:49
+#: dpkg-query.1:49
 #, no-wrap
 msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
 msgstr "B<-S>, B<--search> I<wzorzec-wyszukiwania-nazwy-pliku> ..."
 
 # type: Plain text
 #
-#: ../dpkg-query.1:55
+#: dpkg-query.1:55
 msgid ""
 "Search for a filename from installed packages. All standard shell wildchars "
 "can be used in the pattern. This command will not list extra files created "
@@ -6023,14 +6004,14 @@ msgstr ""
 "wy¶wietli alternatyw."
 
 # type: TP
-#: ../dpkg-query.1:55
+#: dpkg-query.1:55
 #, no-wrap
 msgid "B<-p>, B<--print-avail> I<package-name>"
 msgstr "B<-p>, B<--print-avail> I<nazwa-pakietu>"
 
 # type: Plain text
 #
-#: ../dpkg-query.1:59
+#: dpkg-query.1:59
 msgid ""
 "Display details about I<package-name>, as found in I</var/lib/dpkg/"
 "available>."
@@ -6039,18 +6020,18 @@ msgstr ""
 "I</var/lib/dpkg/available>."
 
 # type: TP
-#: ../dpkg-query.1:74
+#: dpkg-query.1:74
 #, no-wrap
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<format>"
 
 # type: Plain text
-#: ../dpkg-query.1:81
+#: dpkg-query.1:81
 msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr "W ³añcuchu formatu, \\(lqB<\\e>\\(rq jest znakiem cytowania:"
 
 # type: Plain text
-#: ../dpkg-query.1:87
+#: dpkg-query.1:87
 #, no-wrap
 msgid ""
 "    B<\\en>  newline\n"
@@ -6062,7 +6043,7 @@ msgstr ""
 "    B<\\et>  tabulacja\n"
 
 # type: Plain text
-#: ../dpkg-query.1:92
+#: dpkg-query.1:92
 msgid ""
 "\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
 "of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
@@ -6073,7 +6054,7 @@ msgstr ""
 "\\(rq oraz \\(lqB<$>\\(rq."
 
 # type: Plain text
-#: ../dpkg-query.1:98
+#: dpkg-query.1:98
 msgid ""
 "Package information can be included by inserting variable references to "
 "package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
@@ -6087,7 +6068,7 @@ msgstr ""
 "nastêpuj±ce I<pola>:"
 
 # type: Plain text
-#: ../dpkg-query.1:129
+#: dpkg-query.1:129
 #, no-wrap
 msgid ""
 "    B<Architecture>\n"
@@ -6149,7 +6130,7 @@ msgstr ""
 "    B<Version>\n"
 
 # type: Plain text
-#: ../dpkg-query.1:137
+#: dpkg-query.1:137
 #, fuzzy
 msgid ""
 "The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
@@ -6163,19 +6144,19 @@ msgstr ""
 "mo¿na uruchomiæ:"
 
 # type: Plain text
-#: ../dpkg-query.1:141
+#: dpkg-query.1:141
 #, no-wrap
 msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 
 # type: SH
-#: ../dpkg-query.1:143
+#: dpkg-query.1:143
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "¦RODOWISKO"
 
 # type: Plain text
-#: ../dpkg-query.1:148
+#: dpkg-query.1:148
 msgid ""
 "This setting influences the output of the B<--list> option by changing the "
 "width of its output."
@@ -6183,41 +6164,41 @@ msgstr ""
 "Zmienna ta wp³ywa na wyj¶cie polecenia B<--list>, zmieniaj±c jego szeroko¶æ."
 
 # type: Plain text
-#: ../dpkg-query.1:151
+#: dpkg-query.1:151
 msgid "Copyright 2001 Wichert Akkerman"
 msgstr "Copyright 2001 Wichert Akkerman"
 
 # type: UR
-#: ../dpkg-query.1:151 ../dpkg-statoverride.8:83
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
 msgid "mailto:wakkerma@debian.org"
 msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: ../dpkg-query.1:153 ../dpkg-statoverride.8:85
+#: dpkg-query.1:153 dpkg-statoverride.8:85
 msgid "E<lt>wakkerma@debian.orgE<gt>"
 msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
 # type: TH
-#: ../dpkg-scanpackages.1:16
+#: dpkg-scanpackages.1:16
 #, no-wrap
 msgid "dpkg-scanpackages"
 msgstr "dpkg-scanpackages"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:19
+#: dpkg-scanpackages.1:19
 msgid "dpkg-scanpackages - create Packages files"
 msgstr "dpkg-scanpackages - tworzy plik Packages"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:28
+#: dpkg-scanpackages.1:28
 msgid ""
 "B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:41
+#: dpkg-scanpackages.1:41
 msgid ""
 "B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
 "creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
@@ -6228,7 +6209,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:51
+#: dpkg-scanpackages.1:51
 msgid ""
 "B<Note:> If you want to access the generated Packages file with B<apt> you "
 "will probably need to compress the file with B<gzip>(1)  (generating a "
@@ -6237,7 +6218,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:58
+#: dpkg-scanpackages.1:58
 msgid ""
 "I<binarydir> is the name of the tree of the binary packages to process (for "
 "example, B<contrib/binary-i386>).  It is best to make this relative to the "
@@ -6246,20 +6227,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:62
+#: dpkg-scanpackages.1:62
 msgid ""
 "I<overridefile> is the name of a file to read which contains information "
 "about how the package fits into the distribution; see below."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:65
+#: dpkg-scanpackages.1:65
 msgid ""
 "I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:69
+#: dpkg-scanpackages.1:69
 msgid ""
 "If more than one version of a package is found only the newest one is "
 "included in the output. If they have the same version and only differ in "
@@ -6267,48 +6248,48 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-scanpackages.1:71
+#: dpkg-scanpackages.1:71
 #, no-wrap
 msgid "B<-u>, B<--udeb>"
 msgstr "B<-u>, B<--udeb>"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:74
+#: dpkg-scanpackages.1:74
 msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-scanpackages.1:74
+#: dpkg-scanpackages.1:74
 #, no-wrap
 msgid "B<-a>, B<--arch> I<arch>"
 msgstr "B<-a>, B<--arch> I<architektura>"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:78
+#: dpkg-scanpackages.1:78
 msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: ../dpkg-scanpackages.1:78
+#: dpkg-scanpackages.1:78
 #, no-wrap
 msgid "B<-m>, B<--multiversion>"
 msgstr "B<-m>, B<--multiversion>"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:81
+#: dpkg-scanpackages.1:81
 msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: ../dpkg-scanpackages.1:88 ../update-alternatives.8:346
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTYKA"
 
 # type: Plain text
-#: ../dpkg-scanpackages.1:94
+#: dpkg-scanpackages.1:94
 msgid ""
 "B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
 "warns about packages that are in the wrong subdirectory, are duplicated, "
@@ -6318,38 +6299,38 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-scanpackages.1:99
+#: dpkg-scanpackages.1:99
 msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
 msgstr "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
 
 # type: TP
-#: ../dpkg-scansources.1:1
+#: dpkg-scansources.1:1
 #, no-wrap
 msgid "dpkg-scansources"
 msgstr "dpkg-scansources"
 
 # type: Plain text
-#: ../dpkg-scansources.1:4
+#: dpkg-scansources.1:4
 msgid ""
 "dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:13
+#: dpkg-scansources.1:13
 msgid ""
 "B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:18
+#: dpkg-scansources.1:18
 msgid ""
 "B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
 "are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:29
+#: dpkg-scansources.1:29
 msgid ""
 "The I<override-file>, if given, is used to set priorities in the resulting "
 "index records and to override the maintainer field given in the I<.dsc> "
@@ -6363,7 +6344,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:33
+#: dpkg-scansources.1:33
 msgid ""
 "The I<path-prefix>, if given, is prepended to the directory field in the "
 "generated source index. You generally use this to make the directory fields "
@@ -6371,7 +6352,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:44
+#: dpkg-scansources.1:44
 msgid ""
 "B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
 "you will probably need to compress the file with B<gzip>(1)  (generating a "
@@ -6380,33 +6361,33 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-scansources.1:46
+#: dpkg-scansources.1:46
 #, no-wrap
 msgid "B<-n>, B<--no-sort>"
 msgstr "B<-n>, B<--no-sort>"
 
 # type: Plain text
-#: ../dpkg-scansources.1:49
+#: dpkg-scansources.1:49
 msgid ""
 "Don't sort the index records. Normally they are sorted by source package "
 "name."
 msgstr ""
 
 # type: TP
-#: ../dpkg-scansources.1:49
+#: dpkg-scansources.1:49
 #, no-wrap
 msgid "B<-s>, B<--source-override> I<file>"
 msgstr "B<-s>, B<--source-override> I<plik>"
 
 # type: Plain text
-#: ../dpkg-scansources.1:52
+#: dpkg-scansources.1:52
 msgid ""
 "Use I<file> as the source override file. The default is the name of the "
 "override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-scansources.1:58
+#: dpkg-scansources.1:58
 msgid ""
 "The source override file is in a different format from the binary override "
 "file. It contains only two whitespace separated fields, the first is the "
@@ -6416,40 +6397,40 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-scansources.1:58 ../install-info.8:272
+#: dpkg-scansources.1:58 install-info.8:272
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 # type: Plain text
-#: ../dpkg-scansources.1:60
+#: dpkg-scansources.1:60
 msgid "Turn debugging on."
 msgstr "W³±cza tryb debugowania."
 
 # type: Plain text
-#: ../dpkg-scansources.1:68
+#: dpkg-scansources.1:68
 msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
 msgstr "B<deb-override>(5), B<dpkg-scanpackages>(1)."
 
 # type: Plain text
-#: ../dpkg-scansources.1:70
+#: dpkg-scansources.1:70
 msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 
 # type: TH
-#: ../dpkg-shlibdeps.1:1 ../dpkg-shlibdeps.1:4
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
 #, no-wrap
 msgid "dpkg-shlibdeps"
 msgstr "dpkg-shlibdeps"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:10
+#: dpkg-shlibdeps.1:10
 msgid ""
 "B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:35
+#: dpkg-shlibdeps.1:35
 msgid ""
 "B<dpkg-shlibdeps> calculates shared library dependencies for executables "
 "named in its arguments. The dependencies are added to the substitution "
@@ -6464,33 +6445,33 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:41
+#: dpkg-shlibdeps.1:41
 msgid ""
 "B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
 "as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:41
+#: dpkg-shlibdeps.1:41
 #, no-wrap
 msgid "B<-e>I<executable>"
 msgstr "B<-e>I<plik-wykonywalny>"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:45
+#: dpkg-shlibdeps.1:45
 msgid ""
 "Include dependencies appropriate for the shared libraries required by "
 "I<executable>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:45
+#: dpkg-shlibdeps.1:45
 #, no-wrap
 msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:51
+#: dpkg-shlibdeps.1:51
 msgid ""
 "Add dependencies to be added to the control file dependency field "
 "I<dependencyfield>.  (The dependencies for this field are placed in the "
@@ -6498,7 +6479,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:61
+#: dpkg-shlibdeps.1:61
 msgid ""
 "The B<-d>I<dependencyfield> option takes effect for all executables after "
 "the option, until the next B<-d>I<dependencyfield>.  The default "
@@ -6506,7 +6487,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:69
+#: dpkg-shlibdeps.1:69
 msgid ""
 "If the same dependency entry (or set of alternatives) appears in more than "
 "one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
@@ -6516,13 +6497,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:69
+#: dpkg-shlibdeps.1:69
 #, no-wrap
 msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:80
+#: dpkg-shlibdeps.1:80
 msgid ""
 "Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
 ">.  Likewise, any existing substitution variables starting with "
@@ -6531,20 +6512,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:86
 msgid ""
 "Print substitution variable settings to standard output, rather than being "
 "added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:86
+#: dpkg-shlibdeps.1:86
 #, no-wrap
 msgid "B<-t>I<type>"
 msgstr "B<-t>I<typ>"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:93
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -6554,91 +6535,91 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:93
+#: dpkg-shlibdeps.1:93
 #, no-wrap
 msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:99
+#: dpkg-shlibdeps.1:99
 msgid ""
 "Read overriding shared library dependency information from "
 "I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:105
+#: dpkg-shlibdeps.1:105
 msgid ""
 "Write substitution variables in I<substvarsfile>; the default is B<debian/"
 "substvars>."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:117
+#: dpkg-shlibdeps.1:117
 #, no-wrap
 msgid "B<debian/shlibs.local>"
 msgstr "B<debian/shlibs.local>"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:120
+#: dpkg-shlibdeps.1:120
 msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:120
+#: dpkg-shlibdeps.1:120
 #, no-wrap
 msgid "B</etc/dpkg/shlibs.override>"
 msgstr "B</etc/dpkg/shlibs.override>"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:123
 msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:123
+#: dpkg-shlibdeps.1:123
 #, no-wrap
 msgid "B</etc/dpkg/shlibs.default>"
 msgstr "B</etc/dpkg/shlibs.default>"
 
 # type: Plain text
-#: ../dpkg-shlibdeps.1:126
+#: dpkg-shlibdeps.1:126
 msgid "Per-system default shared library dependency information."
 msgstr ""
 
 # type: TP
-#: ../dpkg-shlibdeps.1:129
+#: dpkg-shlibdeps.1:129
 msgid "B<deb-shlibs>(5)."
 msgstr "B<deb-shlibs>(5)."
 
 # type: Plain text
 #
-#: ../dpkg-source.1:2
+#: dpkg-source.1:2
 #, no-wrap
 msgid "dpkg-source"
 msgstr "dpkg-source"
 
 # type: Plain text
 #
-#: ../dpkg-source.1:6
+#: dpkg-source.1:6
 msgid "dpkg-source, - Debian source package tools"
 msgstr "dpkg-source - narzêdzia do zarz±dzania ¼ród³owymi pakietami Debiana"
 
 # type: Plain text
 #
-#: ../dpkg-source.1:11
+#: dpkg-source.1:11
 msgid "B<dpkg-source> [I<options>] I<command>"
 msgstr "B<dpkg-source> [I<opcje>] I<polecenie>"
 
 # type: Plain text
 #
-#: ../dpkg-source.1:15
+#: dpkg-source.1:15
 msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 "B<dpkg-source> tworzy i rozpakowuje ¼ród³owe archiwa (pakiety) Debiana."
 
 # type: Plain text
-#: ../dpkg-source.1:19
+#: dpkg-source.1:19
 msgid ""
 "None of these commands allow multiple options to be combined into one, and "
 "they do not allow the value for an option to be specified in a separate "
@@ -6646,13 +6627,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-source.1:21
+#: dpkg-source.1:21
 #, no-wrap
 msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr "B<-x >I<nazwa-pliku>B<.dsc >[I<katalog-wyj¶ciowy>]"
 
 # type: Plain text
-#: ../dpkg-source.1:31
+#: dpkg-source.1:31
 msgid ""
 "Extract a source package. One non-option argument must be supplied, the name "
 "of the Debian source control file (B<.dsc>).  An optional second non-option "
@@ -6663,7 +6644,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:37
+#: dpkg-source.1:37
 msgid ""
 "B<dpkg-source> will read the names of the other file(s) making up the source "
 "package from the control file; they are assumed to be in the same directory "
@@ -6671,7 +6652,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:45
+#: dpkg-source.1:45
 msgid ""
 "The files in the extracted package will have their permissions and "
 "ownerships set to those which would have been expected if the files and "
@@ -6683,13 +6664,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-source.1:45
+#: dpkg-source.1:45
 #, no-wrap
 msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
 msgstr "B<-b> [I<opcje>] I<katalog> [I<oryg-katalog>|I<oryg-targz>|'']"
 
 # type: Plain text
-#: ../dpkg-source.1:60
+#: dpkg-source.1:60
 msgid ""
 "Build a source package. One or two non-option arguments should be supplied. "
 "The first is taken as the name of the directory containing the unpacked "
@@ -6703,7 +6684,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:75
+#: dpkg-source.1:75
 msgid ""
 "Specifies the main source control file to read information from. The default "
 "is B<debian/control>.  If given with relative pathname this is interpreted "
@@ -6711,7 +6692,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:82
+#: dpkg-source.1:82
 msgid ""
 "Specifies the change log file to read information from. The default is "
 "B<debian/changelog>.  If given with relative pathname this is interpreted "
@@ -6719,17 +6700,17 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:106
+#: dpkg-source.1:106
 msgid "This option turns certain errors into warnings."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:110
+#: dpkg-source.1:110
 msgid "This option negates a previously set B<-W>."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:118
+#: dpkg-source.1:118
 msgid ""
 "You may specify a perl regular expression to match files you want filtered "
 "out of the list of files for the diff. (This list is generated by a find "
@@ -6739,7 +6720,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:130
+#: dpkg-source.1:130
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
@@ -6754,7 +6735,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:137
+#: dpkg-source.1:137
 msgid ""
 "If this option is specified, the filename will be passed to tar's --exclude "
 "option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
@@ -6764,13 +6745,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-source.1:158
+#: dpkg-source.1:158
 #, no-wrap
 msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
 msgstr "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> z B<-b>"
 
 # type: Plain text
-#: ../dpkg-source.1:173
+#: dpkg-source.1:173
 msgid ""
 "If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
 "as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
@@ -6780,7 +6761,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:185
+#: dpkg-source.1:185
 msgid ""
 "If B<-su> or B<-sr> is specified the original source is expected as a "
 "directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
@@ -6789,7 +6770,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:196
+#: dpkg-source.1:196
 msgid ""
 "If B<-ss> is specified B<dpkg-source> will expect that the original source "
 "is available both as a directory and as a tarfile. If will use the directory "
@@ -6799,7 +6780,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:205
+#: dpkg-source.1:205
 msgid ""
 "If B<-sn> is specified B<dpkg-source> will not look for any original source, "
 "and will not generate a diff.  The second argument, if supplied, must be the "
@@ -6808,7 +6789,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:234
+#: dpkg-source.1:234
 msgid ""
 "If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
 "source archive as a tarfile or as a directory - the second argument, if any, "
@@ -6824,7 +6805,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:240
+#: dpkg-source.1:240
 msgid ""
 "B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
 "tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
@@ -6832,18 +6813,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../dpkg-source.1:240
+#: dpkg-source.1:240
 #, no-wrap
 msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr "B<-sp>,B<-su>,B<-sn> z B<-x>"
 
 # type: Plain text
-#: ../dpkg-source.1:243
+#: dpkg-source.1:243
 msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:250
+#: dpkg-source.1:250
 msgid ""
 "If B<-sp> is used when extracting then the original source (if any) will be "
 "left as a tarfile. If it is not already located in the current directory or "
@@ -6852,12 +6833,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:253
+#: dpkg-source.1:253
 msgid "B<-su> unpacks the original source tree."
 msgstr "B<-su> rozpakowuje oryginalne"
 
 # type: Plain text
-#: ../dpkg-source.1:258
+#: dpkg-source.1:258
 msgid ""
 "B<-sn> ensures that the original source is neither copied to the current "
 "directory nor unpacked. Any original source tree that was in the current "
@@ -6865,14 +6846,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:263
+#: dpkg-source.1:263
 msgid ""
 "All the B<-sX> options are mutually exclusive. If you specify more than one "
 "only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: ../dpkg-source.1:274
+#: dpkg-source.1:274
 msgid ""
 "The binary package entries in the B<debian/files> file will be passed "
 "through variable substitution twice. This should not matter, since B<$>, B<"
@@ -6881,31 +6862,31 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-source.1:279
+#: dpkg-source.1:279
 msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 
 # type: TH
-#: ../dpkg-split.1:2
+#: dpkg-split.1:2
 #, no-wrap
 msgid "dpkg-split"
 msgstr "dpkg-split"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:5
+#: dpkg-split.1:5
 msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-split - narzêdzie dzielenia/³±czenia pakietów Debiana"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:10
+#: dpkg-split.1:10
 msgid "B<dpkg-split> [I<options>] I<command>"
 msgstr "B<dpkg-split> [I<opcje>] I<polecenie>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:16
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6917,7 +6898,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:20
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -6927,7 +6908,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:28
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6941,7 +6922,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:31
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -6952,20 +6933,20 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:33
+#: dpkg-split.1:33
 #, no-wrap
 msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
 msgstr "B<-s>, B<--split> I<kompletne-archiwum> [I<przedrostek>]"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:36
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr "Rozdzielenie pojedynczego pakietu binarnego na poszczególne czê¶ci."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:44
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6977,7 +6958,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:52
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -6988,14 +6969,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:52
+#: dpkg-split.1:52
 #, no-wrap
 msgid "B<-j>, B<--join> I<part>..."
 msgstr "B<-j>, B<--join> I<part>..."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:56
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -7004,7 +6985,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:60
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -7016,7 +6997,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:65
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -7028,27 +7009,27 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:67
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 "Nazwy plików czê¶ci nie maj± znaczenia dla procesu odtworzenia pakietu."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:70
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr "Domy¶lnie, odtworzony plik ma nazwê I<pakiet>B<->I<wersja>B<.deb>."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:71
+#: dpkg-split.1:71
 #, no-wrap
 msgid "B<-I>, B<--info> I<part>..."
 msgstr "B<-I>, B<--info> I<part>..."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:76
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -7060,21 +7041,21 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:76
+#: dpkg-split.1:76
 #, no-wrap
 msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr "B<-a>, B<--auto -o> I<pe³ne-archiwum czê¶æ>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:79
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 "Automatyczne kolejkowanie czê¶ci i odtworzenie pakietu, gdy to jest mo¿liwe."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:84
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
@@ -7084,7 +7065,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:91
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -7095,7 +7076,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:97
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -7105,7 +7086,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:104
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
@@ -7116,7 +7097,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:111
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -7127,20 +7108,20 @@ msgstr ""
 "wyj¶ciowego.)"
 
 # type: TP
-#: ../dpkg-split.1:111
+#: dpkg-split.1:111
 #, no-wrap
 msgid "B<-l>, B<--listq>"
 msgstr "B<-l>, B<--listq>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:114
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr "Listowanie zawarto¶ci kolejki czê¶ci pakietu do odtworzenia."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:118
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -7151,14 +7132,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:118
+#: dpkg-split.1:118
 #, no-wrap
 msgid "B<-d>, B<--discard> [I<package>...]"
 msgstr "B<-d>, B<--discard> [I<pakiet>...]"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:122
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -7166,7 +7147,7 @@ msgstr "Usuwa cz
 
 # type: Plain text
 #
-#: ../dpkg-split.1:127
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
@@ -7175,14 +7156,14 @@ msgstr ""
 "jest podana, usuwane s± tylko czê¶ci podanego pakietu."
 
 # type: TP
-#: ../dpkg-split.1:138
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< katalog>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:143
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -7191,14 +7172,14 @@ msgstr ""
 "zrekonstruowania. Domy¶lnym jest B</var/lib/dpkg>."
 
 # type: TP
-#: ../dpkg-split.1:143
+#: dpkg-split.1:143
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr "B<-S>, B<--partsize> I<Kbajty>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:147
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
 "The default is 450 KiB."
@@ -7207,20 +7188,20 @@ msgstr ""
 "Warto¶ci± domy¶ln± jest 450 KiB."
 
 # type: TP
-#: ../dpkg-split.1:147
+#: dpkg-split.1:147
 #, no-wrap
 msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<-o>, B<--output> I<pe³ne-archiwum>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:150
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr "Okre¶lenie nazwy pliku pe³nego archiwum."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:155
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -7229,14 +7210,14 @@ msgstr ""
 "jest wymagana przy automatycznym odtwarzaniu pakietu (B<--auto>)."
 
 # type: TP
-#: ../dpkg-split.1:155
+#: dpkg-split.1:155
 #, no-wrap
 msgid "B<-Q>, B<--npquiet>"
 msgstr "B<-Q>, B<--npquiet>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:166
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -7249,14 +7230,14 @@ msgstr ""
 "informacji przez programy takie jak B<dpkg>."
 
 # type: TP
-#: ../dpkg-split.1:166
+#: dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:171
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
@@ -7265,7 +7246,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:177
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -7277,7 +7258,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:182
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
@@ -7286,14 +7267,14 @@ msgstr ""
 "postaæ I<przedrostekN>B<of>I<M>B<.deb..>"
 
 # type: SH
-#: ../dpkg-split.1:183 ../update-alternatives.8:339
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "KOD WYJ¦CIA"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:189
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -7305,7 +7286,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:195
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
@@ -7315,7 +7296,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:199
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -7327,7 +7308,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:204
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
@@ -7335,7 +7316,7 @@ msgstr "B<dpkg-split> u
 
 # type: Plain text
 #
-#: ../dpkg-split.1:207
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -7345,7 +7326,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:210
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -7355,7 +7336,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:214
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -7366,14 +7347,14 @@ msgstr ""
 "generowanej nazwy pliku."
 
 # type: TP
-#: ../dpkg-split.1:216
+#: dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/parts>"
 
 # type: Plain text
 #
-#: ../dpkg-split.1:220
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
@@ -7382,7 +7363,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:225
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -7393,13 +7374,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dpkg-split.1:231
+#: dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
 #
-#: ../dpkg-split.1:241
+#: dpkg-split.1:241
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
 "Copyright (C) 1995-1996 by him and released under the GNU General Public "
@@ -7412,30 +7393,30 @@ msgstr ""
 "copyright> oraz w I</usr/share/common-licences/GPL>."
 
 # type: TP
-#: ../dpkg-statoverride.8:1
+#: dpkg-statoverride.8:1
 #, no-wrap
 msgid "dpkg-statoverride"
 msgstr "dpkg-statoverride"
 
 # type: TH
-#: ../dpkg-statoverride.8:1
+#: dpkg-statoverride.8:1
 #, no-wrap
 msgid "Debian project"
 msgstr "Projekt Debiana"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:4
+#: dpkg-statoverride.8:4
 msgid "dpkg-statoverride - override ownership and mode of files"
 msgstr "dpkg-statoverride - nadpisywanie w³a¶ciciela i praw plików"
 
 # type: Plain text
 #
-#: ../dpkg-statoverride.8:9
+#: dpkg-statoverride.8:9
 msgid "B<dpkg-statoverride> [I<options>] I<command>"
 msgstr "B<dpkg-statoverride> [I<opcje>] I<polecenie>"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:19
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -7453,7 +7434,7 @@ msgstr ""
 "pewn± grupê u¿ytkowników."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:23
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
@@ -7463,13 +7444,13 @@ msgstr ""
 "takich nadpisañ."
 
 # type: TP
-#: ../dpkg-statoverride.8:25
+#: dpkg-statoverride.8:25
 #, no-wrap
 msgid "B<--add>I< user group mode file>"
 msgstr "B<--add>I< u¿ytkownik grupa tryb plik>"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:32
+#: dpkg-statoverride.8:32
 msgid ""
 "Add an override for B<file>. B<file> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -7484,7 +7465,7 @@ msgstr ""
 "lub B<#65534>)."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:35
+#: dpkg-statoverride.8:35
 msgid ""
 "If --update is specified and B<file> exists, it is immediately set to the "
 "new owner and mode."
@@ -7493,20 +7474,20 @@ msgstr ""
 "zostan± od razu ustawione."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:39
+#: dpkg-statoverride.8:39
 msgid ""
 "Remove an override for B<file>, the status of B<file> is left unchanged by "
 "this command."
 msgstr "Usuwa nadpisanie B<pliku>. Polecenie to nie zmienia stanu B<pliku>."
 
 # type: TP
-#: ../dpkg-statoverride.8:39
+#: dpkg-statoverride.8:39
 #, no-wrap
 msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--list> [I<wzorzec-glob>]"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:44
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
@@ -7518,7 +7499,7 @@ msgstr ""
 "statoverride> zakoñczy dzia³anie z kodem b³êdu 1."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:56
+#: dpkg-statoverride.8:56
 msgid ""
 "Change the directory of the dpkg database where the statoverride file is "
 "also stored. Defaults to I</var/lib/dpkg>."
@@ -7527,13 +7508,13 @@ msgstr ""
 "statoverride. Domy¶lnie jest to I</var/lib/dpkg>."
 
 # type: TP
-#: ../dpkg-statoverride.8:56
+#: dpkg-statoverride.8:56
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:60
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
@@ -7542,31 +7523,31 @@ msgstr ""
 "tego zabroni³y. Jest to potrzebne, aby nadpisaæ istniej±ce nadpisanie."
 
 # type: TP
-#: ../dpkg-statoverride.8:60
+#: dpkg-statoverride.8:60
 #, no-wrap
 msgid "B<--update>"
 msgstr "B<--update>"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:64
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 "Od razy próbuje zmieniæ w³a¶ciciela i prawa pliku, je¿eli ten plik istnieje."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:67
+#: dpkg-statoverride.8:67
 msgid "Be less verbose about what we do."
 msgstr "Wy¶wietla mniej komunikatów o podejmowanych przez program akcjach."
 
 # type: TP
-#: ../dpkg-statoverride.8:69
+#: dpkg-statoverride.8:69
 #, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/statoverride>"
 
 # type: Plain text
-#: ../dpkg-statoverride.8:74
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -7577,7 +7558,7 @@ msgstr ""
 "takimi jak `status' lub `available'."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:77
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
@@ -7586,25 +7567,25 @@ msgstr ""
 "star± kopiê w pliku z rozszerzeniem \"-old\"."
 
 # type: Plain text
-#: ../dpkg-statoverride.8:83
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Copyright 2000 Wichert Akkerman"
 
 # type: SS
-#: ../dselect.1:1
+#: dselect.1:1
 #, no-wrap
 msgid "dselect"
 msgstr "dselect"
 
 # type: Plain text
 #
-#: ../dselect.1:4
+#: dselect.1:4
 msgid "dselect - Debian package management frontend"
 msgstr "dselect - konsolowe narzêdzie zarz±dzania pakietami Debiana"
 
 # type: Plain text
 #
-#: ../dselect.1:17
+#: dselect.1:17
 msgid ""
 "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--version>] "
 "[B<--licence>|B<--license>] [B<--expert>] [B<--debug>|B<-"
@@ -7617,7 +7598,7 @@ msgstr ""
 "I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]]"
 
 # type: Plain text
-#: ../dselect.1:26
+#: dselect.1:26
 #, no-wrap
 msgid ""
 "B<dselect>\n"
@@ -7638,7 +7619,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:38
+#: dselect.1:38
 msgid ""
 "B<dselect> operates as a front-end to B<dpkg>(1), the low-level debian "
 "package handling tool. It features a full-screen package selections manager "
@@ -7664,7 +7645,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:44
+#: dselect.1:44
 msgid ""
 "Normally B<dselect> is invoked without parameters. An interactive menu is "
 "presented, offering the user a list of actions. If an action is given as "
@@ -7681,7 +7662,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:51
+#: dselect.1:51
 msgid ""
 "All options can be specified both on the commandline and in the B<dselect> "
 "configuration file I</etc/dpkg/dselect.cfg>. Each line in the configuration "
@@ -7694,14 +7675,14 @@ msgstr ""
 "bez pocz±tkowych my¶lników), albo komentarzem (je¿eli zaczyna siê od B<#>)."
 
 # type: TP
-#: ../dselect.1:52
+#: dselect.1:52
 #, no-wrap
 msgid "B<--admindir>I< E<lt>directoryE<gt>>"
 msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
 
 # type: Plain text
 #
-#: ../dselect.1:57
+#: dselect.1:57
 msgid ""
 "Changes the directory where the dpkg `I<status>', `I<available>' and similar "
 "files are located. This defaults to I</var/lib/dpkg> and normally there "
@@ -7712,28 +7693,28 @@ msgstr ""
 "zazwyczaj nie powinno byæ potrzeby zmieniania go na inny."
 
 # type: TP
-#: ../dselect.1:57
+#: dselect.1:57
 #, no-wrap
 msgid "B<--debug>I< E<lt>fileE<gt> >|I< >B<-D>I<E<lt>fileE<gt>>"
 msgstr "B<--debug>I< E<lt>plikE<gt> >|I< >B<-D>I<E<lt>plikE<gt>>"
 
 # type: Plain text
 #
-#: ../dselect.1:60
+#: dselect.1:60
 msgid "Turn on debugging. Debugging information is sent to I<E<lt>fileE<gt>>."
 msgstr ""
 "W³±cza opcjê debuggera. Informacje debuggera s± wysy³ane do "
 "I<E<lt>plikuE<gt>>."
 
 # type: TP
-#: ../dselect.1:60
+#: dselect.1:60
 #, no-wrap
 msgid "B<--expert>"
 msgstr "B<--expert>"
 
 # type: Plain text
 #
-#: ../dselect.1:64
+#: dselect.1:64
 msgid ""
 "Turns on expert mode, i.e. doesn't display possibly annoying help messages."
 msgstr ""
@@ -7741,14 +7722,14 @@ msgstr ""
 "informacji z pomoc±."
 
 # type: TP
-#: ../dselect.1:64
+#: dselect.1:64
 #, no-wrap
 msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 msgstr "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]"
 
 # type: Plain text
 #
-#: ../dselect.1:71
+#: dselect.1:71
 msgid ""
 "Configures screen colors. This works only if your display supports colors.  "
 "This option may be used multiple times (and is best used in I<dselect.cfg>). "
@@ -7761,76 +7742,76 @@ msgstr ""
 "jakiej¶ czê¶ci ekranu. Czê¶ci ekranu s± nastêpuj±ce (od góry do do³u):"
 
 # type: TP
-#: ../dselect.1:72
+#: dselect.1:72
 #, no-wrap
 msgid "B<title>"
 msgstr "B<title>"
 
 # type: Plain text
 #
-#: ../dselect.1:75
+#: dselect.1:75
 msgid "The screen title."
 msgstr "Tytu³ ekranu."
 
 # type: TP
-#: ../dselect.1:75
+#: dselect.1:75
 #, no-wrap
 msgid "B<listhead>"
 msgstr "B<listhead>"
 
 # type: Plain text
 #
-#: ../dselect.1:78
+#: dselect.1:78
 msgid "The header line above the list of packages."
 msgstr "Linia nag³ówka nad list± pakietów."
 
 # type: TP
-#: ../dselect.1:78
+#: dselect.1:78
 #, no-wrap
 msgid "B<list>"
 msgstr "B<list>"
 
 # type: Plain text
 #
-#: ../dselect.1:81
+#: dselect.1:81
 msgid "The scrolling list of packages (and also some help text)."
 msgstr "Przewijana lista pakietów (i równie¿ niektóre teksty pomocy)."
 
 # type: TP
-#: ../dselect.1:81
+#: dselect.1:81
 #, no-wrap
 msgid "B<listsel>"
 msgstr "B<listsel>"
 
 # type: Plain text
 #
-#: ../dselect.1:84
+#: dselect.1:84
 msgid "The selected item in the list."
 msgstr "Pod¶wietlony element z listy."
 
 # type: TP
-#: ../dselect.1:84
+#: dselect.1:84
 #, no-wrap
 msgid "B<pkgstate>"
 msgstr "B<pkgstate>"
 
 # type: Plain text
 #
-#: ../dselect.1:88
+#: dselect.1:88
 msgid ""
 "In the list of packages, the text indicating the current state of each "
 "package."
 msgstr "W li¶cie pakietów - tekst oznaczaj±cy obecny stan ka¿dego pakietu."
 
 # type: TP
-#: ../dselect.1:88
+#: dselect.1:88
 #, no-wrap
 msgid "B<pkgstatesel>"
 msgstr "B<pkgstatesel>"
 
 # type: Plain text
 #
-#: ../dselect.1:92
+#: dselect.1:92
 msgid ""
 "In the list of packages, the text indicating the current state of the "
 "currently selected package."
@@ -7838,82 +7819,82 @@ msgstr ""
 "W li¶cie pakietów - tekst oznaczaj±cy obecny stan pod¶wietlonego pakietu."
 
 # type: TP
-#: ../dselect.1:92
+#: dselect.1:92
 #, no-wrap
 msgid "B<infohead>"
 msgstr "B<infohead>"
 
 # type: Plain text
 #
-#: ../dselect.1:95
+#: dselect.1:95
 msgid ""
 "The header line that displays the state of the currently selected package."
 msgstr ""
 "Linia nag³ówka, w której wy¶wietlony jest stan obecnie zaznaczonego pakietu."
 
 # type: TP
-#: ../dselect.1:95
+#: dselect.1:95
 #, no-wrap
 msgid "B<infodesc>"
 msgstr "B<infodesc>"
 
 # type: Plain text
 #
-#: ../dselect.1:98
+#: dselect.1:98
 msgid "The package's short description."
 msgstr "Krótki opis pakietu."
 
 # type: TP
-#: ../dselect.1:98
+#: dselect.1:98
 #, no-wrap
 msgid "B<info>"
 msgstr "B<info>"
 
 # type: Plain text
 #
-#: ../dselect.1:101
+#: dselect.1:101
 msgid "Used to display package info such as the package's description."
 msgstr "U¿ywane do wy¶wietlania informacji o pakiecie takich jak jego opis."
 
 # type: TP
-#: ../dselect.1:101
+#: dselect.1:101
 #, no-wrap
 msgid "B<infofoot>"
 msgstr "B<infofoot>"
 
 # type: Plain text
 #
-#: ../dselect.1:104
+#: dselect.1:104
 msgid "The last line of the screen when selecting packages."
 msgstr "Ostatnia linia ekranu z wyborem pakietów."
 
 # type: TP
-#: ../dselect.1:104
+#: dselect.1:104
 #, no-wrap
 msgid "B<query>"
 msgstr "B<query>"
 
 # type: Plain text
 #
-#: ../dselect.1:107
+#: dselect.1:107
 msgid "Used to display query lines"
 msgstr "U¿ywane do wy¶wietlania linii zapytañ."
 
 # type: TP
-#: ../dselect.1:107
+#: dselect.1:107
 #, no-wrap
 msgid "B<helpscreen>"
 msgstr "B<helpscreen>"
 
 # type: Plain text
 #
-#: ../dselect.1:110
+#: dselect.1:110
 msgid "Color of help screens."
 msgstr "Kolor ekranów pomocy."
 
 # type: Plain text
 #
-#: ../dselect.1:115
+#: dselect.1:115
 msgid ""
 "After the part of the screen comes a colon and the color specification. You "
 "can specify either the foreground color, the background color, or both, "
@@ -7926,7 +7907,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:121
+#: dselect.1:121
 msgid ""
 "Optionally, after the color specification is another colon, and an attribute "
 "specification. This is a list of one or more attributes, separated by plus "
@@ -7943,19 +7924,19 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:124
+#: dselect.1:124
 msgid "Print a brief help text and exit successfully."
 msgstr "Wy¶wietla krótk± informacjê o pomocy i pomy¶lnie koñczy dzia³anie."
 
 # type: TP
-#: ../dselect.1:124
+#: dselect.1:124
 #, no-wrap
 msgid "B<--licence>|B<--license>"
 msgstr "B<--licence>|B<--license>"
 
 # type: Plain text
 #
-#: ../dselect.1:128
+#: dselect.1:128
 msgid ""
 "Displays the B<dselect> copyright and license information and exits "
 "successfully."
@@ -7965,19 +7946,19 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:131
+#: dselect.1:131
 msgid "Print version information and exit successfully."
 msgstr "Wy¶wietla informacjê o wersji i pomy¶lnie koñczy dzia³anie."
 
 # type: SH
-#: ../dselect.1:132
+#: dselect.1:132
 #, no-wrap
 msgid "USAGE"
 msgstr "U¯YTKOWANIE"
 
 # type: Plain text
 #
-#: ../dselect.1:137
+#: dselect.1:137
 msgid ""
 "When B<dselect> is started interactively, it prompts the user with a menu of "
 "available actions:"
@@ -7986,20 +7967,20 @@ msgstr ""
 "akcjami:"
 
 # type: SS
-#: ../dselect.1:137
+#: dselect.1:137
 #, no-wrap
 msgid "access"
 msgstr "access (dostêp)"
 
 # type: Plain text
 #
-#: ../dselect.1:139
+#: dselect.1:139
 msgid "Choose and configure an access method to access package repositories."
 msgstr "Wybiera metodê dostêpu u¿ywan± do znalezienia repozytorium pakietów."
 
 # type: Plain text
 #
-#: ../dselect.1:145
+#: dselect.1:145
 msgid ""
 "By default, B<dselect> provides several methods such as I<floppy>, "
 "I<harddisk> or I<cdrom>, but other packages may provide additional methods, "
@@ -8013,25 +7994,25 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:147
+#: dselect.1:147
 msgid "The use of the I<apt> access method is strongly recommended."
 msgstr "Zalecane jest u¿ywanie metody I<apt>."
 
 # type: SS
-#: ../dselect.1:148
+#: dselect.1:148
 #, no-wrap
 msgid "update"
 msgstr "update (aktualizacja)"
 
 # type: Plain text
 #
-#: ../dselect.1:150
+#: dselect.1:150
 msgid "Refresh the available packages database."
 msgstr "Aktualizuje bazê dostêpnych pakietów."
 
 # type: Plain text
 #
-#: ../dselect.1:157
+#: dselect.1:157
 msgid ""
 "Retrieves a list of available package versions from the package repository, "
 "configured for the current access method, and update the dpkg database. The "
@@ -8048,7 +8029,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:160
+#: dselect.1:160
 msgid ""
 "Details of the update action depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
@@ -8057,21 +8038,21 @@ msgstr ""
 "proces jest bardzo prosty i nie wymaga interakcji z u¿ytkownikiem."
 
 # type: SS
-#: ../dselect.1:161
+#: dselect.1:161
 #, no-wrap
 msgid "select"
 msgstr "select (wybór)"
 
 # type: Plain text
 #
-#: ../dselect.1:163
+#: dselect.1:163
 msgid "View or manage package selections and dependencies."
 msgstr ""
 "Wy¶wietla informacje o wyborze pakietów i zale¿no¶ciach oraz zarz±dza nimi."
 
 # type: Plain text
 #
-#: ../dselect.1:169
+#: dselect.1:169
 msgid ""
 "This is the main function of B<dselect>. In the select screen, the user can "
 "review a list of all available and installed packages. When run with "
@@ -8087,7 +8068,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:176
+#: dselect.1:176
 msgid ""
 "When a conflict or failed depends is detected, a dependency resolution "
 "subscreen is prompted to the user. In this screen, a list of conflicting or "
@@ -8106,7 +8087,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:179
+#: dselect.1:179
 msgid ""
 "The use of the interactive package selections management screen is explained "
 "in more detail below."
@@ -8115,20 +8096,20 @@ msgstr ""
 "szczegó³owo wyj±¶nione poni¿ej."
 
 # type: SS
-#: ../dselect.1:180
+#: dselect.1:180
 #, no-wrap
 msgid "install"
 msgstr "install (instalacja)"
 
 # type: Plain text
 #
-#: ../dselect.1:182
+#: dselect.1:182
 msgid "Installs selected packages."
 msgstr "Instaluje wybrane pakiety."
 
 # type: Plain text
 #
-#: ../dselect.1:188
+#: dselect.1:188
 msgid ""
 "The configured access method will fetch installable or upgradable packages "
 "from the relevant repositories and install these using B<dpkg>.  Depending "
@@ -8144,7 +8125,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:196
+#: dselect.1:196
 msgid ""
 "If an error occurred during install, it is usually advisable to run install "
 "again. In most cases, the problems will disappear or be solved.  If problems "
@@ -8165,7 +8146,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:203
+#: dselect.1:203
 msgid ""
 "Details of the install action depend on the access method's implementation.  "
 "The user's attention and input may be required during installation, "
@@ -8180,65 +8161,65 @@ msgstr ""
 "lub nawet w pe³ni automatyczn± instalacjê pakietu."
 
 # type: SS
-#: ../dselect.1:204
+#: dselect.1:204
 #, no-wrap
 msgid "config"
 msgstr "config (konfigurowanie)"
 
 # type: Plain text
 #
-#: ../dselect.1:206
+#: dselect.1:206
 msgid "Configures any previously installed, but not fully configured packages."
 msgstr ""
 "Konfiguruje wszystkie pakiety poprzednio zainstalowane, ale nie do koñca "
 "skonfigurowane."
 
 # type: SS
-#: ../dselect.1:207
+#: dselect.1:207
 #, no-wrap
 msgid "remove"
 msgstr "remove (usuwanie)"
 
 # type: Plain text
 #
-#: ../dselect.1:209
+#: dselect.1:209
 msgid "Removes or purges installed packages, that are marked for removal."
 msgstr ""
 "Usuwa lub czy¶ci te zainstalowane pakiety, które s± zaznaczone do usuniêcia."
 
 # type: SS
-#: ../dselect.1:210
+#: dselect.1:210
 #, no-wrap
 msgid "quit"
 msgstr "quit (wyj¶cie)"
 
 # type: Plain text
 #
-#: ../dselect.1:212
+#: dselect.1:212
 msgid "Quit B<dselect>"
 msgstr "Wyj¶cie z B<dselect>."
 
 # type: Plain text
 #
-#: ../dselect.1:214
+#: dselect.1:214
 msgid "Exits the program with zero (successful) errorcode."
 msgstr "Wychodzi z programu z zerowym kodem b³êdu (pomy¶lnie)."
 
 # type: SH
-#: ../dselect.1:216
+#: dselect.1:216
 #, no-wrap
 msgid "Package selections management"
 msgstr "Zarz±dzanie wyborem pakietów"
 
 # type: SS
-#: ../dselect.1:218
+#: dselect.1:218
 #, no-wrap
 msgid "Introduction"
 msgstr "Wstêp"
 
 # type: Plain text
 #
-#: ../dselect.1:234
+#: dselect.1:234
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -8265,7 +8246,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:240
+#: dselect.1:240
 msgid ""
 "Unless B<dselect> is run in expert or immediate mode, a help screen is first "
 "displayed when choosing this action from the menu. The user is I<strongly> "
@@ -8280,14 +8261,14 @@ msgstr ""
 "wy¶wietlone w dowolnym momencie przez wybranie klawisza B<'?'>."
 
 # type: SS
-#: ../dselect.1:241
+#: dselect.1:241
 #, no-wrap
 msgid "Screen layout"
 msgstr "Uk³ad ekranu"
 
 # type: Plain text
 #
-#: ../dselect.1:249
+#: dselect.1:249
 msgid ""
 "The select screen is by default split in a top and a bottom half.  The top "
 "half shows a list of packages. A cursor bar can select an individual "
@@ -8305,7 +8286,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:252
+#: dselect.1:252
 msgid ""
 "Pressing the B<'I'> key toggles a full-screen display of the packages list, "
 "an enlarged view of the package details, or the equally split screen."
@@ -8315,13 +8296,13 @@ msgstr ""
 "dzieli ekran na po³owê."
 
 # type: SS
-#: ../dselect.1:253
+#: dselect.1:253
 #, no-wrap
 msgid "Package details view"
 msgstr "Widok szczegó³owych informacji o pakiecie"
 
 # type: Plain text
-#: ../dselect.1:262
+#: dselect.1:262
 #, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
@@ -8342,7 +8323,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:266
+#: dselect.1:266
 msgid ""
 "In a dependency resolution screen, there is also the possibility of viewing "
 "the specific unresolved depends or conflicts related to the package and "
@@ -8353,14 +8334,14 @@ msgstr ""
 "zale¿no¶ci, które spowodowa³y wylistowanie tego pakietu."
 
 # type: SS
-#: ../dselect.1:267
+#: dselect.1:267
 #, no-wrap
 msgid "Packages status list"
 msgstr "Lista stanów pakietów"
 
 # type: Plain text
 #
-#: ../dselect.1:272
+#: dselect.1:272
 msgid ""
 "The main select screen displays a list of all packages known to the debian "
 "package management system. This includes packages installed on the system "
@@ -8372,7 +8353,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:280
+#: dselect.1:280
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available versions, the package name and its short "
@@ -8391,7 +8372,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:286
+#: dselect.1:286
 msgid ""
 "The shorthand status indication consists of four parts: an error flag, which "
 "should normally be clear, the current status, the last selection state and "
@@ -8405,7 +8386,7 @@ msgstr ""
 "wyborami dokonanymi przez u¿ytkownika."
 
 # type: Plain text
-#: ../dselect.1:304
+#: dselect.1:304
 #, no-wrap
 msgid ""
 "These are the meanings of the shorthand package status indicator codes:\n"
@@ -8445,14 +8426,14 @@ msgstr ""
 "  B<n>       pakiet jest nowy i jeszcze nie by³ znaczony.\n"
 
 # type: SS
-#: ../dselect.1:305
+#: dselect.1:305
 #, no-wrap
 msgid "Cursor and screen movement"
 msgstr "Przesuwanie kursora i ekranu"
 
 # type: Plain text
 #
-#: ../dselect.1:310
+#: dselect.1:310
 msgid ""
 "The package selection list and the dependency conflict resolution screens "
 "can be navigated using motion commands mapped to the following keys:"
@@ -8461,7 +8442,7 @@ msgstr ""
 "u¿ywaj±c poleceñ przypisanych do nastêpuj±cych klawiszy:"
 
 # type: Plain text
-#: ../dselect.1:327
+#: dselect.1:327
 #, no-wrap
 msgid ""
 "  B<p, Up, k>           move cursor bar up\n"
@@ -8499,14 +8480,14 @@ msgstr ""
 "  B<^f>                 przesuniêcie ekranu o 1 znak w prawo\n"
 
 # type: SS
-#: ../dselect.1:328
+#: dselect.1:328
 #, no-wrap
 msgid "Searching and sorting"
 msgstr "Wyszukiwanie i sortowanie"
 
 # type: Plain text
 #
-#: ../dselect.1:342
+#: dselect.1:342
 msgid ""
 "The list of packages can be searched by package name. This is done by "
 "pressing B<'/'>, and typing a simple search string. The string is "
@@ -8529,7 +8510,7 @@ msgstr ""
 "kontynuowane od pocz±tku listy."
 
 # type: Plain text
-#: ../dselect.1:349
+#: dselect.1:349
 #, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
@@ -8548,7 +8529,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:352
+#: dselect.1:352
 msgid ""
 "Where not listed above explicitly, alphabetic order is used as the final "
 "subordering sort key."
@@ -8557,13 +8538,13 @@ msgstr ""
 "jest u¿ywany jako klucz podwyszukiwania."
 
 # type: SS
-#: ../dselect.1:353
+#: dselect.1:353
 #, no-wrap
 msgid "Altering selections"
 msgstr "Zmienianie wyboru pakietów"
 
 # type: Plain text
-#: ../dselect.1:362
+#: dselect.1:362
 #, no-wrap
 msgid ""
 "The requested selection state of individual packages may be\n"
@@ -8584,7 +8565,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:366
+#: dselect.1:366
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -8596,7 +8577,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:371
+#: dselect.1:371
 msgid ""
 "It is also possible to apply these commands to groups of package selections, "
 "by pointing the cursor bar onto a group header. The exact grouping of "
@@ -8608,7 +8589,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:377
+#: dselect.1:377
 msgid ""
 "Proper care should be taken when altering large groups of selections, "
 "because this can instantaneously create large numbers of unresolved depends "
@@ -8623,14 +8604,14 @@ msgstr ""
 "w odniesieniu do grup pakietów."
 
 # type: SS
-#: ../dselect.1:378
+#: dselect.1:378
 #, no-wrap
 msgid "Resolving depends and conflicts"
 msgstr "Rozwi±zywanie zale¿no¶ci i konfliktów"
 
 # type: Plain text
 #
-#: ../dselect.1:383
+#: dselect.1:383
 msgid ""
 "When the change request results in one or more unsatisfied depends or "
 "conflicts, B<dselect> prompts the user with a dependency resolution screen. "
@@ -8642,7 +8623,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:390
+#: dselect.1:390
 msgid ""
 "The top half of this screen lists all the packages that will have unresolved "
 "depends or conflicts, as a result of the requested change, and all the "
@@ -8661,7 +8642,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:396
+#: dselect.1:396
 msgid ""
 "When the sublist of packages is displayed initially, B<dselect> may have "
 "already set the requested selection status of some of the listed packages, "
@@ -8677,7 +8658,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:404
+#: dselect.1:404
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -8695,14 +8676,14 @@ msgstr ""
 "ustawiane na sugerowane warto¶ci."
 
 # type: SS
-#: ../dselect.1:405
+#: dselect.1:405
 #, no-wrap
 msgid "Establishing the requested selections"
 msgstr "Ustanawianie ¿±danych wyborów pakietów"
 
 # type: Plain text
 #
-#: ../dselect.1:412
+#: dselect.1:412
 msgid ""
 "By pressing B<enter>, the currently displayed set of selections is accepted. "
 "If B<dselect> detects no unresolved depends as a result of the requested "
@@ -8718,7 +8699,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:418
+#: dselect.1:418
 msgid ""
 "To alter a set of selections that creates unresolved depends or conflicts "
 "and forcing B<dselect> to accept it, press the B<'Q'> key. This sets the "
@@ -8732,7 +8713,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:425
+#: dselect.1:425
 msgid ""
 "The opposite effect, to back out any selections change requests and go back "
 "to the previous list of selections, is attained by pressing the B<'X'> or "
@@ -8748,7 +8729,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:432
+#: dselect.1:432
 msgid ""
 "The B<dselect> package selection interface is confusing to some new users.  "
 "Reportedly, it even makes seasoned kernel developers cry."
@@ -8758,25 +8739,25 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:434
+#: dselect.1:434
 msgid "The documentation is lacking."
 msgstr "Dokumentacja jest wybrakowana."
 
 # type: Plain text
 #
-#: ../dselect.1:436
+#: dselect.1:436
 msgid "There is no help option in the main menu."
 msgstr "Brak opcji \"pomoc\" w g³ównym menu."
 
 # type: Plain text
 #
-#: ../dselect.1:438
+#: dselect.1:438
 msgid "The visible list of available packages cannot be reduced."
 msgstr "Nie mo¿na ograniczyæ listy dostêpnych pakietów."
 
 # type: Plain text
 #
-#: ../dselect.1:442
+#: dselect.1:442
 msgid ""
 "The built in access methods can no longer stand up to current quality "
 "standards. Use the access method provided by apt, it is not only not broken, "
@@ -8788,13 +8769,13 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:448
+#: dselect.1:448
 msgid "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 msgstr "B<dpkg>(1), B<apt-get>(8), B<sources.list>(5), B<deb>(5)."
 
 # type: Plain text
 #
-#: ../dselect.1:453
+#: dselect.1:453
 msgid ""
 "B<dselect> was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list "
 "of contributors may be found in `dselect --license'."
@@ -8804,7 +8785,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../dselect.1:456
+#: dselect.1:456
 msgid ""
 "This manual page was written by Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, "
 "Josip Rodin and Joost kooij."
@@ -8813,18 +8794,18 @@ msgstr ""
 "i Joost kooij."
 
 # type: TH
-#: ../dselect.cfg.5:1
+#: dselect.cfg.5:1
 #, no-wrap
 msgid "dselect.cfg"
 msgstr "dselect.cfg"
 
 # type: Plain text
-#: ../dselect.cfg.5:4
+#: dselect.cfg.5:4
 msgid "dselect.cfg - dselect configuration file"
 msgstr "dselect.cfg - plik konfiguracyjny programu dselect "
 
 # type: Plain text
-#: ../dselect.cfg.5:11
+#: dselect.cfg.5:11
 msgid ""
 "This file contains default options for dselect. Each line contains a single "
 "option which is exactly the same as a normal commandline option for dselect "
@@ -8837,17 +8818,17 @@ msgstr ""
 "Mo¿na u¿ywaæ komentarzy, zaczynaj±c liniê znakiem hasha (\"B<#>\")."
 
 # type: TP
-#: ../dselect.cfg.5:14
+#: dselect.cfg.5:14
 msgid "I</etc/dpkg/dselect.cfg>"
 msgstr "I</etc/dpkg/dselect.cfg>"
 
 # type: Plain text
-#: ../dselect.cfg.5:16
+#: dselect.cfg.5:16
 msgid "I<~/.dselect.cfg>"
 msgstr "I<~/.dselect.cfg>"
 
 # type: Plain text
-#: ../dselect.cfg.5:20
+#: dselect.cfg.5:20
 msgid ""
 "See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
 "contributed to B<dselect>."
@@ -8856,23 +8837,23 @@ msgstr ""
 "przyczyni³y siê do rozwoju programu B<dselect>."
 
 # type: Plain text
-#: ../dselect.cfg.5:22
+#: dselect.cfg.5:22
 msgid "B<dselect>(1)."
 msgstr "B<dselect>(1)."
 
 # type: SS
-#: ../install-info.8:5
+#: install-info.8:5
 #, no-wrap
 msgid "install-info"
 msgstr "install-info"
 
 # type: Plain text
-#: ../install-info.8:8
+#: install-info.8:8
 msgid "install-info - create or update entry in Info directory"
 msgstr "install-info - tworzy lub aktualizuje wpis w katalogu Info"
 
 # type: Plain text
-#: ../install-info.8:24
+#: install-info.8:24
 msgid ""
 "B<install-info> [B<--version>] [B<--help>] [B<--debug>] [B<--"
 "maxwidth=>I<nnn>] [B<--section >I<regexp>B< >I<title>] [B<--infodir=>I<xxx>] "
@@ -8885,7 +8866,7 @@ msgstr ""
 "description=>I<xxx>] [B<--remove>|B<--remove-exactly>] [B<-->] I<nazwa-pliku>"
 
 # type: Plain text
-#: ../install-info.8:32
+#: install-info.8:32
 msgid ""
 "B<install-info> makes, updates or removes entries in the Info directory, the "
 "B<dir> file. When updating or creating entries, if no description is "
@@ -8894,7 +8875,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:39
+#: install-info.8:39
 msgid ""
 "See the description of the B<--section> option for details of where the "
 "entry will be placed and a description of the expected format of the B<dir> "
@@ -8902,13 +8883,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:40
+#: install-info.8:40
 #, no-wrap
 msgid "B<[--] >I<filename>"
 msgstr "B<[--] >I<nazwa pliku>"
 
 # type: Plain text
-#: ../install-info.8:57
+#: install-info.8:57
 msgid ""
 "Gives the filename of the Info file whose menu entry is to be created, "
 "updated or removed. If B<--remove-exactly> is specified, then I<filename> "
@@ -8921,7 +8902,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:66
+#: install-info.8:66
 msgid ""
 "If I<filename> ends in B<.gz> it is taken to refer to a file compressed with "
 "GNU gzip; if it doesn't exist, but a corresponding I<filename>B<.gz> does, "
@@ -8929,27 +8910,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:71
+#: install-info.8:71
 msgid ""
 "When adding or updating entries the file must exist at the path specified "
 "(possibly with an additional B<.gz> extension)."
 msgstr ""
 
 # type: SS
-#: ../install-info.8:71
+#: install-info.8:71
 #, no-wrap
 msgid "B<--remove>"
 msgstr "B<--remove>"
 
 # type: Plain text
-#: ../install-info.8:76
+#: install-info.8:76
 msgid ""
 "Specifies that the entry for the file I<filename> is to be removed; by "
 "default entries are created or updated."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:86
+#: install-info.8:86
 msgid ""
 "If the removal results in a section becoming empty the section heading (and "
 "the spare blank line) will be removed as well, unless this is the last "
@@ -8958,7 +8939,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:91
+#: install-info.8:91
 msgid ""
 "If there are several suitable entries in the B<dir> file only those in the "
 "first matching contiguous group will be removed and the others silently "
@@ -8966,27 +8947,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:97
+#: install-info.8:97
 msgid ""
 "It is not an error for no suitable entry to be found, though B<install-info> "
 "will issue a warning unless the B<--quiet> option was specified."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:103
+#: install-info.8:103
 msgid ""
 "When B<--remove> is specified the B<--maxwidth>, B<--align> and B<--calign> "
 "formatting options are silently ignored."
 msgstr ""
 
 # type: TP
-#: ../install-info.8:103
+#: install-info.8:103
 #, no-wrap
 msgid "B<--remove-exactly>"
 msgstr "B<--remove-exactly>"
 
 # type: Plain text
-#: ../install-info.8:121
+#: install-info.8:121
 msgid ""
 "This option is essentially the same as B<--remove> except that I<filename> "
 "is taken as the exact entry to be removed, rather than as the name of an "
@@ -8998,13 +8979,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:121
+#: install-info.8:121
 #, no-wrap
 msgid "B<--section >I<regexp title>"
 msgstr "B<--section >I<wyra¿-regularne tytu³>"
 
 # type: Plain text
-#: ../install-info.8:135
+#: install-info.8:135
 msgid ""
 "Specifies that, if a new entry is to be made, it should be placed in a "
 "section of the B<dir> file whose title matches I<regexp>.  If no such "
@@ -9014,7 +8995,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:142
+#: install-info.8:142
 msgid ""
 "If a new entry is to be created B<install-info> will attempt to insert it "
 "within the section according in alphabetic order; if the entries in the "
@@ -9023,7 +9004,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:148
+#: install-info.8:148
 msgid ""
 "The default is to append new entries to the end of the file. The last "
 "section (even if it only consists of the title line) should always exist, to "
@@ -9033,21 +9014,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:151
+#: install-info.8:151
 msgid ""
 "If there is already an entry for the Info file being installed it is "
 "replaced in situ with the new entry."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:154
+#: install-info.8:154
 msgid ""
 "If a section is specified when removing an entry the section is ignored and "
 "a warning is issued."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:160
+#: install-info.8:160
 msgid ""
 "If a section is requested when adding an entry but the file contains no "
 "section headings at all then B<install-info> will create both the requested "
@@ -9055,13 +9036,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:160
+#: install-info.8:160
 #, no-wrap
 msgid "B<--infodir=>I<infodir>"
 msgstr "B<--infodir=>I<katalog>"
 
 # type: Plain text
-#: ../install-info.8:169
+#: install-info.8:169
 msgid ""
 "Specifies that the B<dir> file is, and the installed copy of the new Info "
 "file was, is or will be located in I<infodir>.  The default is B</usr/share/"
@@ -9069,13 +9050,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:169
+#: install-info.8:169
 #, no-wrap
 msgid "B<--align=>I<nnn>B< [deprecated]>"
 msgstr "B<--align=>I<nnn>B< [przestarza³e]>"
 
 # type: Plain text
-#: ../install-info.8:178
+#: install-info.8:178
 msgid ""
 "Specifies that the first line of the description should be indented at least "
 "I<nnn> characters; extra spaces will be added as required. If necessary "
@@ -9084,33 +9065,33 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:178
+#: install-info.8:178
 #, no-wrap
 msgid "B<--calign=>I<nnn>B< [deprecated]>"
 msgstr "B<--calign=>I<nnn>B< [przestarza³e]>"
 
 # type: Plain text
-#: ../install-info.8:184
+#: install-info.8:184
 msgid ""
 "Specifies that the second and subsequent lines of the description should be "
 "indented at least I<nnn> characters. The default is 29."
 msgstr ""
 
 # type: TP
-#: ../install-info.8:184
+#: install-info.8:184
 #, no-wrap
 msgid "B<--maxwidth=>I<nnn>B< [deprecated]>"
 msgstr "B<--maxwidth=>I<nnn>B< [przestarza³e]>"
 
 # type: Plain text
-#: ../install-info.8:190
+#: install-info.8:190
 msgid ""
 "Specifies that the maximum width for the Info file is I<nnn>.  This is used "
 "when word-wrapping the descriptive text.  The default is 79."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:195
+#: install-info.8:195
 msgid ""
 "Prevents the usual display of the new menu entry just before it is inserted, "
 "and of the messages announcing the replacement and removal of existing "
@@ -9118,7 +9099,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:200
+#: install-info.8:200
 msgid "Causes B<install-info> to display its usage information and exit."
 msgstr ""
 "Powoduje, ¿e B<install-info> wy¶wietli informacje o u¿yciu i zakoñczy "
@@ -9126,7 +9107,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../install-info.8:205
+#: install-info.8:205
 msgid ""
 "Causes B<install-info> to display its version and copyright information and "
 "exit."
@@ -9135,13 +9116,13 @@ msgstr ""
 "autorskich  i zakoñczy dzia³anie."
 
 # type: TP
-#: ../install-info.8:205
+#: install-info.8:205
 #, no-wrap
 msgid "B<--description=>I<xxx>"
 msgstr "B<--description=>I<xxx>"
 
 # type: Plain text
-#: ../install-info.8:212
+#: install-info.8:212
 msgid ""
 "Specifies that the description to use after the menu entry in new or updated "
 "entries be I<xxx>.  The default is to use the the value specified in the "
@@ -9149,22 +9130,22 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:214
+#: install-info.8:214
 msgid "B<START-INFO-DIR-ENTRY>"
 msgstr "B<START-INFO-DIR-ENTRY>"
 
 # type: Plain text
-#: ../install-info.8:216
+#: install-info.8:216
 msgid "B<* Auto-PGP: (auto-pgp). PGP under GNU Emacs.>"
 msgstr "B<* Auto-PGP: (auto-pgp). PGP w GNU Emacsie.>"
 
 # type: Plain text
-#: ../install-info.8:218
+#: install-info.8:218
 msgid "B<END-INFO-DIR-ENTRY>"
 msgstr "B<END-INFO-DIR-ENTRY>"
 
 # type: Plain text
-#: ../install-info.8:227
+#: install-info.8:227
 msgid ""
 "If the entry found in the Info file itself extends across several lines, "
 "each giving a menu entry, the text found in the file is used verbatim. In "
@@ -9175,7 +9156,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:234
+#: install-info.8:234
 msgid ""
 "If there is no B<dir> entry in the file the program will try to find a "
 "paragraph early in the file starting B<this file documents>.  It will "
@@ -9183,25 +9164,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:236
+#: install-info.8:236
 msgid "It is an error for none of these methods to yield a description."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:240
+#: install-info.8:240
 msgid ""
 "If a description argument is given when B<--remove> is specified it is "
 "ignored and a warning is issued."
 msgstr ""
 
 # type: TP
-#: ../install-info.8:240
+#: install-info.8:240
 #, no-wrap
 msgid "B<--menuentry=>I<xxx>"
 msgstr "B<--menuentry=>I<xxx>"
 
 # type: Plain text
-#: ../install-info.8:249
+#: install-info.8:249
 msgid ""
 "Specifies that the entry in the menu should be I<xxx>.  The default is to "
 "use the the value specified in the Info file itself.  If this is not present "
@@ -9211,7 +9192,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:256
+#: install-info.8:256
 msgid ""
 "When removing entries the value of the B<--menuentry> option must match the "
 "actual menu entry field in the menu item to be removed (case not "
@@ -9220,20 +9201,20 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../install-info.8:256
+#: install-info.8:256
 #, no-wrap
 msgid "B<--keep-old>"
 msgstr "B<--keep-old>"
 
 # type: Plain text
-#: ../install-info.8:260
+#: install-info.8:260
 msgid ""
 "Inhibits the replacement of existing entries and the removal of empty "
 "sections."
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:264
+#: install-info.8:264
 msgid ""
 "If the file being installed already has an entry in the directory the old "
 "entry will be left alone instead of being replaced; the default is to "
@@ -9241,7 +9222,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ../install-info.8:269
+#: install-info.8:269
 msgid ""
 "If B<--remove> is specified B<--keep-old> will prevent the removal of the "
 "section heading which would otherwise happen if the section is made empty by "
@@ -9252,12 +9233,12 @@ msgstr ""
 "sta³a siê pusta."
 
 # type: Plain text
-#: ../install-info.8:272
+#: install-info.8:272
 msgid "Enables test mode, which inhibits the update of the directory file."
 msgstr "W³±cza tryb testowy, który powstrzymuje aktualizacjê pliku katalogu. "
 
 # type: Plain text
-#: ../install-info.8:276
+#: install-info.8:276
 msgid ""
 "Enables debugging mode, in which the results of some internal processing "
 "steps are shown."
@@ -9266,12 +9247,12 @@ msgstr ""
 "przetwarzania."
 
 # type: Plain text
-#: ../install-info.8:281
+#: install-info.8:281
 msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
 msgstr "B<emacs>(1), B<info>(1), B<gzip(1).>"
 
 # type: Plain text
-#: ../install-info.8:287
+#: install-info.8:287
 msgid ""
 "Copyright 1994, Ian Jackson.  B<install-info> is free software; see the GNU "
 "General Public Licence version 2 or later for copying conditions. There is "
@@ -9283,26 +9264,26 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:1
+#: start-stop-daemon.8:1
 #, no-wrap
 msgid "start-stop-daemon"
 msgstr "start-stop-daemon"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:4
+#: start-stop-daemon.8:4
 msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr "start-stop-daemon - uruchamia i zatrzymuje demony systemowe"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:9
+#: start-stop-daemon.8:9
 msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr "B<start-stop-daemon> [I<opcje>] I<polecenie>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:17
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -9316,7 +9297,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:36
+#: start-stop-daemon.8:36
 msgid ""
 "Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
 "to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
@@ -9337,14 +9318,14 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:38
+#: start-stop-daemon.8:38
 #, no-wrap
 msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr "B<-S>, B<--start> [B<-->] I<argumenty>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:55
+#: start-stop-daemon.8:55
 msgid ""
 "Check for the existence of a specified process.  If such a process exists, "
 "B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
@@ -9361,14 +9342,14 @@ msgstr ""
 "opcji B<--> s± przekazywane do wykonywanego polecenia."
 
 # type: TP
-#: ../start-stop-daemon.8:55
+#: start-stop-daemon.8:55
 #, no-wrap
 msgid "B<-K>, B<--stop>"
 msgstr "B<-K>, B<--stop>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:73
+#: start-stop-daemon.8:73
 msgid ""
 "Checks for the existence of a specified process.  If such a process exists, "
 "B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
@@ -9385,36 +9366,36 @@ msgstr ""
 "zakoñczy³(y)."
 
 # type: TP
-#: ../start-stop-daemon.8:73
+#: start-stop-daemon.8:73
 #, no-wrap
 msgid "B<-H>, B<--help>"
 msgstr "B<-H>, B<--help>"
 
 # type: Plain text
-#: ../start-stop-daemon.8:76
+#: start-stop-daemon.8:76
 msgid "Show usage information and exit."
 msgstr "Wy¶wietla informacjê o u¿ytkowaniu programu i koñczy dzia³anie."
 
 # type: TP
-#: ../start-stop-daemon.8:76
+#: start-stop-daemon.8:76
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 # type: Plain text
-#: ../start-stop-daemon.8:79
+#: start-stop-daemon.8:79
 msgid "Show the program version and exit."
 msgstr "Wy¶wietla informacjê o wersji programu i koñczy dzia³anie."
 
 # type: TP
-#: ../start-stop-daemon.8:81
+#: start-stop-daemon.8:81
 #, no-wrap
 msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>, B<--exec> I<plik-wykonywalny>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:85
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -9423,26 +9404,26 @@ msgstr ""
 "opcji programu (sprawdzana jest zawarto¶æ B</proc/>I<pid>B</exe>)."
 
 # type: TP
-#: ../start-stop-daemon.8:85
+#: start-stop-daemon.8:85
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>, B<--pidfile> I<pid-file>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:89
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Sprawdzanie procesów, których pid jest podany w pliku I<plik-pid>."
 
 # type: TP
-#: ../start-stop-daemon.8:89
+#: start-stop-daemon.8:89
 #, no-wrap
 msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>, B<--user> I<username>|I<uid>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:95
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -9450,26 +9431,26 @@ msgstr ""
 "I<u¿ytkownik> lub numerze I<uid>."
 
 # type: TP
-#: ../start-stop-daemon.8:95
+#: start-stop-daemon.8:95
 #, no-wrap
 msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>, B<--group> I<group>|I<gid>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:98
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Podczas uruchamiania procesu zmienia grupê na I<grupê> lub I<gid>."
 
 # type: TP
-#: ../start-stop-daemon.8:98
+#: start-stop-daemon.8:98
 #, no-wrap
 msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>, B<--name> I<nazwa-procesu>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:104
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -9478,14 +9459,14 @@ msgstr ""
 "zawarto¶æ B</proc/>I<pid>B</stat>)."
 
 # type: TP
-#: ../start-stop-daemon.8:104
+#: start-stop-daemon.8:104
 #, no-wrap
 msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>, B<--signal> I<signal>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:109
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -9494,14 +9475,14 @@ msgstr ""
 "zatrzymywanego procesu (domy¶lnie jest to 15)."
 
 # type: TP
-#: ../start-stop-daemon.8:109
+#: start-stop-daemon.8:109
 #, no-wrap
 msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>, B<--retry> I<timeout>|I<schedule>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:119
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -9516,7 +9497,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:130
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -9528,7 +9509,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:146
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -9545,7 +9526,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:156
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -9557,14 +9538,14 @@ msgstr ""
 "ignorowany."
 
 # type: TP
-#: ../start-stop-daemon.8:156
+#: start-stop-daemon.8:156
 #, no-wrap
 msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>, B<--startas> I<nazwa-¶cie¿ki>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:164
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -9574,14 +9555,14 @@ msgstr ""
 "exec>."
 
 # type: TP
-#: ../start-stop-daemon.8:164
+#: start-stop-daemon.8:164
 #, no-wrap
 msgid "B<-t>, B<--test>"
 msgstr "B<-t>, B<--test>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:168
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -9590,40 +9571,40 @@ msgstr ""
 "odpowiedni kod b³êdu, ale opcja ta nie powoduje ¿adnych operacji."
 
 # type: TP
-#: ../start-stop-daemon.8:168
+#: start-stop-daemon.8:168
 #, no-wrap
 msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>, B<--oknodo>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:171
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Zwracany jest kod b³êdu 0, nawet gdyby operacja nie zakoñczy³a siê "
 "powodzeniem (zwróci³aby 1)."
 
 # type: TP
-#: ../start-stop-daemon.8:171
+#: start-stop-daemon.8:171
 #, no-wrap
 msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>, B<--quiet>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:174
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr "Nie s± wy¶wietlane ¿adne informacje oprócz komunikatów o b³êdach."
 
 # type: TP
-#: ../start-stop-daemon.8:174
+#: start-stop-daemon.8:174
 #, no-wrap
 msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c >,B< --chuid >I<u¿ytkownik>|I<uid>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:191
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -9642,14 +9623,14 @@ msgstr ""
 "dodawaniu procesowi cz³onkostwa grupy dla takich u¿ytkowników jak B<nobody>)."
 
 # type: TP
-#: ../start-stop-daemon.8:191
+#: start-stop-daemon.8:191
 #, no-wrap
 msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>, B<--chroot> I<root>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:197
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -9659,14 +9640,14 @@ msgstr ""
 "po wykonaniu chroot."
 
 # type: TP
-#: ../start-stop-daemon.8:197
+#: start-stop-daemon.8:197
 #, no-wrap
 msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>, B<--chdir> I<¶cie¿ka>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:205
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -9679,14 +9660,14 @@ msgstr ""
 "(root)."
 
 # type: TP
-#: ../start-stop-daemon.8:205
+#: start-stop-daemon.8:205
 #, no-wrap
 msgid "B<-b>, B<--background>"
 msgstr "B<-b>, B<--background>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:217
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -9706,38 +9687,38 @@ msgstr ""
 "kodu uruchamiaj±cego proces potomny."
 
 # type: TP
-#: ../start-stop-daemon.8:217
+#: start-stop-daemon.8:217
 #, no-wrap
 msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>, B<--nicelevel> I<liczba>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:220
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "Zmienia priorytet uruchamianego procesu."
 
 # type: TP
-#: ../start-stop-daemon.8:220
+#: start-stop-daemon.8:220
 #, no-wrap
 msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-k>, B<--umask> I<maska>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:223
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr "Ustawia maskê praw dostêpu (umask) procesu przed jego uruchomieniem."
 
 # type: TP
-#: ../start-stop-daemon.8:223
+#: start-stop-daemon.8:223
 #, no-wrap
 msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>, B<--make-pidfile>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:238
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -9757,20 +9738,20 @@ msgstr ""
 "opcj± B<--background>."
 
 # type: TP
-#: ../start-stop-daemon.8:238
+#: start-stop-daemon.8:238
 #, no-wrap
 msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>, B<--verbose>"
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:241
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "Wy¶wietlane s± dodatkowe komunikaty."
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:245
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -9781,7 +9762,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../start-stop-daemon.8:247
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -9790,13 +9771,13 @@ msgstr ""
 "Jackson."
 
 # type: Plain text
-#: ../update-alternatives.8:8
+#: update-alternatives.8:8
 #, no-wrap
 msgid "update-alternatives"
 msgstr "update-alternatives"
 
 # type: Plain text
-#: ../update-alternatives.8:11
+#: update-alternatives.8:11
 msgid ""
 "update-alternatives - maintain symbolic links determining default commands"
 msgstr ""
@@ -9804,12 +9785,12 @@ msgstr ""
 "domy¶lne polecenia"
 
 # type: Plain text
-#: ../update-alternatives.8:16
+#: update-alternatives.8:16
 msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr "B<update-alternatives> [I<opcje>] I<polecenie>"
 
 # type: Plain text
-#: ../update-alternatives.8:21
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -9818,7 +9799,7 @@ msgstr ""
 "linkach symbolicznych sk³adaj±cych siê na system alternatyw Debiana."
 
 # type: Plain text
-#: ../update-alternatives.8:29
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -9836,7 +9817,7 @@ msgstr ""
 "uruchomiæ, je¿eli u¿ytkownik nie okre¶li³ swoich preferencji co do edytora."
 
 # type: Plain text
-#: ../update-alternatives.8:51
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -9860,7 +9841,7 @@ msgstr ""
 "zmieni, chyba ¿e administrator ka¿e mu tak zrobiæ."
 
 # type: Plain text
-#: ../update-alternatives.8:61
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -9876,7 +9857,7 @@ msgstr ""
 "standard FHS wymienia powody, aby tak zrobiæ."
 
 # type: Plain text
-#: ../update-alternatives.8:73
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -9891,7 +9872,7 @@ msgstr ""
 "B<postinst> lub B<prerm> w pakietach Debiana."
 
 # type: Plain text
-#: ../update-alternatives.8:92
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -9911,7 +9892,7 @@ msgstr ""
 "I<linków>."
 
 # type: Plain text
-#: ../update-alternatives.8:100
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -9927,7 +9908,7 @@ msgstr ""
 "linków i zostawi wszystkie decyzje administratorowi systemu."
 
 # type: Plain text
-#: ../update-alternatives.8:109
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -9942,7 +9923,7 @@ msgstr ""
 "grupa ta automatycznie przejdzie w tryb rêczny."
 
 # type: Plain text
-#: ../update-alternatives.8:116
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -9953,7 +9934,7 @@ msgstr ""
 "priorytet."
 
 # type: Plain text
-#: ../update-alternatives.8:132
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -9972,7 +9953,7 @@ msgstr ""
 "Aby przywróciæ tryb automatyczny, nale¿y u¿yæ opcji I<--auto>."
 
 # type: Plain text
-#: ../update-alternatives.8:136
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
@@ -9980,7 +9961,7 @@ msgstr ""
 "Aby skonfigurowaæ nieinteraktywnie, mo¿na u¿yæ opcji I<--set> (patrz ni¿ej)."
 
 # type: Plain text
-#: ../update-alternatives.8:147
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -9989,13 +9970,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: ../update-alternatives.8:148
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIA"
 
 # type: Plain text
-#: ../update-alternatives.8:153
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -10004,13 +9985,13 @@ msgstr ""
 "wprowadzimy parê terminów, które pomog± je zrozumieæ."
 
 # type: TP
-#: ../update-alternatives.8:153
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr "nazwa ogólna"
 
 # type: Plain text
-#: ../update-alternatives.8:159
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
@@ -10019,13 +10000,13 @@ msgstr ""
 "do jednego z kilku plików o podobnej funkcjonalno¶ci."
 
 # type: TP
-#: ../update-alternatives.8:159
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr "link symboliczny"
 
 # type: Plain text
-#: ../update-alternatives.8:164
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -10035,13 +10016,13 @@ msgstr ""
 "katalogu alternatyw: ten, który administrator systemu powinien poprawiaæ."
 
 # type: TP
-#: ../update-alternatives.8:164
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr "alternatywa"
 
 # type: Plain text
-#: ../update-alternatives.8:168
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
@@ -10050,24 +10031,24 @@ msgstr ""
 "byæ dostêpny przez nazwê ogóln±."
 
 # type: TP
-#: ../update-alternatives.8:168
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr "katalog alternatyw"
 
 # type: Plain text
-#: ../update-alternatives.8:173
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr "Katalog zawieraj±cy linki symboliczne, domy¶lnie I</etc/alternatives>."
 
 # type: TP
-#: ../update-alternatives.8:173
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr "katalog administracyjny"
 
 # type: Plain text
-#: ../update-alternatives.8:180
+#: update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
@@ -10076,24 +10057,24 @@ msgstr ""
 "var/lib/dpkg/alternatives>."
 
 # type: TP
-#: ../update-alternatives.8:180
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr "grupa linków"
 
 # type: Plain text
-#: ../update-alternatives.8:183
+#: update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr "Zbiór powi±zanych linków, zarz±dzany jako grupa."
 
 # type: TP
-#: ../update-alternatives.8:183
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr "link g³ówny"
 
 # type: Plain text
-#: ../update-alternatives.8:187
+#: update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
@@ -10102,13 +10083,13 @@ msgstr ""
 "grupy."
 
 # type: TP
-#: ../update-alternatives.8:187
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr "link podrzêdny"
 
 # type: Plain text
-#: ../update-alternatives.8:191
+#: update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
 msgstr ""
@@ -10116,13 +10097,13 @@ msgstr ""
 "g³ównego."
 
 # type: TP
-#: ../update-alternatives.8:191
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr "tryb automatyczny"
 
 # type: Plain text
-#: ../update-alternatives.8:197
+#: update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -10132,13 +10113,13 @@ msgstr ""
 "¿e linki tej grupy wskazuj± na alternatywê o najwy¿szym priorytecie."
 
 # type: TP
-#: ../update-alternatives.8:197
+#: update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr "tryb rêczny"
 
 # type: Plain text
-#: ../update-alternatives.8:202
+#: update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
@@ -10147,13 +10128,13 @@ msgstr ""
 "ustawieniach administratora systemu."
 
 # type: TP
-#: ../update-alternatives.8:204
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr "B<--install> I<nazwa-ogólna symlink altern priorytet> [B<--slave> I<nazwa-ogólna symlink altern>] ..."
 
 # type: Plain text
-#: ../update-alternatives.8:219
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -10172,7 +10153,7 @@ msgstr ""
 "trzy argumenty."
 
 # type: Plain text
-#: ../update-alternatives.8:230
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -10191,13 +10172,13 @@ msgstr ""
 "zaktualizowane tak, ¿eby prowadzi³y do nowo dodanej alternatywy."
 
 # type: TP
-#: ../update-alternatives.8:230
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr "B<--set> I<nazwa ¶cie¿ka>"
 
 # type: Plain text
-#: ../update-alternatives.8:239
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
@@ -10207,13 +10188,13 @@ msgstr ""
 "config>."
 
 # type: TP
-#: ../update-alternatives.8:239
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nazwa ¶cie¿ka>"
 
 # type: Plain text
-#: ../update-alternatives.8:259
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -10235,13 +10216,13 @@ msgstr ""
 "informacja o alternatywie."
 
 # type: TP
-#: ../update-alternatives.8:259
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--remove-all> I<nazwa>"
 
 # type: Plain text
-#: ../update-alternatives.8:264
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
@@ -10250,24 +10231,24 @@ msgstr ""
 "podrzêdne. I<nazwa> jest nazw± w katalogu alternatyw."
 
 # type: TP
-#: ../update-alternatives.8:264
+#: update-alternatives.8:264
 #, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
 # type: Plain text
-#: ../update-alternatives.8:267
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr "Wywo³uje B<--config> dla wszystkich alternatyw."
 
 # type: TP
-#: ../update-alternatives.8:267
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto> I<link>"
 
 # type: Plain text
-#: ../update-alternatives.8:274
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -10278,13 +10259,13 @@ msgstr ""
 "wskazywa³ na alternatywê o najwy¿szym priorytecie."
 
 # type: TP
-#: ../update-alternatives.8:274
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--display> I<link>"
 
 # type: Plain text
-#: ../update-alternatives.8:285
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -10299,24 +10280,24 @@ msgstr ""
 "zainstalowan± alternatywê o najwy¿szym priorytecie."
 
 # type: TP
-#: ../update-alternatives.8:285
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--list> I<link>"
 
 # type: Plain text
-#: ../update-alternatives.8:288
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr "Wy¶wietla wszystkie cele w grupie linków."
 
 # type: TP
-#: ../update-alternatives.8:288
+#: update-alternatives.8:288
 #, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--config> I<link>"
 
 # type: Plain text
-#: ../update-alternatives.8:295
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -10327,39 +10308,39 @@ msgstr ""
 "zaktualizowana, a tryb I<automatyczny> zostanie wy³±czony."
 
 # type: TP
-#: ../update-alternatives.8:303
+#: update-alternatives.8:303
 #, no-wrap
 msgid "B<--altdir>I< directory>"
 msgstr "B<--altdir>I< katalog>"
 
 # type: Plain text
-#: ../update-alternatives.8:307
+#: update-alternatives.8:307
 msgid ""
 "Specifies the alternatives directory, when this is to be different from the "
 "default."
 msgstr "Okre¶la katalog alternatyw, je¿eli ma byæ inny ni¿ domy¶lny."
 
 # type: Plain text
-#: ../update-alternatives.8:311
+#: update-alternatives.8:311
 msgid ""
 "Specifies the administrative directory, when this is to be different from "
 "the default."
 msgstr "Okre¶la katalog administracyjny, je¿eli ma byæ inny ni¿ domy¶lny."
 
 # type: TP
-#: ../update-alternatives.8:311
+#: update-alternatives.8:311
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 # type: Plain text
-#: ../update-alternatives.8:316
+#: update-alternatives.8:316
 msgid "Generate more comments about what B<update-alternatives> is doing."
 msgstr ""
 "Podaje wiêcej informacji o przebiegu wykonywania B<update-alternatives>."
 
 # type: Plain text
-#: ../update-alternatives.8:320
+#: update-alternatives.8:320
 msgid ""
 "Don't generate any comments unless errors occur.  This option is not yet "
 "implemented."
@@ -10368,7 +10349,7 @@ msgstr ""
 "niezaimplementowana."
 
 # type: Plain text
-#: ../update-alternatives.8:324
+#: update-alternatives.8:324
 msgid ""
 "Don't actually do anything, just say what would be done.  This option is not "
 "yet implemented."
@@ -10377,50 +10358,50 @@ msgstr ""
 "niezaimplementowana."
 
 # type: TP
-#: ../update-alternatives.8:326
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: ../update-alternatives.8:332
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr "Domy¶lny katalog alternatyw. Mo¿na go zmieniæ opcj± B<-altdir>."
 
 # type: TP
-#: ../update-alternatives.8:332
+#: update-alternatives.8:332
 #, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: ../update-alternatives.8:338
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
 msgstr "Domy¶lny katalog administracyjny. Mo¿na go zmieniæ opcj± B<-admindir>."
 
 # type: IP
-#: ../update-alternatives.8:340
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: ../update-alternatives.8:342
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr "Akcja zakoñczy³a siê powodzeniem."
 
 # type: IP
-#: ../update-alternatives.8:342
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: ../update-alternatives.8:345
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
@@ -10428,7 +10409,7 @@ msgstr ""
 "Wyst±pi³y problemy podczas przetwarzania linii poleceñ lub wykonywania akcji."
 
 # type: Plain text
-#: ../update-alternatives.8:355
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -10443,7 +10424,7 @@ msgstr ""
 "wyja¶niaæ, je¿eli nie jest taka, proszê zg³osiæ to jako b³±d."
 
 # type: Plain text
-#: ../update-alternatives.8:361
+#: update-alternatives.8:361
 msgid ""
 "There are several packages which provide a text editor compatible with "
 "B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
@@ -10456,7 +10437,7 @@ msgstr ""
 "samego programu i skojarzonych stron podrêcznika."
 
 # type: Plain text
-#: ../update-alternatives.8:364
+#: update-alternatives.8:364
 msgid ""
 "To display the available packages which provide B<vi> and the current "
 "setting for it, use the I<--display> action:"
@@ -10465,12 +10446,12 @@ msgstr ""
 "bie¿±ce ustawienie, nale¿y u¿yæ akcji I<--display>:"
 
 # type: Plain text
-#: ../update-alternatives.8:367
+#: update-alternatives.8:367
 msgid "B<update-alternatives --display vi>"
 msgstr "B<update-alternatives --display vi>"
 
 # type: Plain text
-#: ../update-alternatives.8:371
+#: update-alternatives.8:371
 msgid ""
 "To choose a particular B<vi> implementation, use this command as root and "
 "then select a number from the list:"
@@ -10479,12 +10460,12 @@ msgstr ""
 "jako u¿ytkownik root i wybraæ liczbê z listy:"
 
 # type: Plain text
-#: ../update-alternatives.8:374
+#: update-alternatives.8:374
 msgid "B<update-alternatives --config vi>"
 msgstr "B<update-alternatives --config vi>"
 
 # type: Plain text
-#: ../update-alternatives.8:378
+#: update-alternatives.8:378
 msgid ""
 "To go back to having the B<vi> implementation chosen automatically, do this "
 "as root:"
@@ -10493,12 +10474,12 @@ msgstr ""
 "jako u¿ytkownik root wykonaæ:"
 
 # type: Plain text
-#: ../update-alternatives.8:381
+#: update-alternatives.8:381
 msgid "B<update-alternatives --auto vi>"
 msgstr "B<update-alternatives --auto vi>"
 
 # type: Plain text
-#: ../update-alternatives.8:386
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
@@ -10508,7 +10489,7 @@ msgstr ""
 "bezpo¶redniego e-maila do autora."
 
 # type: Plain text
-#: ../update-alternatives.8:391
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -10519,7 +10500,7 @@ msgstr ""
 "znalezienia jakichkolwiek rozbie¿no¶ci, prosimy o ich zg³oszenie."
 
 # type: Plain text
-#: ../update-alternatives.8:396
+#: update-alternatives.8:396
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
 "software; see the GNU General Public Licence version 2 or later for copying "
@@ -10530,7 +10511,7 @@ msgstr ""
 "by dowiedzieæ siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
 # type: Plain text
-#: ../update-alternatives.8:400
+#: update-alternatives.8:400
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
 "documentation; see the GNU General Public Licence version 2 or later for "
@@ -10542,7 +10523,7 @@ msgstr ""
 "warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji."
 
 # type: Plain text
-#: ../update-alternatives.8:402
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
@@ -10551,7 +10532,7 @@ msgstr ""
 "licenses/GPL."
 
 # type: Plain text
-#: ../update-alternatives.8:405
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 5fdcd425..85e8a817 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -15,157 +15,173 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: TH
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr ""
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2
 #, fuzzy, no-wrap
-msgid "2006-02-28"
+msgid "2007-01-24"
 msgstr "2006-04-09"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Projeto Debian"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "utilitários dpkg"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NOME"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr ""
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "RESUMO"
 
 # type: TP
-#: 822-date.1:9
+#: 822-date.1:8
 #, fuzzy
 msgid "B<822-date>"
 msgstr "B<--test>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIÇÃO"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
+msgstr ""
+
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
 msgstr ""
 
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPÇÕES"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr ""
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, fuzzy, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr ""
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr ""
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
-msgstr ""
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, fuzzy, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
 
 # type: TH
@@ -174,20 +190,28 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -196,21 +220,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -219,87 +243,101 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, fuzzy, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr ""
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, fuzzy, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--quiet>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, fuzzy, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+msgid "Show the usage message and exit."
+msgstr ""
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+msgid "Show the version and exit."
 msgstr ""
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ARQUIVOS"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -315,6 +353,13 @@ msgstr ""
 msgid "deb"
 msgstr ""
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, fuzzy, no-wrap
+msgid "2006-02-28"
+msgstr "2006-04-09"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, fuzzy, no-wrap
@@ -856,5462 +901,5539 @@ msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr ""
 
 # type: TH
-#: dpkg.1:1
+#: deb-override.5:16
 #, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+msgid "deb-override"
+msgstr ""
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "2007-03-07"
 msgstr "2006-04-09"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "dpkg suite"
-
 # type: Plain text
-#: dpkg.1:4
-#, fuzzy
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - um gerenciador de pacotes de nível médio para o Debian"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<opções>] I<ação>"
-
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "ATENÇÃO"
+#: deb-override.5:22
+msgid "override"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:13
-#, fuzzy
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
-"Este manual é elaborado para usuários que desejam compreender as opções da "
-"linha de comando do B<dpkg> e estados de pacotes em mais detalhes que os "
-"providos por B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:18
-#, fuzzy
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
-"Ele I<não> deve ser usado por mantenedores de pacotes que desejam "
-"compreender como o B<dpkg> instalará seus pacotes. As descrições do que o "
-"B<dpkg> faz quando está instalando e removendo pacotes são particularmente "
-"inadequadas. Para informações detalhadas a esse respeito, por favor, refira-"
-"se ao tópico I<Package Management System> do I<debian-faq> no sistema GNU "
-"Info. Para infomações sobre a criação de pacotes Debian, veja o tópico "
-"I<Debian Package Management Tools> no mesmo documento."
 
 # type: Plain text
-#: dpkg.1:26
-#, fuzzy
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr ""
-"B<dpkg> é uma ferramenta de nível médio para instalar, criar, remover e "
-"gerenciar pacotes Debian. O front-end primário e mais amigável para o "
-"B<dpkg> é o B<dselect>(8). O próprio B<dpkg> é controlado inteiramente "
-"através de parâmetros de linha de comando, que consistem exatamente de uma "
-"ação e zero ou mais opções. A ação-parâmetro informa ao dpkg o que fazer e "
-"as opções controlam o comportamento da ação de alguma maneira."
 
 # type: Plain text
-#: dpkg.1:31
-#, fuzzy
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"O B<dpkg> pode também ser usado como front-end para o B<dpkg-deb>.  A seguir "
-"estão as ações do B<dpkg-deb>, e se forem encontradas, o B<dpkg> apenas "
-"executa o B<dpkg-deb> com os parâmetros dados a ele:"
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, e\n"
-"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
 msgstr ""
-"Por favor, refira-se a B<dpkg-deb>(1) para informações sobre essas ações."
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "INFORMAÇÃO SOBRE PACOTES"
 
 # type: Plain text
-#: dpkg.1:48
-#, fuzzy
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"O B<dpkg> mantém algumas informações sobre os pacotes disponíveis. As "
-"informações são divididas em três grupos: B<estados>, B<estados de seleção> "
-"e B<sinalizadores>.  Esses valores são alterados principalmente com o "
-"B<dselect>."
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "ESTADOS DOS PACOTES"
+# type: Plain text
+#: deb-override.5:70
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr ""
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
-msgstr "B<installed>"
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-04-09"
 
 # type: Plain text
-#: dpkg.1:52
-#, fuzzy
-msgid "The package is unpacked and configured OK."
-msgstr "O pacote está instalado e configurado."
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<half-installed>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
-#, fuzzy
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"A instalação do pacote foi iniciada, mas não completada por alguma razão."
-
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "O pacote não está instalado em seu sistema."
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
 
 # type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<unpacked>"
-
-# type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "O pacote está descompactado, mas não configurado."
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-deb-actions>"
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<half-configured>"
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:66
-#, fuzzy
-msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
-"O pacote está descompactado e sua configuração começou, mas não foi "
-"completada por alguma razão."
 
 # type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
-msgstr "B<config-files>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "Existem apenas os arquivos de configuração em seu sistema."
-
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "ESTADOS DE SELEÇÃO DOS PACOTES"
-
-# type: TP
-#: dpkg.1:70
-#, no-wrap
-msgid "B<install>"
-msgstr "B<install>"
+#: deb-substvars.5:20
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "O pacote está selecionado para instalação."
-
-# type: TP
-#: dpkg.1:73
-#, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstall>"
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:77
-#, fuzzy
+#: deb-substvars.5:34
 msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
 msgstr ""
-"O pacote está selecionado para desinstalação (i.e. queremos remover todos os "
-"arquivos, exceto os arquivos de configuração)."
-
-# type: TP
-#: dpkg.1:77
-#, no-wrap
-msgid "B<purge>"
-msgstr "B<purge>"
 
 # type: Plain text
-#: dpkg.1:81
-#, fuzzy
+#: deb-substvars.5:47
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
 msgstr ""
-"O pacote está selecionado para ser eliminado (i.e. queremos excluir tudo, "
-"até os arquivos de configuração)."
 
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "SINALIZADORES DOS PACOTES"
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:49
 #, no-wrap
-msgid "B<hold>"
-msgstr "B<hold>"
+msgid "B<Arch>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:86
-msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
 msgstr ""
-"Um pacote marcado como B<hold> não é manipulado pelo B<dpkg>, a menos que "
-"ele seja forçado a isso com a opção B<--force-hold>."
 
 # type: TP
-#: dpkg.1:86
-#, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<reinst-required>"
+#: deb-substvars.5:53
+#, fuzzy, no-wrap
+msgid "B<source:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:91
-#, fuzzy
-msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+#: deb-substvars.5:56
+msgid "The source package version."
 msgstr ""
-"Um pacote marcado como B<reinst-required> está quebrado e precisa ser "
-"reinstalado. Esses pacotes não podem ser removidos, a menos que isso seja "
-"forçado com a opção B<--force-reinstreq>."
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, no-wrap
-msgid "ACTIONS"
-msgstr "AÇÕES"
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+msgid "B<source:Upstream-Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:97
-#, fuzzy
+#: deb-substvars.5:60
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"Instala o pacote. Se a opção B<--recursive> ou B<-R> for especificada, "
-"I<arquivo_do_pacote> precisa se referir a um diretório."
 
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "A instalação consiste dos seguintes passos:"
+# type: TP
+#: deb-substvars.5:60
+#, fuzzy, no-wrap
+msgid "B<binary:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
+#: deb-substvars.5:64
+msgid ""
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:64
+#, fuzzy, no-wrap
+msgid "B<Source-Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:106
-#, fuzzy
+#: deb-substvars.5:69
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"B<2.> Se outra versão do mesmo pacote foi instalada antes da nova "
-"instalação, é executado o script I<prerm> do pacote antigo."
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> O script I<preinst>, se houver no pacote, é executado."
+# type: TP
+#: deb-substvars.5:69
+#, fuzzy, no-wrap
+msgid "B<Installed-Size>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:113
-#, fuzzy
+#: deb-substvars.5:78
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:78
+#, no-wrap
+msgid "B<Extra-Size>"
 msgstr ""
-"B<4.> Os novos arquivos são descompactados, e ao mesmo tempo é feita uma "
-"cópia de segurança dos antigos, de forma que se algo sair errado, eles podem "
-"ser restaurados."
 
 # type: Plain text
-#: dpkg.1:120
-#, fuzzy
+#: deb-substvars.5:87
 msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"B<5.> Se estava instalada uma outra versão do mesmo pacote antes da nova "
-"instalação, o script I<postrm> do pacote antigo é executado. Note que esse "
-"script é executado depois do script I<preinst> do pacote novo, porque os "
-"novos arquivos são gravados ao mesmo tempo que os antigos são removidos."
+
+# type: TP
+#: deb-substvars.5:87
+#, fuzzy, no-wrap
+msgid "B<F:>I<fieldname>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg.1:124
-#, fuzzy
+#: deb-substvars.5:94
 msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
-"B<6.> O pacote é configurado. Veja B<--configure> para informações "
-"detalhadas sobre como isso é feito."
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:94
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<arquivo_do_pacote> ..."
+msgid "B<Format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
-#, fuzzy
+#: deb-substvars.5:104
 msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"Descompacta o pacote, mas não o configura. Se a opção B<--recursive> ou B<-"
-"R> for especificada, I<arquivo_do_pacote> precisa então se referir a um "
-"diretório."
 
 # type: TP
-#: dpkg.1:129
+#: deb-substvars.5:104
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
+msgid "B<Newline>, B<Space>, B<Tab>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:134
-#, fuzzy
-msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"Reconfigura um pacote descompactado.  Se for especificada a opção B<-a> ou "
-"B<--pending> ao invés de I<pacote>, todos os pacotes descompactados mas não "
-"configurados são configurados."
 
-# type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
-msgstr "A configuração consiste dos seguintes passos:"
+# type: TP
+#: deb-substvars.5:107
+#, no-wrap
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:141
-#, fuzzy
+#: deb-substvars.5:111
 msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"B<1.> Os arquivos de configuração são descompactados, e ao mesmo tempo é "
-"feita uma cópia de segurança dos arquivos de configuração antigos, de forma "
-"que podem ser restaurados se algo sair errado."
+
+# type: TP
+#: deb-substvars.5:111
+#, fuzzy, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:144
-#, fuzzy
-msgid "B<2.> Run I<postinst> script, if provided by the package."
-msgstr "B<2.> O script I<postinst>, se existir no pacote, é executado."
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
+msgstr ""
 
 # type: TP
-#: dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<pacote> ... | B<-a> | B<--pending>"
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:155
-#, fuzzy
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:120
 msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
-"Remove um pacote instalado.  B<-r> ou B<--remove> remove tudo, exceto os "
-"arquivos de configuração.  Isso pode evitar a necessidade de reconfigurar o "
-"pacote se ele for reinstalado depois. (os arquivos de configuração são os "
-"listados no arquivo de controle I<debian/conffiles>). B<-P> ou B<--purge> "
-"remove tudo, incluindo os arquivos de configuração. Se for dada a opção B<-"
-"a> ou B<--pending> ao invés do nome do pacote, então todos os pacotes "
-"descompactados, mas marcados para serem removidos ou eliminados (purge)  no "
-"arquivo I</var/lib/dpkg/status>, são removidos ou eliminados (purge) "
-"respectivamente."
-
-# type: Plain text
-#: dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
-msgstr "A remoção de um pacote consiste dos seguintes passos:"
 
-# type: Plain text
-#: dpkg.1:160
-#, fuzzy
-msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> O script I<prerm> é executado."
+# type: TP
+#: deb-substvars.5:122
+#, fuzzy, no-wrap
+msgid "B<debian/substvars>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:163
+#: deb-substvars.5:125
 #, fuzzy
-msgid "B<2.> Remove the installed files"
-msgstr "B<2.> Os arquivos instalados são removidos."
+msgid "List of substitution variables and values."
+msgstr "Lista dos pacotes disponíveis."
 
 # type: Plain text
-#: dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> O script I<postrm> é executado."
-
-# type: TP
-#: dpkg.1:167
-#, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr "B<dpkg --update-avail> | B<--merge-avail> I<arquivo-Packages>"
+#: deb-substvars.5:129 dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:176
+#: deb-substvars.5:136
 #, fuzzy
 msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
 msgstr ""
-"Atualiza a idéia do B<dpkg> e do B<dselect> de quais pacotes estão "
-"disponíveis. Com a ação B<--merge-avail>, as informações antigas são "
-"combinadas as informações do I<arquivo-Packages>.  Com a ação B<--update-"
-"avail>, as informações antigas são substituídas pelas do I<arquivo-"
-"Packages>. O I<arquivo-Packages> distribuído com o Debian é simplesmente "
-"nomeado I<Packages>. O B<dpkg> mantém seu registro dos pacotes disponíveis "
-"em I</var/lib/dpkg/available>."
+"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
+"reconfigure>(8)"
 
 # type: Plain text
-#: dpkg.1:179
-msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
 msgstr ""
 
-# type: TP
-#: dpkg.1:179
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
 #, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
+msgid "COPYRIGHT"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:185
-#, fuzzy
-msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
-"Atualiza a idéia do B<dpkg> e do B<dselect> de quais pacotes estão "
-"disponíveis com as informações do pacote I<arquivo_do_pacote>. Se a opção "
-"B<--recursive> ou B<-R> for especificada, então I<arquivo_do_pacote> deve se "
-"referir a um diretório."
 
-# type: TP
-#: dpkg.1:185
-#, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
-msgstr "B<dpkg --forget-old-unavail>"
+# type: Plain text
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:188
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
 #, fuzzy
-msgid "Forget about uninstalled unavailable packages."
-msgstr "Despreza informações sobre pacotes não instalados e não disponíveis."
+msgid ""
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
+msgstr ""
+"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+"condições de cópia. NÂO existe garantia."
 
-# type: TP
-#: dpkg.1:188
+# type: TH
+#: dpkg.1:1
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr "B<dpkg --clear-avail>"
+msgid "dpkg"
+msgstr "dpkg"
 
-# type: Plain text
-#: dpkg.1:191
-#, fuzzy
-msgid "Erase the existing information about what packages are available."
-msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
+msgstr "2006-04-09"
 
-# type: TP
-#: dpkg.1:191
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+msgid "dpkg suite"
+msgstr "dpkg suite"
 
 # type: Plain text
-#: dpkg.1:196
+#: dpkg.1:4
 #, fuzzy
-msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
-msgstr ""
-"Procura por pacotes que foram apenas parcialmente instalados em seu sistema. "
-"O B<dpkg> sugerirá o que fazer com eles para que funcionem."
-
-# type: TP
-#: dpkg.1:196
-#, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<padrão>...]"
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - um gerenciador de pacotes de nível médio para o Debian"
 
 # type: Plain text
-#: dpkg.1:200
-#, fuzzy
-msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
-msgstr "Obtém uma lista de seleção de pacotes e a escreve em stdout."
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
-# type: TP
-#: dpkg.1:200
+# type: SH
+#: dpkg.1:9
 #, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr "B<dpkg --set-selections>"
+msgid "WARNING"
+msgstr "ATENÇÃO"
 
 # type: Plain text
-#: dpkg.1:206
+#: dpkg.1:13
 #, fuzzy
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
-msgstr "Configura as seleções de pacotes usando o arquivo lido de stdin."
-
-# type: TP
-#: dpkg.1:206
-#, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr "B<dpkg --set-selections>"
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
+msgstr ""
+"Este manual é elaborado para usuários que desejam compreender as opções da "
+"linha de comando do B<dpkg> e estados de pacotes em mais detalhes que os "
+"providos por B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:211
+#: dpkg.1:18
+#, fuzzy
 msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
-
-# type: TP
-#: dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr "B<dpkg --yet-to-unpack>"
+"Ele I<não> deve ser usado por mantenedores de pacotes que desejam "
+"compreender como o B<dpkg> instalará seus pacotes. As descrições do que o "
+"B<dpkg> faz quando está instalando e removendo pacotes são particularmente "
+"inadequadas. Para informações detalhadas a esse respeito, por favor, refira-"
+"se ao tópico I<Package Management System> do I<debian-faq> no sistema GNU "
+"Info. Para infomações sobre a criação de pacotes Debian, veja o tópico "
+"I<Debian Package Management Tools> no mesmo documento."
 
 # type: Plain text
-#: dpkg.1:215
+#: dpkg.1:26
 #, fuzzy
 msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
 msgstr ""
-"Procura pacotes que foram selecionados para instalação, mas por alguma razão "
-"ainda não foram instalados."
-
-# type: TP
-#: dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr "B<dpkg --print-architecture>"
+"B<dpkg> é uma ferramenta de nível médio para instalar, criar, remover e "
+"gerenciar pacotes Debian. O front-end primário e mais amigável para o "
+"B<dpkg> é o B<dselect>(8). O próprio B<dpkg> é controlado inteiramente "
+"através de parâmetros de linha de comando, que consistem exatamente de uma "
+"ação e zero ou mais opções. A ação-parâmetro informa ao dpkg o que fazer e "
+"as opções controlam o comportamento da ação de alguma maneira."
 
 # type: Plain text
-#: dpkg.1:219
+#: dpkg.1:31
 #, fuzzy
 msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
-"Mostra a arquitetura alvo (por exemplo, \"i386\").  Essa opção usa o B<gcc>."
-
-# type: TP
-#: dpkg.1:219
-#, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
-msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
+"O B<dpkg> pode também ser usado como front-end para o B<dpkg-deb>.  A seguir "
+"estão as ações do B<dpkg-deb>, e se forem encontradas, o B<dpkg> apenas "
+"executa o B<dpkg-deb> com os parâmetros dados a ele:"
 
 # type: Plain text
-#: dpkg.1:230
-#, fuzzy
+#: dpkg.1:40
+#, no-wrap
 msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 msgstr ""
-"Compara números de versão, onde I<op> é um operador binário. O B<dpkg> "
-"retorna com successo (resultado zero) se a condição especificada for "
-"satisfeita e com falha (resultado não nulo) em caso contrário. Há dois "
-"grupos de operadores, que diferem em como tratam a falta de I<ver1> ou "
-"I<ver2>.  Esses tratam a falta de uma versão como anterior a qualquer outra: "
-"B<lt le eq ne ge gt>.  Esses tratam a falta de uma versão como posterior a "
-"qualquer outra: B<lt-nl le-nl ge-nl gt-nl>.  Esses são providos apenas para "
-"manter compatibilidade com a sintaxe do arquivo de controle: B<E<lt> "
-"E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, e\n"
+"    B<--fsys-tarfile>.\n"
 
-# type: TP
-#: dpkg.1:230
+# type: Plain text
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr ""
+"Por favor, refira-se a B<dpkg-deb>(1) para informações sobre essas ações."
+
+# type: SH
+#: dpkg.1:43
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "INFORMAÇÃO SOBRE PACOTES"
 
 # type: Plain text
-#: dpkg.1:235
+#: dpkg.1:48
 #, fuzzy
 msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"Aceita uma série de comandos no descritor de arquivo de entrada "
-"B<E<lt>nE<gt>>.  Nota: opções adicionais configuradas na linha de comando, e "
-"através do descritor de arquivo, não são redefinidas para comandos "
-"subseqüentes usados durante a mesma execução."
+"O B<dpkg> mantém algumas informações sobre os pacotes disponíveis. As "
+"informações são divididas em três grupos: B<estados>, B<estados de seleção> "
+"e B<sinalizadores>.  Esses valores são alterados principalmente com o "
+"B<dselect>."
 
-# type: TP
-#: dpkg.1:235
+# type: SS
+#: dpkg.1:48
 #, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
-
-# type: Plain text
-#: dpkg.1:238
-msgid "Display a brief help message."
-msgstr "Exibe uma breve mensagem de ajuda."
+msgid "PACKAGE STATES"
+msgstr "ESTADOS DOS PACOTES"
 
 # type: TP
-#: dpkg.1:238
+#: dpkg.1:49
 #, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr "B<dpkg --force-help>"
+msgid "B<installed>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
-msgstr "Ajuda com as opções B<--force->I<coisa>."
+#: dpkg.1:52
+#, fuzzy
+msgid "The package is unpacked and configured OK."
+msgstr "O pacote está instalado e configurado."
 
 # type: TP
-#: dpkg.1:241
+#: dpkg.1:52
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<half-installed>"
+msgstr "B<half-installed>"
 
 # type: Plain text
-#: dpkg.1:244
+#: dpkg.1:56
 #, fuzzy
-msgid "Give help about debugging options."
-msgstr "Ajuda com as opções de depuração."
+msgid ""
+"The installation of the package has been started, but not completed for some "
+"reason."
+msgstr ""
+"A instalação do pacote foi iniciada, mas não completada por alguma razão."
 
 # type: TP
-#: dpkg.1:244
+#: dpkg.1:56
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<not-installed>"
+msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:247
-msgid "Display B<dpkg> licence."
-msgstr "Exibe a licença do B<dpkg>."
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "O pacote não está instalado em seu sistema."
 
 # type: TP
-#: dpkg.1:247
+#: dpkg.1:59
 #, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
+msgid "B<unpacked>"
+msgstr "B<unpacked>"
 
 # type: Plain text
-#: dpkg.1:250
-msgid "Display B<dpkg> version information."
-msgstr "Exibe informação sobre a versão do B<dpkg>."
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "O pacote está descompactado, mas não configurado."
 
 # type: TP
-#: dpkg.1:250
-#, fuzzy, no-wrap
-msgid "B<dpkg-deb actions>"
-msgstr "B<dpkg-deb-actions>"
+#: dpkg.1:62
+#, no-wrap
+msgid "B<half-configured>"
+msgstr "B<half-configured>"
 
 # type: Plain text
-#: dpkg.1:253
+#: dpkg.1:66
 #, fuzzy
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
-msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
-
-# type: Plain text
-#: dpkg.1:273
-#, fuzzy, no-wrap
 msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
 msgstr ""
-"B<dpkg -b> | B<--build> I<diretório> [I<nome_de_arquivo>]\n"
-"    Cria um pacote deb.\n"
-"B<dpkg -c> | B<--contents> I<nome_de_arquivo>\n"
-"    Lista o conteúdo de um pacote deb.\n"
-"B<dpkg -e> | B<--control> I<nome_de_arquivo> [I<diretório>]\n"
-"    Extrai informação de controle de um pacote.\n"
-"B<dpkg -x> | B<--extract> I<nome_de_arquivo diretório>\n"
-"    Extrai os arquivos contidos pelo pacote.\n"
-"B<dpkg -f> | B<--field>  I<nome_de_arquivo> [I<campo-de-controle>] ...\n"
-"    Exibe o(s) campo(s) de controle do pacote.\n"
-"B<dpkg --fsys-tarfile> I<nome_de_arquivo>\n"
-"    Exibe o sistema de arquivo do arquivo tar contido no pacote Debian. \n"
-"B<dpkg -I> | B<--info> I<nome_de_arquivo> [I<arquivo-de-controle>]\n"
-"    Mostra informação sobre um pacote.\n"
-"B<dpkg -X> | B<--vextract> I<nome_de_arquivo> I<diretório>\n"
-"    Extrai e exibe os nomes de arquivos contidos em um pacote.\n"
+"O pacote está descompactado e sua configuração começou, mas não foi "
+"completada por alguma razão."
 
 # type: TP
-#: dpkg.1:275
-#, fuzzy, no-wrap
-msgid "B<dpkg-query actions>"
-msgstr "B<dpkg-query-actions>"
-
-# type: Plain text
-#: dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
-msgstr ""
+#: dpkg.1:66
+#, no-wrap
+msgid "B<config-files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg.1:291
-#, fuzzy, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
-msgstr ""
-"B<dpkg -l> | B<--list> I<padrão-do-nome-do-pacote> ...    Lista os pacotes que combinam com o padrão dado.\n"
-"B<dpkg -s> | B<--status> I<nome-do-pacote> ...\n"
-"    Exibe o estado do pacote especificado. Isso apenas mostra a entrada na base de dados dos pacotes instalados.\n"
-"B<dpkg -L> | B<--listfiles> I<pacote> ...\n"
-"    Lista os arquivos instalados em seu sistema a partir do B<pacote>.\n"
-"B<dpkg -S> | B<--search> I<padrão-de-procura> ...\n"
-"    Procura por um nome de arquivo a partir dos pacotes instalados. Todos os caracteres curinga padrões de shell podem ser usados no padrão.\n"
-"B<dpkg  -p|--print-avail >I<pacote>\n"
-"    Exibe detalhes sobre o I<pacote>, como encontrados em I</var/lib/dpkg/available>.\n"
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "Existem apenas os arquivos de configuração em seu sistema."
 
-# type: Plain text
-#: dpkg.1:298
-#, fuzzy
-msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
-msgstr ""
-"Todas as opções podem ser especificadas tanto na linha de comando quanto no "
-"arquivo de configuração do B<dpkg> chamado I</etc/dpkg/dpkg.cfg>. Cada linha "
-"no arquivo de configuração é uma opção (exatamente a mesma opção da linha de "
-"comando, mas sem os hífens)  ou um comentário (se começar com uma B<#>)."
+# type: SS
+#: dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "ESTADOS DE SELEÇÃO DOS PACOTES"
 
 # type: TP
-#: dpkg.1:299
+#: dpkg.1:70
 #, no-wrap
-msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<número>"
+msgid "B<install>"
+msgstr "B<install>"
 
 # type: Plain text
-#: dpkg.1:302
-#, fuzzy
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
-msgstr "Altera o número de erros após os quais o dpkg abortará. O padrão é 50."
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "O pacote está selecionado para instalação."
 
 # type: TP
-#: dpkg.1:302
+#: dpkg.1:73
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr "B<-B>|B<--auto-deconfigure>"
+msgid "B<deinstall>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:308
+#: dpkg.1:77
 #, fuzzy
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
-"Quando um pacote é removido, há a possibilidade de que outro pacote "
-"instalado dependa do que foi removido. Especificando essa opção, o pacote "
-"que depende do que foi removido será automaticamente desconfigurado."
+"O pacote está selecionado para desinstalação (i.e. queremos remover todos os "
+"arquivos, exceto os arquivos de configuração)."
 
 # type: TP
-#: dpkg.1:308
+#: dpkg.1:77
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<purge>"
+msgstr "B<purge>"
 
 # type: Plain text
-#: dpkg.1:314
+#: dpkg.1:81
 #, fuzzy
 msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
-"Ativa a depuração.  I<octal> é formado por uma operação \"or\" bit-a-bit "
-"entre os valores desejados da lista abaixo (note que esses valores podem ser "
-"alterados em versões futuras).  B<-Dh> ou B<--debug=help> exibe esses "
-"valores."
+"O pacote está selecionado para ser eliminado (i.e. queremos excluir tudo, "
+"até os arquivos de configuração)."
+
+# type: SS
+#: dpkg.1:81
+#, no-wrap
+msgid "PACKAGE FLAGS"
+msgstr "SINALIZADORES DOS PACOTES"
+
+# type: TP
+#: dpkg.1:82
+#, no-wrap
+msgid "B<hold>"
+msgstr "B<hold>"
 
 # type: Plain text
-#: dpkg.1:326
-#, fuzzy, no-wrap
+#: dpkg.1:86
 msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
-" número  descrição\n"
-"    1   Informação de progresso geralmente útil\n"
-"    2   Invocação e estado dos scripts do mantenedor\n"
-"   10   Saída de cada arquivo processado\n"
-"  100   Muita saída de cada arquivo processado\n"
-"   20   Saída de cada arquivo de configuração\n"
-"  200   Muita saída de cada arquivo de configuração\n"
-"   40   Dependências e conflitos\n"
-"  400   Muita saída de dependências/conflitos\n"
-" 1000   Muita tagarelice sobre por exemplo o diretório dpkg/info\n"
-" 2000   Quantidades insanas de saída.\n"
+"Um pacote marcado como B<hold> não é manipulado pelo B<dpkg>, a menos que "
+"ele seja forçado a isso com a opção B<--force-hold>."
 
 # type: TP
-#: dpkg.1:326
+#: dpkg.1:86
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-msgstr "B<--force->I<coisas> | B<--no-force->I<coisas> | B<--refuse->I<coisas>"
+msgid "B<reinst-required>"
+msgstr "B<reinst-required>"
 
 # type: Plain text
-#: dpkg.1:333
+#: dpkg.1:91
 #, fuzzy
 msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
-"Força ou rejeita (B<no-force> e B<refuse> são a mesma coisa)  a fazer "
-"algumas coisas.  I<coisas> é uma lista separada por vírgulas de coisas "
-"especificadas abaixo.  B<--force-help> exibe uma mensagem descrevendo-as.  "
-"Coisas marcadas com (*) são forçadas por padrão."
+"Um pacote marcado como B<reinst-required> está quebrado e precisa ser "
+"reinstalado. Esses pacotes não podem ser removidos, a menos que isso seja "
+"forçado com a opção B<--force-reinstreq>."
+
+# type: SH
+#: dpkg.1:92
+#, no-wrap
+msgid "ACTIONS"
+msgstr "AÇÕES"
+
+# type: TP
+#: dpkg.1:93
+#, no-wrap
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg.1:337
+#: dpkg.1:97
 #, fuzzy
 msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
-"I<Atenção: A maior parte dessas opções devem ser usadas apenas por experts. "
-"Usá-las sem o completo conhecimento de seus efeitos pode quebrar todo seu "
-"sistema.>"
+"Instala o pacote. Se a opção B<--recursive> ou B<-R> for especificada, "
+"I<arquivo_do_pacote> precisa se referir a um diretório."
 
 # type: Plain text
-#: dpkg.1:340
-#, fuzzy
-msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: Liga (ou desliga) todas as opções de força."
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "A instalação consiste dos seguintes passos:"
 
 # type: Plain text
-#: dpkg.1:343
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
+
+# type: Plain text
+#: dpkg.1:106
 #, fuzzy
 msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
-"B<downgrade>(*): Instala um pacote, mesmo se uma versão mais nova já estiver "
-"instalada."
+"B<2.> Se outra versão do mesmo pacote foi instalada antes da nova "
+"instalação, é executado o script I<prerm> do pacote antigo."
 
 # type: Plain text
-#: dpkg.1:350
-msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
-msgstr ""
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
+msgstr "B<3.> O script I<preinst>, se houver no pacote, é executado."
 
 # type: Plain text
-#: dpkg.1:354
+#: dpkg.1:113
 #, fuzzy
 msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
-"B<configure-any>: Configura também qualquer pacote descompactado de que o "
-"pacote atual dependa."
-
-# type: Plain text
-#: dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
-msgstr "B<hold>: Processa pacotes mesmo quando marcados com \"hold\"."
+"B<4.> Os novos arquivos são descompactados, e ao mesmo tempo é feita uma "
+"cópia de segurança dos antigos, de forma que se algo sair errado, eles podem "
+"ser restaurados."
 
 # type: Plain text
-#: dpkg.1:362
+#: dpkg.1:120
 #, fuzzy
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
-"B<remove-reinstreq>: Remove um pacote, mesmo se estiver quebrado e marcado "
-"como requer reinstalação. Isso pode, por exemplo, fazer com que partes do "
-"pacote permaneçam em seu sistema, que serão então esquecidas pelo B<dpkg>."
+"B<5.> Se estava instalada uma outra versão do mesmo pacote antes da nova "
+"instalação, o script I<postrm> do pacote antigo é executado. Note que esse "
+"script é executado depois do script I<preinst> do pacote novo, porque os "
+"novos arquivos são gravados ao mesmo tempo que os antigos são removidos."
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:124
 #, fuzzy
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
-"B<remove-essential>: Remove, mesmo se o pacote é considerado essencial. "
-"Pacotes essenciais contém geralmente comandos muito básicos de Unix. Removê-"
-"los pode causar a parada de funcionamento de todo o sistema, então use-a com "
-"cuidado."
+"B<6.> O pacote é configurado. Veja B<--configure> para informações "
+"detalhadas sobre como isso é feito."
 
-# type: Plain text
-#: dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Converte todos os problemas de dependência em avisos."
+# type: TP
+#: dpkg.1:124
+#, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<arquivo_do_pacote> ..."
 
 # type: Plain text
-#: dpkg.1:373
+#: dpkg.1:129
+#, fuzzy
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<depends-version>: Não verifica versões quando verificando dependências."
+"Descompacta o pacote, mas não o configura. Se a opção B<--recursive> ou B<-"
+"R> for especificada, I<arquivo_do_pacote> precisa então se referir a um "
+"diretório."
 
-# type: Plain text
-#: dpkg.1:377
-msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
-msgstr ""
-"B<conflicts>: Instala, mesmo se conflita com outro pacote. Isso é perigoso, "
-"pois geralmente causará a regravação de alguns arquivos."
+# type: TP
+#: dpkg.1:129
+#, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:382
+#: dpkg.1:134
 #, fuzzy
 msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
-"B<confmiss>: Sempre instala um arquivo de configuração que falta. Isso é "
-"perigoso, já que significa que uma mudança (remoção) feita ao arquivo não "
-"será preservada."
+"Reconfigura um pacote descompactado.  Se for especificada a opção B<-a> ou "
+"B<--pending> ao invés de I<pacote>, todos os pacotes descompactados mas não "
+"configurados são configurados."
 
 # type: Plain text
-#: dpkg.1:387
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
+msgstr "A configuração consiste dos seguintes passos:"
+
+# type: Plain text
+#: dpkg.1:141
 #, fuzzy
 msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
-"B<confnew>: Se um arquivo de configuração foi modificado, sempre instala a "
-"nova versão sem perguntar, a menos que B<--force-confdef> também seja "
-"especificada, quando a ação padrão é então preferida."
+"B<1.> Os arquivos de configuração são descompactados, e ao mesmo tempo é "
+"feita uma cópia de segurança dos arquivos de configuração antigos, de forma "
+"que podem ser restaurados se algo sair errado."
 
 # type: Plain text
-#: dpkg.1:392
+#: dpkg.1:144
 #, fuzzy
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
-msgstr ""
-"B<confold>: Se um arquivo de configuração foi modificado, sempre mantém a "
-"versão antiga sem perguntar, a menos que B<--force-confdef> também seja "
-"especificada, quando a ação padrão é então preferida."
+msgid "B<2.> Run I<postinst> script, if provided by the package."
+msgstr "B<2.> O script I<postinst>, se existir no pacote, é executado."
+
+# type: TP
+#: dpkg.1:144
+#, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<pacote> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:398
+#: dpkg.1:155
 #, fuzzy
 msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
-"B<confdef>: Se um arquivo de configuração foi modificado, sempre escolhe a "
-"ação padrão. Se não houver ação padrão, ele irá parar e perguntar ao "
-"usuário, a menos que B<--force-confnew> ou B<--force-confold> também tenham "
-"sido dadas, quando será então usado isso para decidir a ação final."
+"Remove um pacote instalado.  B<-r> ou B<--remove> remove tudo, exceto os "
+"arquivos de configuração.  Isso pode evitar a necessidade de reconfigurar o "
+"pacote se ele for reinstalado depois. (os arquivos de configuração são os "
+"listados no arquivo de controle I<debian/conffiles>). B<-P> ou B<--purge> "
+"remove tudo, incluindo os arquivos de configuração. Se for dada a opção B<-"
+"a> ou B<--pending> ao invés do nome do pacote, então todos os pacotes "
+"descompactados, mas marcados para serem removidos ou eliminados (purge)  no "
+"arquivo I</var/lib/dpkg/status>, são removidos ou eliminados (purge) "
+"respectivamente."
 
 # type: Plain text
-#: dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr "B<overwrite>: Sobrescreve um arquivo do pacote com arquivo de outro."
+#: dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
+msgstr "A remoção de um pacote consiste dos seguintes passos:"
 
 # type: Plain text
-#: dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
-msgstr ""
-"B<overwrite-dir> Sobrescreve um diretório do pacote com arquivo de outro."
+#: dpkg.1:160
+#, fuzzy
+msgid "B<1.> Run I<prerm> script"
+msgstr "B<1.> O script I<prerm> é executado."
 
 # type: Plain text
-#: dpkg.1:407
+#: dpkg.1:163
 #, fuzzy
-msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
-msgstr ""
-"B<overwrite-diverted>: Sobrescreve um arquivo desviado com uma versão não "
-"desviada."
+msgid "B<2.> Remove the installed files"
+msgstr "B<2.> Os arquivos instalados são removidos."
 
 # type: Plain text
-#: dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
-msgstr "B<architecture>: Processa até pacotes com a arquitetura errada."
+#: dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
+msgstr "B<3.> O script I<postrm> é executado."
+
+# type: TP
+#: dpkg.1:167
+#, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg --update-avail> | B<--merge-avail> I<arquivo-Packages>"
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:176
+#, fuzzy
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"B<bad-path>: Faltam programas importantes no B<PATH>, devendo aparecer "
-"problemas."
-
-# type: Plain text
-#: dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
-msgstr "B<not-root>: Tenta (des)instalar coisas mesmo não sendo root."
+"Atualiza a idéia do B<dpkg> e do B<dselect> de quais pacotes estão "
+"disponíveis. Com a ação B<--merge-avail>, as informações antigas são "
+"combinadas as informações do I<arquivo-Packages>.  Com a ação B<--update-"
+"avail>, as informações antigas são substituídas pelas do I<arquivo-"
+"Packages>. O I<arquivo-Packages> distribuído com o Debian é simplesmente "
+"nomeado I<Packages>. O B<dpkg> mantém seu registro dos pacotes disponíveis "
+"em I</var/lib/dpkg/available>."
 
 # type: Plain text
-#: dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+#: dpkg.1:179
+msgid ""
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
 
 # type: TP
-#: dpkg.1:420
+#: dpkg.1:179
 #, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
-msgstr "B<--ignore-depends>=I<pacote>,..."
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
 
 # type: Plain text
-#: dpkg.1:424
+#: dpkg.1:185
 #, fuzzy
 msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"Ignora a verificação de dependência dos pacotes especificados (atualmente, a "
-"verificação é feita, mas são apenas dados avisos sobre os conflitos, nada "
-"mais)."
+"Atualiza a idéia do B<dpkg> e do B<dselect> de quais pacotes estão "
+"disponíveis com as informações do pacote I<arquivo_do_pacote>. Se a opção "
+"B<--recursive> ou B<-R> for especificada, então I<arquivo_do_pacote> deve se "
+"referir a um diretório."
 
 # type: TP
-#: dpkg.1:424
+#: dpkg.1:185
 #, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<dpkg --forget-old-unavail>"
+msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
-#: dpkg.1:428
+#: dpkg.1:188
 #, fuzzy
-msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-msgstr ""
-"Seleciona o formato binário novo ou antigo de pacote. Isto é uma opção do "
-"B<dpkg-deb>(1)."
+msgid "Forget about uninstalled unavailable packages."
+msgstr "Despreza informações sobre pacotes não instalados e não disponíveis."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:188
 #, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg --clear-avail>"
+msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:191
 #, fuzzy
-msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
-msgstr ""
-"Não lê ou verifica o conteúdo do arquivo de controle enquanto cria um "
-"pacote. Isto é uma opção do B<dpkg-deb>(1)."
+msgid "Erase the existing information about what packages are available."
+msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
 
 # type: TP
-#: dpkg.1:432
-#, fuzzy, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr "B<--no-act>"
+#: dpkg.1:191
+#, no-wrap
+msgid "B<dpkg -C> | B<--audit>"
+msgstr "B<dpkg -C> | B<--audit>"
 
 # type: Plain text
-#: dpkg.1:437
+#: dpkg.1:196
 #, fuzzy
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
-"Faz tudo que se espera que seja feito, mas não grava nenhuma alteração. Isso "
-"é usado para ver o que acontece com a ação especificada, sem modificar nada."
+"Procura por pacotes que foram apenas parcialmente instalados em seu sistema. "
+"O B<dpkg> sugerirá o que fazer com eles para que funcionem."
+
+# type: TP
+#: dpkg.1:196
+#, no-wrap
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
-#: dpkg.1:442
+#: dpkg.1:200
 #, fuzzy
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
-msgstr ""
-"Certifique-se de fornecer B<--no-act> antes da ação-parâmetro, ou você pode "
-"obter resultados indesejáveis.  (por exemplo, B<dpkg --purge foo --no-act> "
-"irá primeiro excluir (purge) o pacote foo e então tentará excluir o pacote --"
-"no-act, apesar de que você esperava que nada fosse feito)"
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
+msgstr "Obtém uma lista de seleção de pacotes e a escreve em stdout."
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:200
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr "B<-R> | B<--recursive>"
+msgid "B<dpkg --set-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:448
+#: dpkg.1:206
 #, fuzzy
 msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
+msgstr "Configura as seleções de pacotes usando o arquivo lido de stdin."
+
+# type: TP
+#: dpkg.1:206
+#, fuzzy, no-wrap
+msgid "B<dpkg --clear-selections>"
+msgstr "B<dpkg --set-selections>"
+
+# type: Plain text
+#: dpkg.1:211
+msgid ""
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
-"Manipula recursivamente todos os arquivos regulares que combinem com o "
-"padrão B<*.deb> encontrados nos diretórios especificados e todos seus "
-"subdiretórios. Isso pode ser usado com as ações B<-i>, B<-A>, B<--install>, "
-"B<--unpack> e B<--avail>."
 
 # type: TP
-#: dpkg.1:448
+#: dpkg.1:211
 #, no-wrap
-msgid "B<-G>"
-msgstr "B<-G>"
+msgid "B<dpkg --yet-to-unpack>"
+msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
-#: dpkg.1:452
+#: dpkg.1:215
 #, fuzzy
 msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
-"Não instala um pacote se uma nova versão do mesmo pacote já estiver "
-"instalada. Isso é um apelido de B<--refuse-downgrade.>"
+"Procura pacotes que foram selecionados para instalação, mas por alguma razão "
+"ainda não foram instalados."
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:216
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg --print-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg.1:463
+#: dpkg.1:219
 #, fuzzy
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
-"Muda os diretórios padrões.  O B<admindir> padrão é I</var/lib/dpkg> e "
-"contém muitos arquivos que dão informações sobre o estado dos pacotes "
-"instalados ou não instalados, etc.  O B<instdir> padrão é I</> e refere-se "
-"ao diretório onde os pacotes devem ser instalados. B<instdir> também é o "
-"diretório passado para B<chroot>(2) antes de executar os scripts de "
-"instalação do I<pacote>, o que significa que os scripts vêem B<instdir> como "
-"o diretório raiz.  Alterar B<root> modifica B<instdir> para I<dir> e "
-"B<admindir> para I<dir>B</var/lib/dpkg>."
+"Mostra a arquitetura alvo (por exemplo, \"i386\").  Essa opção usa o B<gcc>."
 
 # type: TP
-#: dpkg.1:463
-#, fuzzy, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+#: dpkg.1:219
+#, no-wrap
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:230
 #, fuzzy
 msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
-"Somente processa os pacotes selecionados para instalação. A marcação atual é "
-"feita com B<dselect> ou pelo B<dpkg>, quando ele manipula pacotes. Por "
-"exemplo, quando um pacote é removido, ele será marcado como selecionado para "
-"instalação."
+"Compara números de versão, onde I<op> é um operador binário. O B<dpkg> "
+"retorna com successo (resultado zero) se a condição especificada for "
+"satisfeita e com falha (resultado não nulo) em caso contrário. Há dois "
+"grupos de operadores, que diferem em como tratam a falta de I<ver1> ou "
+"I<ver2>.  Esses tratam a falta de uma versão como anterior a qualquer outra: "
+"B<lt le eq ne ge gt>.  Esses tratam a falta de uma versão como posterior a "
+"qualquer outra: B<lt-nl le-nl ge-nl gt-nl>.  Esses são providos apenas para "
+"manter compatibilidade com a sintaxe do arquivo de controle: B<E<lt> "
+"E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:230
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg.1:473
+#: dpkg.1:235
 #, fuzzy
 msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
-msgstr "Não instala o pacote se a mesma versão dele já estiver instalada."
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
+msgstr ""
+"Aceita uma série de comandos no descritor de arquivo de entrada "
+"B<E<lt>nE<gt>>.  Nota: opções adicionais configuradas na linha de comando, e "
+"através do descritor de arquivo, não são redefinidas para comandos "
+"subseqüentes usados durante a mesma execução."
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:235
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg --help>"
+msgstr "B<dpkg --help>"
 
 # type: Plain text
-#: dpkg.1:480
-#, fuzzy
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-"Envia a informação do estado do pacote para o descritor de arquivo "
-"I<E<lt>nE<gt>>.  Isso pode ser dado múltiplas vezes. As atualizações de "
-"estado são da forma `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'."
+#: dpkg.1:238
+msgid "Display a brief help message."
+msgstr "Exibe uma breve mensagem de ajuda."
 
 # type: TP
-#: dpkg.1:480
-#, fuzzy, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--log=>I<filename>"
+#: dpkg.1:238
+#, no-wrap
+msgid "B<dpkg --force-help>"
+msgstr "B<dpkg --force-help>"
 
 # type: Plain text
-#: dpkg.1:492
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
-msgstr ""
+#: dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
+msgstr "Ajuda com as opções B<--force->I<coisa>."
 
 # type: TP
-#: dpkg.1:492
-#, fuzzy, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--nocheck>"
+#: dpkg.1:241
+#, no-wrap
+msgid "B<dpkg -Dh >|B< --debug=help>"
+msgstr "B<dpkg -Dh >|B< --debug=help>"
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
-msgstr ""
+#: dpkg.1:244
+#, fuzzy
+msgid "Give help about debugging options."
+msgstr "Ajuda com as opções de depuração."
 
 # type: TP
-#: dpkg.1:497 dpkg.cfg.5:14
+#: dpkg.1:244
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg.1:500
-msgid "Configuration file with default options."
-msgstr "Arquivo de configuração com as opções padrões."
+#: dpkg.1:247
+msgid "Display B<dpkg> licence."
+msgstr "Exibe a licença do B<dpkg>."
 
 # type: TP
-#: dpkg.1:500
-#, fuzzy, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</var/lib/dpkg/available>"
+#: dpkg.1:247
+#, no-wrap
+msgid "B<dpkg --version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
-msgstr ""
+#: dpkg.1:250
+msgid "Display B<dpkg> version information."
+msgstr "Exibe informação sobre a versão do B<dpkg>."
+
+# type: TP
+#: dpkg.1:250
+#, fuzzy, no-wrap
+msgid "B<dpkg-deb actions>"
+msgstr "B<dpkg-deb-actions>"
 
 # type: Plain text
-#: dpkg.1:507
+#: dpkg.1:253
 #, fuzzy
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
+msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
+
+# type: Plain text
+#: dpkg.1:273
+#, fuzzy, no-wrap
 msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
-"Os outros arquivos listados abaixo estão em seus diretórios padrões, veja a "
-"opção B<--admindir> para ver como alterar a localização desses arquivos."
+"B<dpkg -b> | B<--build> I<diretório> [I<nome_de_arquivo>]\n"
+"    Cria um pacote deb.\n"
+"B<dpkg -c> | B<--contents> I<nome_de_arquivo>\n"
+"    Lista o conteúdo de um pacote deb.\n"
+"B<dpkg -e> | B<--control> I<nome_de_arquivo> [I<diretório>]\n"
+"    Extrai informação de controle de um pacote.\n"
+"B<dpkg -x> | B<--extract> I<nome_de_arquivo diretório>\n"
+"    Extrai os arquivos contidos pelo pacote.\n"
+"B<dpkg -f> | B<--field>  I<nome_de_arquivo> [I<campo-de-controle>] ...\n"
+"    Exibe o(s) campo(s) de controle do pacote.\n"
+"B<dpkg --fsys-tarfile> I<nome_de_arquivo>\n"
+"    Exibe o sistema de arquivo do arquivo tar contido no pacote Debian. \n"
+"B<dpkg -I> | B<--info> I<nome_de_arquivo> [I<arquivo-de-controle>]\n"
+"    Mostra informação sobre um pacote.\n"
+"B<dpkg -X> | B<--vextract> I<nome_de_arquivo> I<diretório>\n"
+"    Extrai e exibe os nomes de arquivos contidos em um pacote.\n"
 
 # type: TP
-#: dpkg.1:507
-#, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr "I</var/lib/dpkg/available>"
+#: dpkg.1:275
+#, fuzzy, no-wrap
+msgid "B<dpkg-query actions>"
+msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg.1:510
-msgid "List of available packages."
-msgstr "Lista dos pacotes disponíveis."
-
-# type: TP
-#: dpkg.1:510
-#, no-wrap
-msgid "I</var/lib/dpkg/status>"
-msgstr "I</var/lib/dpkg/status>"
+#: dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:516
-#, fuzzy
+#: dpkg.1:291
+#, fuzzy, no-wrap
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
 msgstr ""
-"Dá o estado dos pacotes disponíveis. Esse arquivo contém informação sobre se "
-"um pacote está marcado para remoção ou não, se está instalado ou não, etc. "
-"Veja a seção B<INFORMAÇÃO SOBRE PACOTES> para maiores informações."
+"B<dpkg -l> | B<--list> I<padrão-do-nome-do-pacote> ...    Lista os pacotes que combinam com o padrão dado.\n"
+"B<dpkg -s> | B<--status> I<nome-do-pacote> ...\n"
+"    Exibe o estado do pacote especificado. Isso apenas mostra a entrada na base de dados dos pacotes instalados.\n"
+"B<dpkg -L> | B<--listfiles> I<pacote> ...\n"
+"    Lista os arquivos instalados em seu sistema a partir do B<pacote>.\n"
+"B<dpkg -S> | B<--search> I<padrão-de-procura> ...\n"
+"    Procura por um nome de arquivo a partir dos pacotes instalados. Todos os caracteres curinga padrões de shell podem ser usados no padrão.\n"
+"B<dpkg  -p|--print-avail >I<pacote>\n"
+"    Exibe detalhes sobre o I<pacote>, como encontrados em I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: dpkg.1:519
+#: dpkg.1:298
 #, fuzzy
 msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
-"Os seguintes arquivos são componentes de um pacote binário. Veja B<deb>(5) "
-"para mais informações sobre eles:"
+"Todas as opções podem ser especificadas tanto na linha de comando quanto no "
+"arquivo de configuração do B<dpkg> chamado I</etc/dpkg/dpkg.cfg>. Cada linha "
+"no arquivo de configuração é uma opção (exatamente a mesma opção da linha de "
+"comando, mas sem os hífens)  ou um comentário (se começar com uma B<#>)."
 
 # type: TP
-#: dpkg.1:519
+#: dpkg.1:299
 #, no-wrap
-msgid "I<control>"
-msgstr "I<control>"
+msgid "B<--abort-after=>I<number>"
+msgstr "B<--abort-after=>I<número>"
 
-# type: TP
-#: dpkg.1:521
-#, no-wrap
-msgid "I<conffiles>"
-msgstr "I<conffiles>"
+# type: Plain text
+#: dpkg.1:302
+#, fuzzy
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+msgstr "Altera o número de erros após os quais o dpkg abortará. O padrão é 50."
 
 # type: TP
-#: dpkg.1:523
+#: dpkg.1:302
 #, no-wrap
-msgid "I<preinst>"
-msgstr "I<preinst>"
+msgid "B<-B>|B<--auto-deconfigure>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
-# type: TP
-#: dpkg.1:525
-#, no-wrap
-msgid "I<postinst>"
-msgstr "I<postinst>"
+# type: Plain text
+#: dpkg.1:308
+#, fuzzy
+msgid ""
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
+msgstr ""
+"Quando um pacote é removido, há a possibilidade de que outro pacote "
+"instalado dependa do que foi removido. Especificando essa opção, o pacote "
+"que depende do que foi removido será automaticamente desconfigurado."
 
 # type: TP
-#: dpkg.1:527
+#: dpkg.1:308
 #, no-wrap
-msgid "I<prerm>"
-msgstr "I<prerm>"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
-# type: TP
-#: dpkg.1:529
-#, no-wrap
-msgid "I<postrm>"
-msgstr "I<postrm>"
+# type: Plain text
+#: dpkg.1:314
+#, fuzzy
+msgid ""
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
+msgstr ""
+"Ativa a depuração.  I<octal> é formado por uma operação \"or\" bit-a-bit "
+"entre os valores desejados da lista abaixo (note que esses valores podem ser "
+"alterados em versões futuras).  B<-Dh> ou B<--debug=help> exibe esses "
+"valores."
 
-# type: SH
-#: dpkg.1:532
-#, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr "VARIÁVEIS DE AMBIENTE"
+# type: Plain text
+#: dpkg.1:326
+#, fuzzy, no-wrap
+msgid ""
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
+msgstr ""
+" número  descrição\n"
+"    1   Informação de progresso geralmente útil\n"
+"    2   Invocação e estado dos scripts do mantenedor\n"
+"   10   Saída de cada arquivo processado\n"
+"  100   Muita saída de cada arquivo processado\n"
+"   20   Saída de cada arquivo de configuração\n"
+"  200   Muita saída de cada arquivo de configuração\n"
+"   40   Dependências e conflitos\n"
+"  400   Muita saída de dependências/conflitos\n"
+" 1000   Muita tagarelice sobre por exemplo o diretório dpkg/info\n"
+" 2000   Quantidades insanas de saída.\n"
 
 # type: TP
-#: dpkg.1:533
+#: dpkg.1:326
 #, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr "B<DPKG_NO_TSTP>"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgstr "B<--force->I<coisas> | B<--no-force->I<coisas> | B<--refuse->I<coisas>"
 
 # type: Plain text
-#: dpkg.1:537
+#: dpkg.1:333
 #, fuzzy
 msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
-"Defina isso para alguma coisa se você preferir que o B<dpkg> inicie um novo "
-"shell ao invés de suspender a si próprio, quando fazendo um escape de shell."
+"Força ou rejeita (B<no-force> e B<refuse> são a mesma coisa)  a fazer "
+"algumas coisas.  I<coisas> é uma lista separada por vírgulas de coisas "
+"especificadas abaixo.  B<--force-help> exibe uma mensagem descrevendo-as.  "
+"Coisas marcadas com (*) são forçadas por padrão."
 
-# type: TP
-#: dpkg.1:537
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+# type: Plain text
+#: dpkg.1:337
+#, fuzzy
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Atenção: A maior parte dessas opções devem ser usadas apenas por experts. "
+"Usá-las sem o completo conhecimento de seus efeitos pode quebrar todo seu "
+"sistema.>"
 
 # type: Plain text
-#: dpkg.1:540
+#: dpkg.1:340
 #, fuzzy
-msgid "The program B<dpkg> will execute when starting a new shell."
-msgstr ""
-"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
-
-# type: TP
-#: dpkg.1:540 dpkg-query.1:168
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<all>: Turns on (or off) all force options."
+msgstr "B<all>: Liga (ou desliga) todas as opções de força."
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:343
 #, fuzzy
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
 msgstr ""
-"Ajusta o número de colunas que o B<dpkg> deve usar quando estiver exibindo "
-"texto formatado. Atualmente só usado por -l."
+"B<downgrade>(*): Instala um pacote, mesmo se uma versão mais nova já estiver "
+"instalada."
 
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
-#, no-wrap
-msgid "EXAMPLES"
-msgstr "EXEMPLOS"
+# type: Plain text
+#: dpkg.1:350
+msgid ""
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:547
+#: dpkg.1:354
 #, fuzzy
-msgid "To list packages related to the editor B<vi>(1):"
-msgstr "Para listar os pacotes relacionados com o editor vi:"
+msgid ""
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
+msgstr ""
+"B<configure-any>: Configura também qualquer pacote descompactado de que o "
+"pacote atual dependa."
 
 # type: Plain text
-#: dpkg.1:549
-#, fuzzy, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr "B< dpkg -l '*vi*'>"
+#: dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
+msgstr "B<hold>: Processa pacotes mesmo quando marcados com \"hold\"."
 
 # type: Plain text
-#: dpkg.1:552
+#: dpkg.1:362
 #, fuzzy
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
-msgstr "Para ver as entradas em I</var/lib/dpkg/available> em dois pacotes:"
+msgid ""
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
+msgstr ""
+"B<remove-reinstreq>: Remove um pacote, mesmo se estiver quebrado e marcado "
+"como requer reinstalação. Isso pode, por exemplo, fazer com que partes do "
+"pacote permaneçam em seu sistema, que serão então esquecidas pelo B<dpkg>."
 
 # type: Plain text
-#: dpkg.1:554
-#, fuzzy, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
-msgstr "B< dpkg --print-avail elvis vim | less>"
+#: dpkg.1:367
+#, fuzzy
+msgid ""
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
+msgstr ""
+"B<remove-essential>: Remove, mesmo se o pacote é considerado essencial. "
+"Pacotes essenciais contém geralmente comandos muito básicos de Unix. Removê-"
+"los pode causar a parada de funcionamento de todo o sistema, então use-a com "
+"cuidado."
 
 # type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
-msgstr "Para procurar na lista de pacotes você mesmo:"
+#: dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
+msgstr "B<depends>: Converte todos os problemas de dependência em avisos."
 
 # type: Plain text
-#: dpkg.1:559
-#, fuzzy, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
-msgstr "B< less /var/lib/dpkg/available>"
+#: dpkg.1:373
+msgid ""
+"B<depends-version>: Don't care about versions when checking dependencies."
+msgstr ""
+"B<depends-version>: Não verifica versões quando verificando dependências."
 
 # type: Plain text
-#: dpkg.1:562
-msgid "To remove an installed elvis package:"
-msgstr "Para remover um pacote instalado elvis:"
+#: dpkg.1:377
+msgid ""
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
+msgstr ""
+"B<conflicts>: Instala, mesmo se conflita com outro pacote. Isso é perigoso, "
+"pois geralmente causará a regravação de alguns arquivos."
 
 # type: Plain text
-#: dpkg.1:564
-#, fuzzy, no-wrap
-msgid "     B<dpkg -r elvis>\n"
-msgstr "B< dpkg -r elvis>"
+#: dpkg.1:382
+#, fuzzy
+msgid ""
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
+msgstr ""
+"B<confmiss>: Sempre instala um arquivo de configuração que falta. Isso é "
+"perigoso, já que significa que uma mudança (remoção) feita ao arquivo não "
+"será preservada."
 
 # type: Plain text
-#: dpkg.1:569
+#: dpkg.1:387
 #, fuzzy
 msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
-"Para instalar um pacote, você primeiro precisa encontrá-lo em um repositório "
-"ou CDROM.  O arquivo \"available\" mostra que o pacote vim está na seção "
-"\"editors\":"
+"B<confnew>: Se um arquivo de configuração foi modificado, sempre instala a "
+"nova versão sem perguntar, a menos que B<--force-confdef> também seja "
+"especificada, quando a ação padrão é então preferida."
 
 # type: Plain text
-#: dpkg.1:572
-#, fuzzy, no-wrap
+#: dpkg.1:392
+#, fuzzy
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
-msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
+msgstr ""
+"B<confold>: Se um arquivo de configuração foi modificado, sempre mantém a "
+"versão antiga sem perguntar, a menos que B<--force-confdef> também seja "
+"especificada, quando a ação padrão é então preferida."
 
 # type: Plain text
-#: dpkg.1:575
-msgid "To make a local copy of the package selection states:"
-msgstr "Para fazer uma cópia local dos estados de seleção dos pacotes:"
+#: dpkg.1:398
+#, fuzzy
+msgid ""
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
+msgstr ""
+"B<confdef>: Se um arquivo de configuração foi modificado, sempre escolhe a "
+"ação padrão. Se não houver ação padrão, ele irá parar e perguntar ao "
+"usuário, a menos que B<--force-confnew> ou B<--force-confold> também tenham "
+"sido dadas, quando será então usado isso para decidir a ação final."
 
 # type: Plain text
-#: dpkg.1:577
-#, fuzzy, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "B< dpkg --get-selections E<gt>myselections>"
+#: dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
+msgstr "B<overwrite>: Sobrescreve um arquivo do pacote com arquivo de outro."
 
 # type: Plain text
-#: dpkg.1:581
-msgid ""
-"You might transfer this file to another computer, and install it there with:"
+#: dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgstr ""
-"Você pode transferir esse arquivo para outro computador e instalá-lo com:"
+"B<overwrite-dir> Sobrescreve um diretório do pacote com arquivo de outro."
 
 # type: Plain text
-#: dpkg.1:584
-#, fuzzy, no-wrap
+#: dpkg.1:407
+#, fuzzy
 msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
-msgstr "B< dpkg --set-selections E<lt>myselections>"
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
+msgstr ""
+"B<overwrite-diverted>: Sobrescreve um arquivo desviado com uma versão não "
+"desviada."
 
 # type: Plain text
-#: dpkg.1:590
-#, fuzzy
+#: dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
+msgstr "B<architecture>: Processa até pacotes com a arquitetura errada."
+
+# type: Plain text
+#: dpkg.1:413
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
-"Note que isso não instalará nem removerá nada, mas apenas irá configurar o "
-"estado de seleção dos pacotes requisitados.  Você precisará de alguma outra "
-"aplicação para baixar e instalar os pacotes requisitados."
+"B<bad-path>: Faltam programas importantes no B<PATH>, devendo aparecer "
+"problemas."
 
 # type: Plain text
-#: dpkg.1:593
-#, fuzzy
-msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+#: dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
+msgstr "B<not-root>: Tenta (des)instalar coisas mesmo não sendo root."
+
+# type: Plain text
+#: dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
-"Ordinariamente, você verificará que o B<dselect>(8) provê uma maneira mais "
-"conveniente de modificar o estado de seleção dos pacotes."
 
-# type: SH
-#: dpkg.1:595
+# type: TP
+#: dpkg.1:420
 #, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
-msgstr ""
+msgid "B<--ignore-depends>=I<package>,..."
+msgstr "B<--ignore-depends>=I<pacote>,..."
 
 # type: Plain text
-#: dpkg.1:598
+#: dpkg.1:424
+#, fuzzy
 msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
+"Ignora a verificação de dependência dos pacotes especificados (atualmente, a "
+"verificação é feita, mas são apenas dados avisos sobre os conflitos, nada "
+"mais)."
+
+# type: TP
+#: dpkg.1:424
+#, no-wrap
+msgid "B<--new> | B<--old>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:428
 #, fuzzy
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
-"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
-"reconfigure>(8)"
-
-# type: Plain text
-#: dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
-msgstr "B<--no-act> normalmente dá menos informação do que seria útil."
+"Seleciona o formato binário novo ou antigo de pacote. Isto é uma opção do "
+"B<dpkg-deb>(1)."
 
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
+# type: TP
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
-msgid "AUTHORS"
-msgstr "AUTORES"
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg.1:616
-#, no-wrap
+#: dpkg.1:432
+#, fuzzy
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
 msgstr ""
-"Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
-"contribuíram para o B<dpkg>.\n"
+"Não lê ou verifica o conteúdo do arquivo de controle enquanto cria um "
+"pacote. Isto é uma opção do B<dpkg-deb>(1)."
 
 # type: TP
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-architecture"
-msgstr "B<dpkg --print-architecture>"
-
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
+#: dpkg.1:432
 #, fuzzy, no-wrap
-msgid "2006-06-17"
-msgstr "2006-04-09"
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgstr "B<--no-act>"
 
 # type: Plain text
-#: dpkg-architecture.1:4
+#: dpkg.1:437
+#, fuzzy
 msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
 msgstr ""
+"Faz tudo que se espera que seja feito, mas não grava nenhuma alteração. Isso "
+"é usado para ver o que acontece com a ação especificada, sem modificar nada."
 
 # type: Plain text
-#: dpkg-architecture.1:9
+#: dpkg.1:442
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
-msgstr "B<dpkg> [I<opções>] I<ação>"
+msgid ""
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
+msgstr ""
+"Certifique-se de fornecer B<--no-act> antes da ação-parâmetro, ou você pode "
+"obter resultados indesejáveis.  (por exemplo, B<dpkg --purge foo --no-act> "
+"irá primeiro excluir (purge) o pacote foo e então tentará excluir o pacote --"
+"no-act, apesar de que você esperava que nada fosse feito)"
+
+# type: TP
+#: dpkg.1:442
+#, no-wrap
+msgid "B<-R> | B<--recursive>"
+msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:448
+#, fuzzy
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
+"Manipula recursivamente todos os arquivos regulares que combinem com o "
+"padrão B<*.deb> encontrados nos diretórios especificados e todos seus "
+"subdiretórios. Isso pode ser usado com as ações B<-i>, B<-A>, B<--install>, "
+"B<--unpack> e B<--avail>."
+
+# type: TP
+#: dpkg.1:448
+#, no-wrap
+msgid "B<-G>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg.1:452
+#, fuzzy
 msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
+"Não instala um pacote se uma nova versão do mesmo pacote já estiver "
+"instalada. Isso é um apelido de B<--refuse-downgrade.>"
+
+# type: TP
+#: dpkg.1:452
+#, no-wrap
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 
 # type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg.1:463
+#, fuzzy
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
+"Muda os diretórios padrões.  O B<admindir> padrão é I</var/lib/dpkg> e "
+"contém muitos arquivos que dão informações sobre o estado dos pacotes "
+"instalados ou não instalados, etc.  O B<instdir> padrão é I</> e refere-se "
+"ao diretório onde os pacotes devem ser instalados. B<instdir> também é o "
+"diretório passado para B<chroot>(2) antes de executar os scripts de "
+"instalação do I<pacote>, o que significa que os scripts vêem B<instdir> como "
+"o diretório raiz.  Alterar B<root> modifica B<instdir> para I<dir> e "
+"B<admindir> para I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: dpkg-architecture.1:28
+#: dpkg.1:463
 #, fuzzy, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<-O> | B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: dpkg.1:469
+#, fuzzy
+msgid ""
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
+"Somente processa os pacotes selecionados para instalação. A marcação atual é "
+"feita com B<dselect> ou pelo B<dpkg>, quando ele manipula pacotes. Por "
+"exemplo, quando um pacote é removido, ele será marcado como selecionado para "
+"instalação."
 
 # type: TP
-#: dpkg-architecture.1:31
+#: dpkg.1:469
 #, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr ""
+msgid "B<-E> | B<--skip-same-version>"
+msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
-msgstr ""
+#: dpkg.1:473
+#, fuzzy
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
+msgstr "Não instala o pacote se a mesma versão dele já estiver instalada."
 
 # type: TP
-#: dpkg-architecture.1:34
-#, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "B<-G>"
+#: dpkg.1:473
+#, no-wrap
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:480
+#, fuzzy
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
+"Envia a informação do estado do pacote para o descritor de arquivo "
+"I<E<lt>nE<gt>>.  Isso pode ser dado múltiplas vezes. As atualizações de "
+"estado são da forma `status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'."
 
 # type: TP
-#: dpkg-architecture.1:43
+#: dpkg.1:480
 #, fuzzy, no-wrap
-msgid "B<-l>"
-msgstr "B<-G>"
+msgid "B<--log=>I<filename>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg.1:492
 msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:47
+#: dpkg.1:492
 #, fuzzy, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<--no-debsig>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
-msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
+
+# type: Plain text
+#: dpkg.1:500
+msgid "Configuration file with default options."
+msgstr "Arquivo de configuração com as opções padrões."
+
+# type: TP
+#: dpkg.1:500
+#, fuzzy, no-wrap
+msgid "I</var/log/dpkg.log>"
+msgstr "I</var/lib/dpkg/available>"
+
+# type: Plain text
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg.1:507
+#, fuzzy
 msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
+"Os outros arquivos listados abaixo estão em seus diretórios padrões, veja a "
+"opção B<--admindir> para ver como alterar a localização desses arquivos."
 
 # type: TP
-#: dpkg-architecture.1:59
-#, fuzzy, no-wrap
-msgid "B<-q>I<variable-name>"
-msgstr "B<--log=>I<filename>"
+#: dpkg.1:507
+#, no-wrap
+msgid "I</var/lib/dpkg/available>"
+msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
-msgstr ""
+#: dpkg.1:510
+msgid "List of available packages."
+msgstr "Lista dos pacotes disponíveis."
 
 # type: TP
-#: dpkg-architecture.1:62
-#, fuzzy, no-wrap
-msgid "B<-s>"
-msgstr "B<-G>"
+#: dpkg.1:510
+#, no-wrap
+msgid "I</var/lib/dpkg/status>"
+msgstr "I</var/lib/dpkg/status>"
+
+# type: Plain text
+#: dpkg.1:516
+#, fuzzy
+msgid ""
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+msgstr ""
+"Dá o estado dos pacotes disponíveis. Esse arquivo contém informação sobre se "
+"um pacote está marcado para remoção ou não, se está instalado ou não, etc. "
+"Veja a seção B<INFORMAÇÃO SOBRE PACOTES> para maiores informações."
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:519
+#, fuzzy
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
+"Os seguintes arquivos são componentes de um pacote binário. Veja B<deb>(5) "
+"para mais informações sobre eles:"
 
 # type: TP
-#: dpkg-architecture.1:66
-#, fuzzy, no-wrap
-msgid "B<-u>"
-msgstr "B<-G>"
-
-# type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
-msgstr ""
+#: dpkg.1:519
+#, no-wrap
+msgid "I<control>"
+msgstr "I<control>"
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg.1:521
 #, no-wrap
-msgid "B<-c>I< command>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:73
-msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
-msgstr ""
+msgid "I<conffiles>"
+msgstr "I<conffiles>"
 
 # type: TP
-#: dpkg-architecture.1:73
-#, fuzzy, no-wrap
-msgid "B<-L>"
-msgstr "B<-G>"
+#: dpkg.1:523
+#, no-wrap
+msgid "I<preinst>"
+msgstr "I<preinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
-msgstr ""
+# type: TP
+#: dpkg.1:525
+#, no-wrap
+msgid "I<postinst>"
+msgstr "I<postinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
-msgstr ""
+# type: TP
+#: dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
+msgstr "I<prerm>"
 
-# type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
-msgstr ""
+# type: TP
+#: dpkg.1:529
+#, no-wrap
+msgid "I<postrm>"
+msgstr "I<postrm>"
 
 # type: SH
-#: dpkg-architecture.1:83
+#: dpkg.1:532
 #, no-wrap
-msgid "TERMS"
-msgstr ""
+msgid "ENVIRONMENT VARIABLES"
+msgstr "VARIÁVEIS DE AMBIENTE"
 
-# type: IP
-#: dpkg-architecture.1:84
+# type: TP
+#: dpkg.1:533
 #, no-wrap
-msgid "build machine"
-msgstr ""
+msgid "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: dpkg-architecture.1:86
-msgid "The machine the package is built on."
+#: dpkg.1:537
+#, fuzzy
+msgid ""
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
+"Defina isso para alguma coisa se você preferir que o B<dpkg> inicie um novo "
+"shell ao invés de suspender a si próprio, quando fazendo um escape de shell."
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:537
 #, no-wrap
-msgid "host machine"
-msgstr ""
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 # type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
+#: dpkg.1:540
+#, fuzzy
+msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr ""
+"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
-# type: TH
-#: dpkg-architecture.1:88
-#, fuzzy, no-wrap
-msgid "Debian architecture"
-msgstr "Projeto Debian"
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
+#, no-wrap
+msgid "B<COLUMNS>"
+msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:544
+#, fuzzy
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
+"Ajusta o número de colunas que o B<dpkg> deve usar quando estiver exibindo "
+"texto formatado. Atualmente só usado por -l."
 
-# type: IP
-#: dpkg-architecture.1:91
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
-msgid "architecture wildcard"
-msgstr ""
+msgid "EXAMPLES"
+msgstr "EXEMPLOS"
 
 # type: Plain text
-#: dpkg-architecture.1:95
-msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
-msgstr ""
+#: dpkg.1:547
+#, fuzzy
+msgid "To list packages related to the editor B<vi>(1):"
+msgstr "Para listar os pacotes relacionados com o editor vi:"
 
-# type: IP
-#: dpkg-architecture.1:95
-#, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr ""
+# type: Plain text
+#: dpkg.1:549
+#, fuzzy, no-wrap
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: dpkg-architecture.1:99
-msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
-msgstr ""
+#: dpkg.1:552
+#, fuzzy
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+msgstr "Para ver as entradas em I</var/lib/dpkg/available> em dois pacotes:"
 
 # type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
+#: dpkg.1:554
+#, fuzzy, no-wrap
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
+msgstr "Para procurar na lista de pacotes você mesmo:"
 
 # type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-msgstr ""
+#: dpkg.1:559
+#, fuzzy, no-wrap
+msgid "     B<less /var/lib/dpkg/available>\n"
+msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
-msgstr ""
+#: dpkg.1:562
+msgid "To remove an installed elvis package:"
+msgstr "Para remover um pacote instalado elvis:"
 
 # type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr ""
+#: dpkg.1:564
+#, fuzzy, no-wrap
+msgid "     B<dpkg -r elvis>\n"
+msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
+#: dpkg.1:569
+#, fuzzy
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
+"Para instalar um pacote, você primeiro precisa encontrá-lo em um repositório "
+"ou CDROM.  O arquivo \"available\" mostra que o pacote vim está na seção "
+"\"editors\":"
 
 # type: Plain text
-#: dpkg-architecture.1:117
+#: dpkg.1:572
+#, fuzzy, no-wrap
 msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
-msgstr ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
+msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
-msgstr ""
+#: dpkg.1:575
+msgid "To make a local copy of the package selection states:"
+msgstr "Para fazer uma cópia local dos estados de seleção dos pacotes:"
 
 # type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
+#: dpkg.1:577
+#, fuzzy, no-wrap
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "B< dpkg --get-selections E<gt>myselections>"
+
+# type: Plain text
+#: dpkg.1:581
+msgid ""
+"You might transfer this file to another computer, and install it there with:"
 msgstr ""
+"Você pode transferir esse arquivo para outro computador e instalá-lo com:"
 
-# type: SH
-#: dpkg-architecture.1:122
+# type: Plain text
+#: dpkg.1:584
 #, fuzzy, no-wrap
-msgid "VARIABLES"
-msgstr "VARIÁVEIS DE AMBIENTE"
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
+msgstr "B< dpkg --set-selections E<lt>myselections>"
 
 # type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
+#: dpkg.1:590
+#, fuzzy
+msgid ""
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
+"Note que isso não instalará nem removerá nada, mas apenas irá configurar o "
+"estado de seleção dos pacotes requisitados.  Você precisará de alguma outra "
+"aplicação para baixar e instalar os pacotes requisitados."
 
-# type: IP
-#: dpkg-architecture.1:124
+# type: Plain text
+#: dpkg.1:593
+#, fuzzy
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
+msgstr ""
+"Ordinariamente, você verificará que o B<dselect>(8) provê uma maneira mais "
+"conveniente de modificar o estado de seleção dos pacotes."
+
+# type: SH
+#: dpkg.1:595
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
+msgid "ADDITIONAL FUNCTIONALITY"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
+#: dpkg.1:598
+msgid ""
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:126
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+# type: Plain text
+#: dpkg.1:608
+#, fuzzy
+msgid ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
+"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
+"reconfigure>(8)"
 
 # type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr ""
+#: dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
+msgstr "B<--no-act> normalmente dá menos informação do que seria útil."
 
-# type: IP
-#: dpkg-architecture.1:128
+# type: SH
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
-msgstr ""
+msgid "AUTHORS"
+msgstr "AUTORES"
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:130
+#: dpkg.1:616
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
 msgstr ""
+"Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
+"contribuíram para o B<dpkg>.\n"
+
+# type: TP
+#: dpkg-architecture.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-architecture"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
+#: dpkg-architecture.1:4
+msgid ""
+"dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:132
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr ""
+# type: Plain text
+#: dpkg-architecture.1:9
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+#: dpkg-architecture.1:14
+msgid ""
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+# type: Plain text
+#: dpkg-architecture.1:17
+msgid ""
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+#: dpkg-architecture.1:26
+msgid ""
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:136
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgid "COMMANDS"
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:28
+#, fuzzy, no-wrap
+msgid "B<-l>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
+#: dpkg-architecture.1:32
+msgid ""
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:138
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:32
+#, fuzzy, no-wrap
+msgid "B<-e>I<debian-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
+#: dpkg-architecture.1:38
+msgid ""
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:140
+# type: TP
+#: dpkg-architecture.1:38
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
+#: dpkg-architecture.1:44
+msgid ""
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:142
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:44
+#, fuzzy, no-wrap
+msgid "B<-q>I<variable-name>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:144
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:47
+#, fuzzy, no-wrap
+msgid "B<-s>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg-architecture.1:51
+msgid ""
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:146
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:51
+#, fuzzy, no-wrap
+msgid "B<-u>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:149
+# type: TP
+#: dpkg-architecture.1:54
 #, no-wrap
-msgid "DEBIAN/RULES"
+msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg-architecture.1:58
 msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:58
+#, fuzzy, no-wrap
+msgid "B<-L>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:69
+#, fuzzy, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<dpkg --print-architecture>"
+
 # type: Plain text
-#: dpkg-architecture.1:164
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr ""
+
+# type: TP
+#: dpkg-architecture.1:72
 #, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
+#: dpkg-architecture.1:82
 msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:173
+# type: SH
+#: dpkg-architecture.1:83
 #, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgid "TERMS"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:183
+# type: IP
+#: dpkg-architecture.1:84
 #, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+msgid "build machine"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
+#: dpkg-architecture.1:86
+msgid "The machine the package is built on."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:189
+# type: IP
+#: dpkg-architecture.1:86
 #, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgid "host machine"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:193
-#, no-wrap
-msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
 msgstr ""
 
+# type: TH
+#: dpkg-architecture.1:88
+#, fuzzy, no-wrap
+msgid "Debian architecture"
+msgstr "Projeto Debian"
+
 # type: Plain text
-#: dpkg-architecture.1:197
+#: dpkg-architecture.1:91
 msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:91
+#, no-wrap
+msgid "architecture wildcard"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:202
+#: dpkg-architecture.1:95
 msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:203
+# type: IP
+#: dpkg-architecture.1:95
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
+msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:209
+#: dpkg-architecture.1:99
 msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
 
+# type: SH
+#: dpkg-architecture.1:100
+#, fuzzy, no-wrap
+msgid "VARIABLES"
+msgstr "VARIÁVEIS DE AMBIENTE"
+
 # type: Plain text
-#: dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:218
+# type: IP
+#: dpkg-architecture.1:102
 #, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+# type: IP
+#: dpkg-architecture.1:104
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:238
-msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:248
+# type: IP
+#: dpkg-architecture.1:106
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:253
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:108
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:264
-msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:267
-msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:271
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:276
-msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
-#, fuzzy, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg"
-
-# type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
+# type: IP
+#: dpkg-architecture.1:114
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:11
-msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
 msgstr ""
 
-# type: TP
-#: dpkg.cfg.5:16
-#, fuzzy
-msgid "I<~/.dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
-
-# type: Plain text
-#: dpkg.cfg.5:20
-#, fuzzy
-msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+# type: IP
+#: dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
-"Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
-"contribuíram para o B<dpkg>.\n"
 
 # type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
 msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1
+# type: IP
+#: dpkg-architecture.1:118
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
+# type: Plain text
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:120
 #, no-wrap
-msgid "2006-05-23"
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
-msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:124
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:17
-#, fuzzy, no-wrap
-msgid "B<-B>"
-msgstr "B<-G>"
+# type: SH
+#: dpkg-architecture.1:127
+#, no-wrap
+msgid "DEBIAN/RULES"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
+#: dpkg-architecture.1:135
 msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:21
-#, fuzzy, no-wrap
-msgid "B<-h>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
 msgstr ""
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: Plain text
+#: dpkg-architecture.1:142
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-architecture.1:145
+msgid "please use the following:"
 msgstr ""
 
-# type: TH
-#: dpkg-deb.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg"
+# type: Plain text
+#: dpkg-architecture.1:149
+#, no-wrap
+msgid ""
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+#: dpkg-architecture.1:151
+#, no-wrap
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
+#: dpkg-architecture.1:161
+#, no-wrap
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
+#: dpkg-architecture.1:164
+msgid "please use:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
+#: dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
+#: dpkg-architecture.1:171
+#, no-wrap
+msgid ""
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#: dpkg-architecture.1:175
+msgid ""
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#: dpkg-architecture.1:180
+msgid ""
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
+# type: SH
+#: dpkg-architecture.1:181
+#, no-wrap
+msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
+#: dpkg-architecture.1:187
+msgid ""
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:39
-#, fuzzy
+#: dpkg-architecture.1:192
 msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
-msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
-
-# type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-architecture.1:196
+#, no-wrap
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 msgstr ""
 
-# type: SS
-#: dpkg-deb.1:53 dpkg-split.1:48
-#, fuzzy, no-wrap
-msgid "ACTION OPTIONS"
-msgstr "OPÇÕES COMUNS"
-
-# type: TP
-#: dpkg-deb.1:54
+# type: Plain text
+#: dpkg-architecture.1:210
 #, no-wrap
-msgid "B<--build>, B<-b>"
+msgid ""
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
-msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:72
+#: dpkg-architecture.1:216
 msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:84
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:231
+#, no-wrap
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
+#: dpkg-architecture.1:235
+msgid ""
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:242
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, fuzzy, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--new> | B<--old>"
-
-# type: Plain text
-#: dpkg-deb.1:112
-#, fuzzy
-msgid "Provides information about a binary package archive."
-msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
-
 # type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-architecture.1:245
 msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-architecture.1:249
 msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:125
-#, fuzzy, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--new> | B<--old>"
-
 # type: Plain text
-#: dpkg-deb.1:132
-msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:132
-#, fuzzy, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--new> | B<--old>"
-
 # type: Plain text
-#: dpkg-deb.1:135
-#, fuzzy
-msgid "Extracts control file information from a binary package archive."
-msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-architecture.1:256
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:148
-msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:150
-#, fuzzy, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--new> | B<--old>"
-
 # type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-architecture.1:263
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:156
-#, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+# type: Plain text
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:160
-msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:165
-msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+#: dpkg-architecture.1:271
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:171
+#: dpkg-architecture.1:276
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr ""
+# type: TH
+#: dpkg.cfg.5:1
+#, fuzzy, no-wrap
+msgid "dpkg.cfg"
+msgstr "dpkg"
 
-# type: TP
-#: dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
+# type: Plain text
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg.cfg.5:11
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:182
-#, fuzzy, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "I<control>"
+#: dpkg.cfg.5:16
+#, fuzzy
+msgid "I<~/.dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-deb.1:186
+#: dpkg.cfg.5:20
+#, fuzzy
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
+"Veja B</usr/share/doc/dpkg/THANKS> para a lista de pessoas que\n"
+"contribuíram para o B<dpkg>.\n"
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-buildpackage.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+# type: Plain text
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build source packages"
+msgstr ""
+
+# type: Plain text
+#: dpkg-buildpackage.1:8
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+# type: Plain text
+#: dpkg-buildpackage.1:13
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
+#: dpkg-buildpackage.1:15
 #, fuzzy, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>"
+msgid "B<-b>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#: dpkg-buildpackage.1:19
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:203
-#, fuzzy
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Exibe informação sobre a versão do B<dpkg>."
-
 # type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
 #, fuzzy, no-wrap
-msgid "B<--licence>"
-msgstr "B<--nocheck>"
+msgid "B<-B>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:210
+#: dpkg-buildpackage.1:23
 msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
 
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
-#, fuzzy, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "OPÇÕES"
-
 # type: TP
-#: dpkg-deb.1:211
-#, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr ""
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
-msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+#: dpkg-buildpackage.1:26
+msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
-msgstr ""
-
-# type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:227
+#: dpkg-buildpackage.1:33
 #, fuzzy, no-wrap
-msgid "B<--new>"
-msgstr "B<--test>"
+msgid "B<-si>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:40
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:40
 #, fuzzy, no-wrap
-msgid "B<--old>"
-msgstr "B<hold>"
-
-# type: Plain text
-#: dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
-msgstr ""
+msgid "B<-sa>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:246
-msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:43
 #, fuzzy, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-sd>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:254
-msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:46
+#, fuzzy, no-wrap
+msgid "B<-a>I<architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-deb.1:258
+#: dpkg-buildpackage.1:51
 msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<--version>"
+
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+# type: TP
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, no-wrap
+msgid "B<-C>I<changesdescription>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:278
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
 
-# type: TH
-#: dpkg-divert.8:1
+# type: TP
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
-msgid "dpkg-divert"
+msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+msgid ""
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:10
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
-
-# type: Plain text
-#: dpkg-divert.8:15
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
-
-# type: Plain text
-#: dpkg-divert.8:20
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
-
-# type: Plain text
-#: dpkg-divert.8:25
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
-
-# type: Plain text
-#: dpkg-divert.8:36
-msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+# type: TP
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, no-wrap
+msgid "B<-e>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
+#: dpkg-buildpackage.1:72
 #, fuzzy, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir> I<diretório>"
+msgid "B<-D>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:48
-msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+#: dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:48
+#: dpkg-buildpackage.1:75
 #, fuzzy, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<-d>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:52
-msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+#: dpkg-buildpackage.1:78
+msgid "Do not check build dependencies and conflicts."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, fuzzy, no-wrap
-msgid "B<--local>"
-msgstr "B<--all>"
+msgid "B<-W>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:84
 msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, fuzzy, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<-E>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:63
+#: dpkg-buildpackage.1:92
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
+#: dpkg-buildpackage.1:92
 #, fuzzy, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+msgid "B<-nc>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:66
+#: dpkg-buildpackage.1:95
 #, fuzzy, no-wrap
-msgid "B<--rename>"
-msgstr "B<--log=>I<filename>"
+msgid "B<-tc>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:70
+#: dpkg-buildpackage.1:101
 msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
-#, fuzzy, no-wrap
-msgid "B<--test>"
-msgstr "B<--test>"
-
-# type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
-msgstr ""
-
-# type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
+#: dpkg-buildpackage.1:101
+#, no-wrap
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
+msgid ""
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
 
-# type: SH
-#: dpkg-divert.8:80
+# type: TP
+#: dpkg-buildpackage.1:127
 #, no-wrap
-msgid "NOTES"
+msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg-buildpackage.1:152
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
+# type: TP
+#: dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:92
-msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+#: dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+#: dpkg-buildpackage.1:158
+msgid "Do not sign the source package."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:107
-msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
+#, fuzzy, no-wrap
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir> I<diretório>"
+
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
+msgid ""
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
 #, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/status>"
+msgid "B<-h>, B<--help>"
+msgstr "B<--help>"
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:185
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:123
+#: dpkg-buildpackage.1:192
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr ""
+"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
+"reconfigure>(8)"
+
+# type: TH
+#: dpkg-checkbuilddeps.1:1
+#, no-wrap
+msgid "dpkg-checkbuilddeps"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
 
-# type: TH
-#: dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg"
+# type: Plain text
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
+#: dpkg-checkbuilddeps.1:14
+msgid ""
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:22
+#: dpkg-checkbuilddeps.1:17
 msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:33
+#: dpkg-checkbuilddeps.1:27
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:34
+#: dpkg-checkbuilddeps.1:27
 #, fuzzy, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<-h>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:37
-#, fuzzy, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<--display> I<ligação>"
+# type: UR
+#: dpkg-checkbuilddeps.1:33
+#, no-wrap
+msgid "mailto:joeyh@debian.org"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:40
-#, fuzzy, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<--verbose>"
+# type: TH
+#: dpkg-distaddfile.1:1
+#, no-wrap
+msgid "dpkg-distaddfile"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:44
-msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+#: dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:44
-#, fuzzy, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<--altdir> I<diretório>"
+# type: Plain text
+#: dpkg-distaddfile.1:8
+#, fuzzy
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-name.1:56
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-distaddfile.1:18
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
+msgstr ""
+
+# type: Plain text
+#: dpkg-distaddfile.1:26
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:56
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, no-wrap
-msgid "B<-c, --create-dir>"
+msgid "B<-f>I<fileslistfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:61
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<--help>"
+msgid "B<debian/files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
+#: dpkg-distaddfile.1:46
+msgid ""
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:64
+# type: TH
+#: dpkg-deb.1:1
 #, fuzzy, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<--version>"
+msgid "dpkg-deb"
+msgstr "dpkg"
+
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "2006-04-09"
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-msgid "Print version information and exit successfully."
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+# type: Plain text
+#: dpkg-deb.1:13
+#, fuzzy
+msgid ""
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+msgstr "Veja B<dpkg-deb>(1) para mais informações sobre as seguintes ações."
+
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-deb.1:27
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-deb.1:29
 #, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-deb.1:41
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:77
-#, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+# type: Plain text
+#: dpkg-deb.1:53
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-deb.1:60
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+# type: Plain text
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-deb.1:78
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:88
-#, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
-msgstr ""
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
+#: dpkg-deb.1:81
+#, fuzzy
+msgid "Provides information about a binary package archive."
+msgstr "Apaga as informações existentes sobre quais pacotes estão disponíveis."
+
+# type: Plain text
+#: dpkg-deb.1:86
+msgid ""
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:94
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
 
+# type: TP
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<-R> | B<--recursive>"
+
 # type: Plain text
-#: dpkg-name.1:107
+#: dpkg-deb.1:101
 msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
+# type: TP
+#: dpkg-deb.1:101
 #, no-wrap
-msgid "COPYRIGHT"
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:113
+#: dpkg-deb.1:104
 #, fuzzy
+msgid "Extracts control file information from a binary package archive."
+msgstr "B<1.> Os arquivos de controle do novo pacote são extraídos."
+
+# type: Plain text
+#: dpkg-deb.1:108
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
-"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
-"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
-"condições de cópia. NÂO existe garantia."
-
-# type: TP
-#: dpkg-query.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-query"
-msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
+#: dpkg-deb.1:117
+msgid ""
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:9
-#, fuzzy
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<padrão>...]"
-
-# type: TP
-#: dpkg-query.1:13
-#, fuzzy
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<padrão>...]"
+# type: Plain text
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:17
-#, fuzzy
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<--new> | B<--old>"
+
+# type: Plain text
+#: dpkg-deb.1:125
+msgid ""
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:21
-#, fuzzy
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#: dpkg-deb.1:129
+msgid ""
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:29
-#, fuzzy
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
+# type: Plain text
+#: dpkg-deb.1:135
+msgid ""
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
+msgstr ""
 
-# type: TP
-#: dpkg-query.1:32
-#, fuzzy
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+# type: Plain text
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:35
-#, fuzzy
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg --version>"
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-deb.1:143
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:40
+# type: TP
+#: dpkg-deb.1:143
 #, no-wrap
-msgid "COMMANDS"
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-deb.1:151
+msgid ""
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:41
+#: dpkg-deb.1:151
 #, fuzzy, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<padrão>...]"
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: dpkg-query.1:50
+#: dpkg-deb.1:155
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:54
-#, fuzzy, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "B< dpkg -l '*vi*'>"
+#: dpkg-deb.1:159
+msgid ""
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-deb.1:162
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:60
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
 #, fuzzy, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<padrão>...]"
+msgid "B<--license>, B<--licence>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg-query.1:67
-msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:67
-#, fuzzy, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+#: dpkg-deb.1:173
+#, no-wrap
+msgid "B<--showformat=>I<format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:71
-#, fuzzy, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
-
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:187
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
+msgstr ""
+
+# type: Plain text
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:76
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
+msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:193
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:82
-#, fuzzy, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+#: dpkg-deb.1:193
+#, no-wrap
+msgid "B<-Z>I<compress_type>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-deb.1:198
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:86
+#: dpkg-deb.1:198
 #, fuzzy, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
-
-# type: Plain text
-#: dpkg-query.1:89
-#, fuzzy
-msgid "Display licence and copyright information."
-msgstr "Exibe informação sobre a versão do B<dpkg>."
+msgid "B<--new>"
+msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-query.1:92
-#, fuzzy
-msgid "Display version information."
-msgstr "Exibe informação sobre a versão do B<dpkg>."
+#: dpkg-deb.1:203
+msgid ""
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:94
+#: dpkg-deb.1:203
 #, fuzzy, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir> I<diretório>"
+msgid "B<--old>"
+msgstr "B<hold>"
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:211
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:98
-#, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
+# type: Plain text
+#: dpkg-deb.1:217
+msgid ""
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
 
+# type: TP
+#: dpkg-deb.1:217
+#, fuzzy, no-wrap
+msgid "B<-D>, B<--debug>"
+msgstr "B<--nocheck>"
+
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:226
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:230
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:237
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:252
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
 msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:165
+# type: TH
+#: dpkg-divert.8:1
 #, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+msgid "dpkg-divert"
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:167
-#, fuzzy, no-wrap
-msgid "ENVIRONMENT"
-msgstr "VARIÁVEIS DE AMBIENTE"
-
 # type: Plain text
-#: dpkg-query.1:172
-msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr ""
-
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr ""
+#: dpkg-divert.8:9
+#, fuzzy
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
+#: dpkg-divert.8:13
+msgid ""
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
+# type: Plain text
+#: dpkg-divert.8:23
+msgid ""
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-divert.8:25
 #, fuzzy, no-wrap
-msgid "2006-05-10"
-msgstr "2006-04-09"
+msgid "[B<--add>] I<file>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:30
-msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#: dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:43
-msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:53
-msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir> I<diretório>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:60
+#: dpkg-divert.8:42
 msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-divert.8:46
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:46
+#, fuzzy, no-wrap
+msgid "B<--local>"
+msgstr "B<--all>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-divert.8:52
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr ""
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-divert.8:57
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, fuzzy, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:80
-msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr ""
+# type: TP
+#: dpkg-divert.8:60
+#, fuzzy, no-wrap
+msgid "B<--rename>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-divert.8:64
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, fuzzy, no-wrap
+msgid "B<--test>"
+msgstr "B<--test>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:91
-msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+# type: SH
+#: dpkg-divert.8:74
+#, no-wrap
+msgid "NOTES"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-divert.8:78
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:119
+#: dpkg-divert.8:86
 msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
+#: dpkg-divert.8:91
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
-#, fuzzy, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "DIAGNÓSTICOS"
-
 # type: Plain text
-#: dpkg-scanpackages.1:131
-msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:135
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
 msgstr ""
 
-# type: TH
-#: dpkg-scansources.1:1
-#, no-wrap
-msgid "dpkg-scansources"
+# type: Plain text
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-divert.8:101
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-divert.8:103
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:18
-msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:109
+#, fuzzy, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/status>"
+
 # type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-divert.8:114
 msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-divert.8:117
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:44
-msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
 msgstr ""
 
-# type: TP
-#: dpkg-scansources.1:45 install-info.8:272
+# type: TH
+#: dpkg-genchanges.1:1
 #, fuzzy, no-wrap
-msgid "B<--debug>"
-msgstr "B<--nocheck>"
+msgid "dpkg-genchanges"
+msgstr "dpkg"
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
+#: dpkg-genchanges.1:4
+msgid "dpkg-genchanges - generate Debian .changes files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
-msgstr ""
+#: dpkg-genchanges.1:8
+#, fuzzy
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
-# type: TP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<--new> | B<--old>"
+# type: Plain text
+#: dpkg-genchanges.1:16
+msgid ""
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-genchanges.1:23
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
-# type: IP
-#: dpkg-scansources.1:52
+# type: TP
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
+msgid "B<-si>, B<-sa>, B<-sd>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-genchanges.1:49
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:63
-msgid "Print the version number and exit."
+#: dpkg-genchanges.1:62 dpkg-source.1:158
+msgid ""
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scansources.1:66
-msgid "B<dpkg-scanpackages>(1)."
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: dpkg-genchanges.1:66 dpkg-source.1:91
+msgid ""
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
-# type: TH
-#: dpkg-source.1:2
-#, fuzzy, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg suite"
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, no-wrap
+msgid "B<-T>I<substvarsfile>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
-msgstr ""
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+#, fuzzy, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
 # type: Plain text
-#: dpkg-source.1:15
-msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:18
-#, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg> [I<opções>] I<ação>"
-
 # type: TP
-#: dpkg-source.1:21
-#, fuzzy
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-deb-actions>"
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+#, fuzzy, no-wrap
+msgid "B<-U>I<field>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-source.1:24
-#, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg> [I<opções>] I<ação>"
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:27
-#, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg> [I<opções>] I<ação>"
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-source.1:30
-#, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg> [I<opções>] I<ação>"
+#: dpkg-genchanges.1:101
+msgid ""
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:33
-#, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg> [I<opções>] I<ação>"
+# type: TP
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
+#, fuzzy, no-wrap
+msgid "B<-c>I<controlfile>"
+msgstr "I<control>"
 
 # type: Plain text
-#: dpkg-source.1:36
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
+msgstr ""
+
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
+#, no-wrap
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:42
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-genchanges.1:115
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+# type: TP
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
+#, no-wrap
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:80
-msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+# type: TP
+#: dpkg-genchanges.1:120
+#, no-wrap
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+#: dpkg-genchanges.1:131
+msgid ""
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:131
+#, fuzzy, no-wrap
+msgid "B<-q>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-genchanges.1:139
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-genchanges.1:155
 msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
 
-# type: SS
-#: dpkg-source.1:93 update-alternatives.8:290
+# type: TP
+#: dpkg-gencontrol.1:1
 #, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "OPÇÕES COMUNS"
+msgid "dpkg-gencontrol"
+msgstr "I<control>"
 
 # type: Plain text
-#: dpkg-source.1:96
-msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:96
-#, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<--help>"
+# type: Plain text
+#: dpkg-gencontrol.1:8
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-gencontrol.1:15
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:24
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:106
+#: dpkg-gencontrol.1:55
 #, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<--version>"
+msgid "B<-p>I<package>"
+msgstr "B<unpacked>"
 
 # type: Plain text
-#: dpkg-source.1:114
+#: dpkg-gencontrol.1:62
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:62
+#, fuzzy, no-wrap
+msgid "B<-n>I<filename>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-gencontrol.1:67
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:119
+#: dpkg-gencontrol.1:67
 #, no-wrap
-msgid "B<-C>I<changesdescription>"
+msgid "B<-is>, B<-ip>, B<-isp>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:76
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:76
 #, no-wrap
-msgid "B<-m>I<maintaineraddress>"
+msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:89
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:134
-#, no-wrap
-msgid "B<-e>I<maintaineraddress>"
-msgstr ""
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
+#, fuzzy, no-wrap
+msgid "B<-O>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:98
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:142
-#, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr ""
+#: dpkg-gencontrol.1:106
+#, fuzzy, no-wrap
+msgid "B<debian/control>"
+msgstr "I<control>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-gencontrol.1:111
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-gencontrol.1:118
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
+# type: TH
+#: dpkg-name.1:6
+#, fuzzy, no-wrap
+msgid "dpkg-name"
+msgstr "dpkg"
+
 # type: Plain text
-#: dpkg-source.1:163
-msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:163
-#, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
-msgstr ""
+# type: Plain text
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-name.1:27
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:169
-#, no-wrap
-msgid "B<-T>I<substvarsfile>"
-msgstr ""
+#: dpkg-name.1:29
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-source.1:179
-msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:179
+#: dpkg-name.1:32
 #, fuzzy, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<-k>, B<--symlink>"
+msgstr "B<--display> I<ligação>"
 
 # type: Plain text
-#: dpkg-source.1:184
-msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-name.1:35
 #, fuzzy, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<--log=>I<filename>"
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<--verbose>"
 
 # type: Plain text
-#: dpkg-source.1:189
+#: dpkg-name.1:39
 msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:189
-#, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr ""
+#: dpkg-name.1:39
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-name.1:51
 msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 
+# type: TP
+#: dpkg-name.1:51
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<--new> | B<--old>"
+
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-name.1:56
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:217
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<--version>"
+
+# type: TP
+#: dpkg-name.1:62
 #, fuzzy, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "I<control>"
-
-# type: Plain text
-#: dpkg-source.1:224
-msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
-msgstr ""
+msgid "B<-l>, B<--license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: TP
-#: dpkg-source.1:224
+#: dpkg-name.1:67
 #, no-wrap
-msgid "B<-l>I<changelogfile>"
+msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-name.1:72
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:231
+#: dpkg-name.1:72
 #, no-wrap
-msgid "B<-f>I<fileslistfile>"
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-name.1:77
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:237
+#: dpkg-name.1:77
 #, no-wrap
-msgid "B<-F>I<changelogformat>"
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:244
+#: dpkg-name.1:83
 msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:244
-#, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<-G>"
+#: dpkg-name.1:83
+#, no-wrap
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:251
-msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:251
-#, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-name.1:96
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:257
-#, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
+# type: Plain text
+#: dpkg-name.1:104
+msgid ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-name.1:111
+#, fuzzy
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
+"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+"condições de cópia. NÂO existe garantia."
 
-# type: TP
-#: dpkg-source.1:262
+# type: Plain text
+#: dpkg-parsechangelog.1:1
 #, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<-G>"
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+#: dpkg-parsechangelog.1:4
+msgid "dpkg-parsechangelog - parse Debian changelog files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:280
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
-msgstr ""
+#: dpkg-parsechangelog.1:8
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-parsechangelog.1:14
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:288
+#: dpkg-parsechangelog.1:26
 #, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<-G>"
+msgid "B<-L>I<libdir>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-source.1:303
-msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+#: dpkg-parsechangelog.1:41
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-parsechangelog.1:47
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+#: dpkg-query.1:1
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<--log=>I<filename>"
+msgid "dpkg-query"
+msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg-source.1:330
-msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:330
-#, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:345
-msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
-msgstr ""
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-source.1:357
+#: dpkg-query.1:12
 msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:368
-msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
-msgstr ""
+# type: TP
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
-#: dpkg-source.1:377
+#: dpkg-query.1:23
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:406
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
-msgstr ""
+#: dpkg-query.1:27
+#, fuzzy, no-wrap
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "B< dpkg -l '*vi*'>"
 
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-query.1:33
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
-msgstr ""
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-query.1:40
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
-msgstr ""
+# type: TP
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-query.1:44
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
 
+# type: TP
+#: dpkg-query.1:44
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-query.1:49
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:435
-#, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr ""
+# type: TP
+#: dpkg-query.1:49
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<padrão>...]"
 
 # type: Plain text
-#: dpkg-source.1:438
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#: dpkg-query.1:55
+msgid ""
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:438
+#: dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<unpacked>"
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-query.1:59
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:445
-#, fuzzy, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<--log=>I<filename>"
+#: dpkg-query.1:74
+#, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:450
-msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:450
+# type: Plain text
+#: dpkg-query.1:87
 #, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
+msgid ""
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-query.1:92
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:459
-#, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+# type: Plain text
+#: dpkg-query.1:98
+msgid ""
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-query.1:129
+#, no-wrap
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
-#, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-query.1:137
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:482
+# type: Plain text
+#: dpkg-query.1:141
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
 
+# type: SH
+#: dpkg-query.1:143
+#, fuzzy, no-wrap
+msgid "ENVIRONMENT"
+msgstr "VARIÁVEIS DE AMBIENTE"
+
 # type: Plain text
-#: dpkg-source.1:487
+#: dpkg-query.1:148
 msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:487
+# type: Plain text
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr ""
+
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, no-wrap
-msgid "B<-e>I<executable>"
+msgid "mailto:wakkerma@debian.org"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:491
-msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:491
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "B<-d>I<dependencyfield>"
+msgid "dpkg-scanpackages"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:497
-msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-scanpackages.1:28
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-scanpackages.1:41
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-scanpackages.1:51
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-scanpackages.1:58
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:62
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:540
-#, no-wrap
-msgid "B<-t>I<type>"
+# type: Plain text
+#: dpkg-scanpackages.1:65
+msgid ""
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:549
+#: dpkg-scanpackages.1:69
 msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
-msgstr ""
+# type: TP
+#: dpkg-scanpackages.1:71
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--udeb>"
+msgstr "B<--help>"
 
 # type: Plain text
-#: dpkg-source.1:552
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#: dpkg-scanpackages.1:74
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<--auto> I<ligação>"
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<-G>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:571
-#, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
+#, fuzzy, no-wrap
+msgid "DIAGNOSTICS"
+msgstr "DIAGNÓSTICOS"
+
+# type: Plain text
+#: dpkg-scanpackages.1:94
+msgid ""
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:574
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#: dpkg-scanpackages.1:99
+#, fuzzy
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
 msgstr ""
+"B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
+"reconfigure>(8)"
 
-# type: TP
-#: dpkg-source.1:574
+# type: TH
+#: dpkg-scansources.1:1
 #, no-wrap
-msgid "B<-k>I<key-id>"
+msgid "dpkg-scansources"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
+#: dpkg-scansources.1:4
+msgid ""
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
+# type: Plain text
+#: dpkg-scansources.1:13
+msgid ""
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scansources.1:18
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
+# type: Plain text
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scansources.1:33
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
+msgstr ""
+
+# type: Plain text
+#: dpkg-scansources.1:44
+msgid ""
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:628
+#: dpkg-scansources.1:46
 #, fuzzy, no-wrap
-msgid "B<-tc>"
-msgstr "B<-G>"
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scansources.1:49
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:634
+# type: IP
+#: dpkg-scansources.1:49
 #, no-wrap
-msgid "B<-us>, B<-uc>"
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-scansources.1:52
+msgid ""
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
+#: dpkg-scansources.1:58 install-info.8:272
 #, fuzzy, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<--debug>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-source.1:642
-msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+#: dpkg-scansources.1:68
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:651
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
 #, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<-G>"
+msgid "dpkg-shlibdeps"
+msgstr "B<dpkg-deb-actions>"
 
 # type: Plain text
-#: dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:654
-#, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<-G>"
+# type: Plain text
+#: dpkg-shlibdeps.1:35
+msgid ""
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:657
-msgid "Do not check build dependencies and conflicts."
+#: dpkg-shlibdeps.1:41
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:657
-#, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<-G>"
+#: dpkg-shlibdeps.1:41
+#, no-wrap
+msgid "B<-e>I<executable>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
+#: dpkg-shlibdeps.1:45
+msgid ""
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:660
+# type: TP
+#: dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-shlibdeps.1:51
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-shlibdeps.1:61
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:674
-#, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:677
+#: dpkg-shlibdeps.1:69
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:677
+# type: TP
+#: dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-shlibdeps.1:80
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:86
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:86
+#, no-wrap
+msgid "B<-t>I<type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:93
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:93
+#, no-wrap
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-shlibdeps.1:99
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-shlibdeps.1:105
+msgid ""
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<Arch>"
+msgid "B<debian/shlibs.local>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:720
-#, fuzzy, no-wrap
-msgid "B<source:Version>"
-msgstr "B<--version>"
+#: dpkg-shlibdeps.1:120
+#, no-wrap
+msgid "B</etc/dpkg/shlibs.override>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:723
-msgid "The source package version."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:123
 #, no-wrap
-msgid "B<source:Upstream-Version>"
+msgid "B</etc/dpkg/shlibs.default>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
-msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:727
-#, fuzzy, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<--version>"
-
 # type: Plain text
-#: dpkg-source.1:731
-msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+#: dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:731
+# type: TH
+#: dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<--version>"
+msgid "dpkg-source"
+msgstr "dpkg suite"
 
 # type: Plain text
-#: dpkg-source.1:736
-msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+#: dpkg-source.1:6
+msgid "dpkg-source, - Debian source package tools"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:736
-#, fuzzy, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<installed>"
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+# type: Plain text
+#: dpkg-source.1:15
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:745
+#: dpkg-source.1:19
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:745
+#: dpkg-source.1:21
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:754
+#: dpkg-source.1:31
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:754
-#, fuzzy, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<--log=>I<filename>"
-
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-source.1:37
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:761
-#, no-wrap
-msgid "B<Format>"
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:771
+#: dpkg-source.1:45
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:771
+#: dpkg-source.1:45
 #, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-source.1:60
+msgid ""
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:774
-#, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
+# type: Plain text
+#: dpkg-source.1:75
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:82
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:779
-#, fuzzy, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
-#, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:118
+msgid ""
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:137
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "I<control>"
+#: dpkg-source.1:158
+#, no-wrap
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:173
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:794
-#, no-wrap
-msgid "B<debian/changelog>"
+# type: Plain text
+#: dpkg-source.1:185
+msgid ""
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:196
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:800
-#, fuzzy, no-wrap
-msgid "B<debian/files>"
-msgstr "B<config-files>"
-
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:205
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, fuzzy, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<deinstall>"
-
 # type: Plain text
-#: dpkg-source.1:816
-#, fuzzy
-msgid "List of substitution variables and values."
-msgstr "Lista dos pacotes disponíveis."
-
-# type: TP
-#: dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
+#: dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:819
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:822
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
+# type: Plain text
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:258
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:263
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-source.1:274
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:845
+#: dpkg-source.1:279
 #, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr ""
 "B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
 "reconfigure>(8)"
 
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:857
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
-"livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
-"condições de cópia. NÂO existe garantia."
-
 # type: TH
 #: dpkg-split.1:2
 #, fuzzy, no-wrap
@@ -6324,41 +6446,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr ""
-
-# type: TP
-#: dpkg-split.1:13
-#, fuzzy
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
-
-# type: TP
-#: dpkg-split.1:17
-#, fuzzy
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr ""
-
-# type: TP
-#: dpkg-split.1:24
+#: dpkg-split.1:10
 #, fuzzy
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg -C> | B<--audit>"
-
-# type: TP
-#: dpkg-split.1:28
-#, fuzzy
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6366,14 +6460,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6382,25 +6476,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:49
-#, fuzzy, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--list> I<ligação>"
+#: dpkg-split.1:33
+#, no-wrap
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6408,27 +6502,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 #, fuzzy, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6436,7 +6530,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6444,17 +6538,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
+# type: TP
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6462,25 +6562,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:92
-#, fuzzy, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--auto> I<ligação>"
+#: dpkg-split.1:76
+#, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6488,21 +6588,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6510,18 +6610,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 #, fuzzy, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--list> I<ligação>"
+msgid "B<-l>, B<--listq>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -6529,96 +6629,77 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 #, fuzzy, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--display> I<ligação>"
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, fuzzy, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 #, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
+msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 #, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 #, fuzzy, no-wrap
-msgid "B<--npquiet>, B<-Q>"
+msgid "B<-Q>, B<--npquiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -6627,19 +6708,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, fuzzy, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--verbose>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -6647,20 +6728,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, fuzzy, no-wrap
 msgid "EXIT STATUS"
 msgstr "STATUS DE SAÍDA"
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -6668,14 +6749,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -6683,28 +6764,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -6712,19 +6793,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -6732,12 +6813,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
 "Copyright (C) 1995-1996 by him and released under the GNU General Public "
@@ -6764,25 +6845,12 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-#, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
-
-# type: Plain text
-#: dpkg-statoverride.8:18
 #, fuzzy
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -6793,123 +6861,101 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:34
+#: dpkg-statoverride.8:25
 #, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, fuzzy, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
 "glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<--test>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:64
-msgid "Be less verbose about what we do."
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr ""
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, fuzzy, no-wrap
-msgid "B<--admindir>"
-msgstr "B<--admindir> I<diretório>"
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
+
+# type: Plain text
+#: dpkg-statoverride.8:67
+msgid "Be less verbose about what we do."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -6917,14 +6963,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr ""
 
@@ -6999,6 +7045,12 @@ msgstr ""
 "no arquivo de configuração é uma opção (exatamente a mesma opção da linha de "
 "comando, mas sem os hífens)  ou um comentário (se começar com uma B<#>)."
 
+# type: TP
+#: dselect.1:52
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir> I<diretório>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7220,6 +7272,11 @@ msgid ""
 "successfully."
 msgstr ""
 
+# type: Plain text
+#: dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr ""
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -8268,150 +8325,170 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr ""
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
 
 # type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: start-stop-daemon.8:17
+msgid ""
+"B<start-stop-daemon> is used to control the creation and termination of "
+"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
+"B<--name> options, B<start-stop-daemon> can be configured to find existing "
+"instances of a running process."
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#: start-stop-daemon.8:36
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
 msgstr ""
 
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
+# type: TP
+#: start-stop-daemon.8:38
+#, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:55
 msgid ""
-"B<start-stop-daemon> is used to control the creation and termination of "
-"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
-"B<--name> options, B<start-stop-daemon> can be configured to find existing "
-"instances of a running process."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 
+# type: TP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<--new> | B<--old>"
+
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:73
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
-msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
-msgstr ""
+#: start-stop-daemon.8:76
+#, fuzzy
+msgid "Show usage information and exit."
+msgstr "Exibe informação sobre a versão do B<dpkg>."
+
+# type: TP
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: start-stop-daemon.8:87
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
+#: start-stop-daemon.8:79
+msgid "Show the program version and exit."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:90
+#: start-stop-daemon.8:81
 #, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
-msgstr ""
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 #, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 #, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
-msgstr ""
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
-msgstr ""
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 #, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -8420,7 +8497,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -8428,7 +8505,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -8438,7 +8515,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -8446,61 +8523,61 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
-msgstr ""
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
+msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 #, fuzzy, no-wrap
-msgid "B<-t>|B<--test>"
+msgid "B<-t>, B<--test>"
 msgstr "B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 #, fuzzy, no-wrap
-msgid "B<-o>|B<--oknodo>"
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 #, fuzzy, no-wrap
-msgid "B<-q>|B<--quiet>"
+msgid "B<-q>, B<--quiet>"
 msgstr "B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 #, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -8512,26 +8589,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
-msgstr ""
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
-msgstr ""
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
+msgstr "B<--altdir> I<diretório>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -8539,13 +8616,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 #, fuzzy, no-wrap
-msgid "B<-b>|B<--background>"
+msgid "B<-b>, B<--background>"
 msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -8557,35 +8634,35 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 #, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 #, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 msgid "This sets the umask of the process before starting it."
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 #, fuzzy, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-B>|B<--auto-deconfigure>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -8597,48 +8674,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 #, fuzzy, no-wrap
-msgid "B<-v>|B<--verbose>"
+msgid "B<-v>, B<--verbose>"
 msgstr "B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr ""
 
-# type: TP
-#: start-stop-daemon.8:250
-#, fuzzy, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr ""
-
-# type: TP
-#: start-stop-daemon.8:253
-#, fuzzy, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-#, fuzzy
-msgid "Print version information; then exit."
-msgstr "Exibe informação sobre a versão do B<dpkg>."
-
 # type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 msgstr ""
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -8650,12 +8704,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr "update-alternatives --auto vi"
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-04-09"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -8665,56 +8713,13 @@ msgstr ""
 "padrões"
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-"B<update-alternatives> [I<opções>] B<--install> I<ligação nome caminho "
-"prioridade> [B<--slave> I<ligação nome> I<caminho>]..."
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
 msgstr "B<update-alternatives> [I<optções>] B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr "B<update-alternatives> [I<optções>] B<--auto> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr "B<update-alternatives> [I<opções>] B<--display> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr "B<update-alternatives> [I<opções>] B<--config> I<nome>"
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
@@ -8723,7 +8728,7 @@ msgstr ""
 "as ligações simbólicas que englobam o sistema de alternativas Debian."
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 #, fuzzy
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
@@ -8743,7 +8748,7 @@ msgstr ""
 "preferência."
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 #, fuzzy
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
@@ -8769,7 +8774,7 @@ msgstr ""
 "esta configuração até que explicitamente requisitado a fazê-lo."
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 #, fuzzy
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
@@ -8787,7 +8792,7 @@ msgstr ""
 "a FHS (q.v.) dá razões de porquê isto é um Boa Coisa."
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 #, fuzzy
 msgid ""
 "When each package providing a file with a particular functionality is "
@@ -8803,7 +8808,7 @@ msgstr ""
 "B<postinst> ou B<prerm> em pacotes Debian."
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 #, fuzzy
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
@@ -8825,7 +8830,7 @@ msgstr ""
 "its associated slaves make up a I<link> I<group>.  (ou ligação em grupo)."
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 #, fuzzy
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
@@ -8843,7 +8848,7 @@ msgstr ""
 "deixará todas as decisões para o administrador do sistema."
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 #, fuzzy
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
@@ -8859,7 +8864,7 @@ msgstr ""
 "grupo irá automaticamente ser modificado para o modo manual."
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 #, fuzzy
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
@@ -8871,7 +8876,7 @@ msgstr ""
 "apontadas por membros do grupo serão aquelas que possuem a maior prioridade."
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 #, fuzzy
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
@@ -8890,7 +8895,7 @@ msgstr ""
 "retornar ao estado automático."
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 #, fuzzy
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
@@ -8900,7 +8905,7 @@ msgstr ""
 "instead (see below)."
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -8909,13 +8914,13 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr "TERMINOLOGIA"
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
@@ -8924,13 +8929,13 @@ msgstr ""
 "alguns termos específicos ajudarão a explicar sua operação."
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr "nome genérico"
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, fuzzy
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
@@ -8940,13 +8945,13 @@ msgstr ""
 "sistema de alternativas, a um ou a diversos arquivos de função similar."
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr "ligação simbólica (symlink)"
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, fuzzy
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
@@ -8958,13 +8963,13 @@ msgstr ""
 "ajuste."
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr "alternativa"
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, fuzzy
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
@@ -8974,13 +8979,13 @@ msgstr ""
 "acessado através de um nome genérico usando o sistema de alternativas."
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr "diretório de alternativas"
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, fuzzy
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
@@ -8988,13 +8993,13 @@ msgstr ""
 "simbólicas."
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr "diretório administrativo"
 
 # type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, fuzzy
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
@@ -9004,13 +9009,13 @@ msgstr ""
 "de estado de B<update-alternatives>."
 
 # type: TP
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr "ligação em grupo"
 
 # type: Plain text
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, fuzzy
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
@@ -9018,13 +9023,13 @@ msgstr ""
 "atualizadas em grupos."
 
 # type: TP
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr "ligação mestre (master link)"
 
 # type: Plain text
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, fuzzy
 msgid ""
 "The link in a link group which determines how the other links in the group "
@@ -9034,13 +9039,13 @@ msgstr ""
 "grupo são configuradas."
 
 # type: TP
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr "ligação escravo (slave link)"
 
 # type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, fuzzy
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
@@ -9049,182 +9054,47 @@ msgstr ""
 "uma ligação mestre."
 
 # type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr "modo automático"
 
 # type: Plain text
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 #, fuzzy
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
 "for the group."
-msgstr ""
-"Quando uma ligação em grupo está em modo automático, o sistema de "
-"alternativas certifica-se ed que as ligações no grupo apontam para as "
-"alternativas de mais alta prioridade apropriadas para o grupo."
-
-# type: TP
-#: update-alternatives.8:240
-#, no-wrap
-msgid "manual mode"
-msgstr "modo manual"
-
-# type: Plain text
-#: update-alternatives.8:245
-#, fuzzy
-msgid ""
-"When a link group is in manual mode, the alternatives system will not make "
-"any changes to the system administrator's settings."
-msgstr ""
-"Quando uma ligação em grupo está em modo manual, o sistema de alternativas "
-"não fará qualquer modificação nas configurações do administrador do sistema."
-
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:266
-#, fuzzy
-msgid "update-alternatives --display vi"
-msgstr "update-alternatives --display vi"
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr "update-alternatives --config vi"
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr "update-alternatives --auto vi"
-
-# type: Plain text
-#: update-alternatives.8:290
-#, fuzzy
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-"Exatamente uma ação deve ser especificada se B<update-alternatives> está "
-"prester a executar qualquer tarefa significante.  Qualquer número de opções "
-"comuns podem ser especificadas juntas com qualquer ação."
-
-# type: TP
-#: update-alternatives.8:291
-#, fuzzy, no-wrap
-msgid "B<--verbose>"
-msgstr "B<--verbose>"
-
-# type: Plain text
-#: update-alternatives.8:296
-#, fuzzy
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr "Gera mais comentários sobre o que B<update-alternatives> está fazendo."
-
-# type: Plain text
-#: update-alternatives.8:300
-#, fuzzy
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-"Não gera comentário algum a menos que ocorram erros. Esta opção ainda não "
-"está implementada."
-
-# type: Plain text
-#: update-alternatives.8:304
-#, fuzzy
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-"Não faz nada, soment diz o que seria feito. Esta opção ainda não está "
-"implementada."
-
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:312
-#, fuzzy
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr ""
-"Diz qual versão de B<update-alternatives> é essa (e dá alguma informação "
-"sobre o uso)."
-
-# type: TP
-#: update-alternatives.8:312
-#, fuzzy, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--altdir> I<diretório>"
-
-# type: Plain text
-#: update-alternatives.8:316
-#, fuzzy
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-"Especifica o diretório de alternativas, quando este está configurado para "
-"algo diferente do padrão."
+msgstr ""
+"Quando uma ligação em grupo está em modo automático, o sistema de "
+"alternativas certifica-se ed que as ligações no grupo apontam para as "
+"alternativas de mais alta prioridade apropriadas para o grupo."
 
 # type: TP
-#: update-alternatives.8:316
-#, fuzzy, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir> I<diretório>"
+#: update-alternatives.8:197
+#, no-wrap
+msgid "manual mode"
+msgstr "modo manual"
 
 # type: Plain text
-#: update-alternatives.8:320
+#: update-alternatives.8:202
 #, fuzzy
 msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
+"When a link group is in manual mode, the alternatives system will not make "
+"any changes to the system administrator's settings."
 msgstr ""
-"Especifica o dirtório administrativo, quando este este configurado para algo "
-"diferente do padrão."
+"Quando uma ligação em grupo está em modo manual, o sistema de alternativas "
+"não fará qualquer modificação nas configurações do administrador do sistema."
 
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, fuzzy, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr "B<--install> I<ligação genérico caminho pri> [B<--slave> I<sligação sgenérico scaminho>] ..."
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 #, fuzzy
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
@@ -9243,7 +9113,7 @@ msgstr ""
 "slave> , cada uma seguda por três argumentos, podem ser especificadas."
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, fuzzy
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
@@ -9264,26 +9134,26 @@ msgstr ""
 "instaladas."
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, fuzzy, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr "B<--remove> I<nome caminho>"
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, fuzzy
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
@@ -9305,37 +9175,37 @@ msgstr ""
 "modificada; somente a informação sobre a alternativa é removida."
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<--all>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, fuzzy, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto> I<ligação>"
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, fuzzy
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
@@ -9347,13 +9217,13 @@ msgstr ""
 "as alternativas instaladas de maior prioridade."
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, fuzzy, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--display> I<ligação>"
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, fuzzy
 msgid ""
 "Display information about the link group of which I<link> is the master "
@@ -9369,25 +9239,25 @@ msgstr ""
 "correspondentes)  e a alternativa de maior prioridade instalada atualmente."
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, fuzzy, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--list> I<ligação>"
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, fuzzy
 msgid "Display all targets of the link group."
 msgstr "Exibe todos os alvos de uma ligação em grupo."
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, fuzzy, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--config> I<link>"
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -9395,13 +9265,71 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--altdir> I<diretório>"
+
+# type: Plain text
+#: update-alternatives.8:307
+#, fuzzy
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+"Especifica o diretório de alternativas, quando este está configurado para "
+"algo diferente do padrão."
+
+# type: Plain text
+#: update-alternatives.8:311
+#, fuzzy
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+"Especifica o dirtório administrativo, quando este este configurado para algo "
+"diferente do padrão."
+
+# type: TP
+#: update-alternatives.8:311
+#, fuzzy, no-wrap
+msgid "B<--verbose>"
+msgstr "B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+#, fuzzy
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr "Gera mais comentários sobre o que B<update-alternatives> está fazendo."
+
+# type: Plain text
+#: update-alternatives.8:320
+#, fuzzy
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+"Não gera comentário algum a menos que ocorram erros. Esta opção ainda não "
+"está implementada."
+
+# type: Plain text
+#: update-alternatives.8:324
+#, fuzzy
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+"Não faz nada, soment diz o que seria feito. Esta opção ainda não está "
+"implementada."
+
+# type: TP
+#: update-alternatives.8:326
 #, fuzzy, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr "I</etc/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, fuzzy
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
@@ -9411,13 +9339,13 @@ msgstr ""
 "altdir>"
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/alternatives/>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 #, fuzzy
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
@@ -9427,25 +9355,25 @@ msgstr ""
 "admindir>"
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, fuzzy, no-wrap
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, fuzzy
 msgid "The requested action was successfully performed."
 msgstr "A ação requisitada foi completada com sucesso."
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, fuzzy, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 #, fuzzy
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
@@ -9455,7 +9383,7 @@ msgstr ""
 "executando a ação."
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 #, fuzzy
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
@@ -9471,7 +9399,55 @@ msgstr ""
 "assim, por favor reporte isso com um bug."
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:367
+#, fuzzy
+msgid "B<update-alternatives --display vi>"
+msgstr "update-alternatives --display vi"
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:374
+#, fuzzy
+msgid "B<update-alternatives --config vi>"
+msgstr "update-alternatives --config vi"
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:381
+#, fuzzy
+msgid "B<update-alternatives --auto vi>"
+msgstr "update-alternatives --auto vi"
+
+# type: Plain text
+#: update-alternatives.8:386
 #, fuzzy
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
@@ -9482,7 +9458,7 @@ msgstr ""
 "mensagem diretamente para o autor."
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 #, fuzzy
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
@@ -9494,7 +9470,7 @@ msgstr ""
 "na documentação; por favor reporte isso."
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 #, fuzzy
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
@@ -9506,7 +9482,7 @@ msgstr ""
 "condições de cópia. NÂO existe garantia."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 #, fuzzy
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
@@ -9518,7 +9494,7 @@ msgstr ""
 "para condições de cópia. NÂO existe garantia."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 #, fuzzy
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
@@ -9528,11 +9504,249 @@ msgstr ""
 "sistema Debian."
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 #, fuzzy
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
 
+# type: SS
+#, fuzzy
+#~ msgid "ACTION OPTIONS"
+#~ msgstr "OPÇÕES COMUNS"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "I<control>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--licence>"
+#~ msgstr "B<--nocheck>"
+
+# type: SH
+#, fuzzy
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "OPÇÕES"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<--help>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<padrão>...]"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<padrão>...]"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg -A> | B<--record-avail> I<arquivo_do_pacote> ..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Display version information."
+#~ msgstr "Exibe informação sobre a versão do B<dpkg>."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-10"
+#~ msgstr "2006-04-09"
+
+# type: SS
+#, fuzzy
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "OPÇÕES COMUNS"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<-G>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<--log=>I<filename>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "Debian update-alternatives é copyright 1995 Ian Jackson.  Isso é software "
+#~ "livre; veja a Licença Pública Geral GNU versão 2 ou posterior para as "
+#~ "condições de cópia. NÂO existe garantia."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--list> I<ligação>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--list> I<ligação>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--display> I<ligação>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--quiet>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--admindir>"
+#~ msgstr "B<--admindir> I<diretório>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<--help>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
+#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
+#~ msgstr ""
+#~ "B<update-alternatives> [I<opções>] B<--install> I<ligação nome caminho "
+#~ "prioridade> [B<--slave> I<ligação nome> I<caminho>]..."
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--remove> I<nome caminho>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
+#~ msgstr "B<update-alternatives> [I<options>] B<--remove-all> I<nome>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--display> I<nome>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--list> I<nome>"
+
+# type: Plain text
+#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
+#~ msgstr "B<update-alternatives> [I<opções>] B<--config> I<nome>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Exactly one action must be specified if B<update-alternatives> is to "
+#~ "perform any meaningful task.  Any number of the common options may be "
+#~ "specified together with any action."
+#~ msgstr ""
+#~ "Exatamente uma ação deve ser especificada se B<update-alternatives> está "
+#~ "prester a executar qualquer tarefa significante.  Qualquer número de "
+#~ "opções comuns podem ser especificadas juntas com qualquer ação."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Tell which version of B<update-alternatives> this is."
+#~ msgstr ""
+#~ "Diz qual versão de B<update-alternatives> é essa (e dá alguma informação "
+#~ "sobre o uso)."
+
 # type: TP
 #~ msgid "B<DPKG_OLD_CONFFILE>"
 #~ msgstr "B<DPKG_OLD_CONFFILE>"
diff --git a/man/po/ru.po b/man/po/ru.po
index 8d55ae40..773403b5 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-04-08 13:50+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,124 +16,151 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 
 # type: Plain text
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "822-date"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
 msgstr "2006-02-28"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Проект Debian"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, no-wrap
 msgid "dpkg utilities"
 msgstr "утилиты dpkg"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "НАЗВАНИЕ"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+#, fuzzy
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date -- выводит дату и время в формате RFC822"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "СИНТАКСИС"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
+#, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> показывает текущую дату и время в соответствии с форматом, "
 "описанным в RFC822, используя числовое смещение часового пояса, согласно "
 "RFC1123."
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> не использует аргументов или параметров."
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "На самом деле эту задачу должна выполнять программа B<date>(1)."
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -143,41 +170,28 @@ msgstr ""
 "СМОТРИТЕ ТАКЖЕ"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
-msgstr "B<date>(1)."
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "АВТОР"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> и эту страницу руководства написал и передал в общественное "
-"достояние Ian Jackson."
 
 # type: TH
 #: cleanup-info.8:1
@@ -185,20 +199,28 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-02-28"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -207,21 +229,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -230,87 +252,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, fuzzy, no-wrap
-msgid "B<--help>"
-msgstr "B<dpkg --help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-msgid "Output the help screen and exit successfully."
-msgstr ""
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, fuzzy, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<unpacked>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, fuzzy, no-wrap
+msgid "B<--help>"
+msgstr "B<dpkg --help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+msgid "Show the usage message and exit."
+msgstr ""
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, fuzzy, no-wrap
 msgid "B<--version>"
 msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: cleanup-info.8:41
-msgid "Output version and exit successfully."
-msgstr ""
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
+#, fuzzy
+msgid "Show the version and exit."
+msgstr "Выдать информацию о версии и завершить работу."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -325,6 +362,13 @@ msgstr ""
 msgid "deb"
 msgstr ""
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "2006-02-28"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -981,5463 +1025,5530 @@ msgstr ""
 msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+# type: Plain text
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "deb-control"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "2006-04-09"
+msgid "2007-03-07"
 msgstr "2006-02-28"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "комплект dpkg"
-
 # type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg -- менеджер пакетов Debian"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
-
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "ПРЕДУПРЕЖДЕНИЕ"
+#: deb-override.5:22
+msgid "override"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
-"Это руководство предназначено для пользователей, желающих более подробно "
-"ознакомиться с параметрами командной строки B<dpkg> и состояниями пакетов: "
-"здесь это описано более детально, чем в B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
-"Это руководство I<не> следует использовать сопровождающим пакетов, которые "
-"хотят понять, как B<dpkg> будет устанавливать их пакеты. Описание того, что "
-"делает B<dpkg> при установке и удалении пакетов особенно не полно."
 
 # type: Plain text
-#: dpkg.1:26
-#, fuzzy
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr ""
-"B<dpkg> -- это инструмент для установки, создания, удаления и управления "
-"пакетами Debian. Основная и более простая оболочка для B<dpkg> -- это "
-"B<dselect>(8). B<dpkg> полностью управляется параметрами командной строки, "
-"которые состоят из одного действия и нуля или более параметров. Действие "
-"говорит B<dpkg> что ему нужно сделать, а параметры управляют выполнением "
-"действия."
 
 # type: Plain text
-#: dpkg.1:31
-#, fuzzy
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"B<dpkg> может также использоваться как интерфейс к B<dpkg-deb>. "
-"Нижеследующие действия являются действиями B<dpkg-deb>, и если они "
-"встречаются, то B<dpkg> просто запускает B<dpkg-deb> с указанными "
-"параметрами:"
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract> и\n"
-"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-msgstr "Все эти действия описаны в B<dpkg-deb>(1)."
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "ИНФОРМАЦИЯ О ПАКЕТАХ"
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"B<dpkg> управляет некоторой полезной информацией о доступных пакетах. Эта "
-"информация делится на три класса: B<состояния>, B<выбранные состояния> и "
-"B<флаги>. Предполагается, что в большинстве случаев эта информация "
-"изменяется с помощью B<dselect>."
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "СОСТОЯНИЯ ПАКЕТА"
+# type: Plain text
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
-msgstr "B<installed>"
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-02-28"
 
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
-msgstr "Пакет распакован и успешно настроен."
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<half-installed>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
-msgstr "Установка пакета была запущена, но не закончена по какой-либо причине."
-
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<not-installed>"
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "Пакет в системе не установлен."
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
 
 # type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<unpacked>"
-
-# type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "Пакет распакован, но не настроен."
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-deb-actions>"
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<half-configured>"
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:66
-msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
-"Пакет распакован и настройка была запущена, но пока ещё не завершена по "
-"какой-либо причине."
 
 # type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
-msgstr "B<config-files>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "В системе остались только конфигурационные файлы пакета."
+#: deb-substvars.5:20
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
+msgstr ""
 
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "ВЫБРАННЫЕ СОСТОЯНИЯ ПАКЕТА"
+# type: Plain text
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
 
-# type: TP
-#: dpkg.1:70
-#, no-wrap
-msgid "B<install>"
-msgstr "B<install>"
+# type: Plain text
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "Пакет выбран для установки."
+#: deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
 
 # type: TP
-#: dpkg.1:73
-#, no-wrap
-msgid "B<deinstall>"
-msgstr "B<deinstall>"
+#: deb-substvars.5:49
+#, fuzzy, no-wrap
+msgid "B<Arch>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg.1:77
-msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
 msgstr ""
-"Пакет выбран для удаления (т.е. будут удалены все файлы, кроме "
-"конфигурационных)."
 
 # type: TP
-#: dpkg.1:77
+#: deb-substvars.5:53
 #, no-wrap
-msgid "B<purge>"
-msgstr "B<purge>"
+msgid "B<source:Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:81
-msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+#: deb-substvars.5:56
+msgid "The source package version."
 msgstr ""
-"Пакет выбран для полной очистки (т.е. будут удалены абсолютно все файлы, "
-"включая конфигурационные)."
-
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "ФЛАГИ ПАКЕТА"
 
 # type: TP
-#: dpkg.1:82
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<hold>"
-msgstr "B<hold>"
+msgid "B<source:Upstream-Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:60
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"Пакет помечен как B<зафиксированный> и не обрабатывается B<dpkg>, только "
-"если не указан параметр B<--force-hold>."
 
 # type: TP
-#: dpkg.1:86
+#: deb-substvars.5:60
 #, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<reinst-required>"
+msgid "B<binary:Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:64
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"Пакет, помеченный как B<reinst-required>, является сломанным и требует "
-"переустановки. Такие пакеты не могут быть удалены, пока не указан параметр "
-"B<--force-reinstreq>."
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, no-wrap
-msgid "ACTIONS"
-msgstr "ДЕЙСТВИЯ"
 
 # type: TP
-#: dpkg.1:93
-#, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+#: deb-substvars.5:64
+#, fuzzy, no-wrap
+msgid "B<Source-Version>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:69
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"Установить заданный пакет. Если указан параметр B<--recursive> или B<-R>, то "
-"вместо I<имени файла пакета> должен быть указан каталог."
-
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "Установка состоит из следующих шагов:"
 
-# type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Извлечение управляющих файлов нового пакета."
+# type: TP
+#: deb-substvars.5:69
+#, fuzzy, no-wrap
+msgid "B<Installed-Size>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:78
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"B<2.> Если другая версия этого пакета была установлена ранее, то запускается "
-"сценарий I<prerm> из старого пакета."
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> Запускается сценарий I<preinst>, если он есть в пакете."
+# type: TP
+#: deb-substvars.5:78
+#, no-wrap
+msgid "B<Extra-Size>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:87
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"B<4.> Распаковываются новые файлы, в тоже самое время сохраняя старые, чтобы "
-"если что-то пойдет не так, можно было их восстановить."
+
+# type: TP
+#: deb-substvars.5:87
+#, fuzzy, no-wrap
+msgid "B<F:>I<fieldname>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg.1:120
+#: deb-substvars.5:94
 msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
 msgstr ""
-"B<5.> Если ранее была установлена другая версия этого пакета, то запускается "
-"сценарий I<postrm> для старого пакета. Заметим, что этот сценарий "
-"запускается после сценария I<preinst> нового пакета, потому что новые файлы "
-"записываются в то же самое время, когда удаляются старые."
 
 # type: Plain text
-#: dpkg.1:124
+#: deb-substvars.5:104
 msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"B<6.> Настройка пакета. Смотрите описание B<--configure>, где приведена "
-"подробная информация об этом шаге."
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:104
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<имя файла пакета>..."
+msgid "B<Newline>, B<Space>, B<Tab>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
-msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"Распаковать пакет, но не настраивать. Если указан параметр B<--recursive> "
-"или B<--R>, то вместо I<имени файла пакета> должен быть указан каталог."
 
 # type: TP
-#: dpkg.1:129
+#: deb-substvars.5:107
 #, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:134
+#: deb-substvars.5:111
 msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"Повторно настроить распакованный пакет. Если вместо I<имени пакета> задан "
-"параметр B<-a> или B<--pending>, то все распакованные, но не настроенные "
-"пакеты будут настроены."
+
+# type: TP
+#: deb-substvars.5:111
+#, fuzzy, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
-msgstr "Настройка состоит из следующих шагов:"
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
+msgstr ""
+
+# type: TP
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:141
-msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
 msgstr ""
-"B<1.> Распаковка конфигурационных файлов, в то же самое время сохраняя "
-"старые конфигурационные файлы, чтобы можно было восстановить их, если что-то "
-"пойдет не так."
 
 # type: Plain text
-#: dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
-msgstr "B<2.> Запуск сценария I<postinst>, если он есть в пакете."
+#: deb-substvars.5:120
+msgid ""
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
+msgstr ""
 
 # type: TP
-#: dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<имя пакета> ... | B<-a> | B<--pending>"
+#: deb-substvars.5:122
+#, fuzzy, no-wrap
+msgid "B<debian/substvars>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:155
+#: deb-substvars.5:125
+#, fuzzy
+msgid "List of substitution variables and values."
+msgstr "Список доступных пакетов."
+
+# type: Plain text
+#: deb-substvars.5:129 dpkg-source.1:267
 msgid ""
-"Remove an installed package. B<-r> or B<--remove> remove everything except "
-"configuration files. This may avoid having to reconfigure the package if it "
-"is reinstalled later. (Configuration files are the files listed in the "
-"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
-"including configuration files. If B<-a> or B<--pending> is given instead of "
-"a package name, then all packages unpacked, but marked to be removed or "
-"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
 msgstr ""
-"Удалить установленный пакет. Если указан параметр B<-r> или B<--remove> то "
-"удаляется всё, кроме конфигурационных файлов. Это позволяет избежать "
-"переконфигурации пакета, если он будет повторно установлен у будущем. "
-"(Конфигурационные файлы -- это те, что указаны в управляющем файле I<debian/"
-"confiles>). Если указан параметр B<-P> или B<--purge> то удаляется всё, "
-"включая конфигурационные файлы. Если вместо I<имени пакета> задан параметр "
-"B<-a> или B<--pending,> то все распакованные пакеты, но отмеченные в файле "
-"I</var/lib/dpkg/status> для удаления или полной очистки, соответственно, "
-"удаляются или полностью очищаются."
-
-# type: Plain text
-#: dpkg.1:157
-msgid "Removing of a package consists of the following steps:"
-msgstr "Удаление пакета состоит из следующих шагов:"
 
 # type: Plain text
-#: dpkg.1:160
-msgid "B<1.> Run I<prerm> script"
-msgstr "B<1.> Запуск сценария I<prerm>"
-
-# type: Plain text
-#: dpkg.1:163
-msgid "B<2.> Remove the installed files"
-msgstr "B<2.> Удаление установленных фалов"
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg.1:166
-msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> Запуск сценария I<postrm>"
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr ""
 
-# type: TP
-#: dpkg.1:167
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
 #, no-wrap
-msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
-msgstr "B<dpkg --update-avail> | B<--merge-avail > I <файл Packages>"
+msgid "COPYRIGHT"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:176
-msgid ""
-"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
-"action B<--merge-avail>, old information is combined with information from "
-"I<Packages-file>. With action B<--update-avail>, old information is replaced "
-"with the information in the I<Packages-file>. The I<Packages-file> "
-"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
-"record of available packages in I</var/lib/dpkg/available>."
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
 msgstr ""
-"Обновить информацию B<dpkg> и B<dselect> о доступных пакетах. Действие B<--"
-"merge-avail> комбинирует старую информацию с информацией из I<файла "
-"Packages>. Действие B<--update-avail> перезаписывает старую информацию "
-"информацией из I<файла Packages>. I<Файл Packages> распространяется с Debian "
-"под именем I<Packages>. B<dpkg> хранит информацию о доступных пакетах в "
-"файле I</var/lib/dpkg/available>."
 
 # type: Plain text
-#: dpkg.1:179
-msgid ""
-"A simpler one-shot command to retrieve and update the I<available> file is "
-"B<dselect update>."
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+msgid "Copyright (C) 2000 Wichert Akkerman"
 msgstr ""
-"Для упрощения процедуры получения и обновления файла I<available> можно "
-"использовать команду B<dselect update>."
-
-# type: TP
-#: dpkg.1:179
-#, no-wrap
-msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
 
 # type: Plain text
-#: dpkg.1:185
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
 msgid ""
-"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
-"information from the package I<package_file>. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
 msgstr ""
-"Обновить информацию B<dpkg> и B<dselect> о доступных пакетах информацией из "
-"пакета I<имя файла пакета>. Если задан параметр B<--recursive> или B<-R>, то "
-"вместо I<имени файла пакета> должен быть указан каталог."
+"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+"гарантий."
 
-# type: TP
-#: dpkg.1:185
+# type: TH
+#: dpkg.1:1
 #, no-wrap
-msgid "B<dpkg --forget-old-unavail>"
-msgstr "B<dpkg --forget-old-unavail>"
+msgid "dpkg"
+msgstr "dpkg"
 
-# type: Plain text
-#: dpkg.1:188
-msgid "Forget about uninstalled unavailable packages."
-msgstr "Забыть о неустановленных недоступных пакетах."
+# type: TH
+#: dpkg.1:1
+#, fuzzy, no-wrap
+msgid "2006-04-09"
+msgstr "2006-02-28"
 
-# type: TP
-#: dpkg.1:188
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
 #, no-wrap
-msgid "B<dpkg --clear-avail>"
-msgstr "B<dpkg --clear-avail>"
+msgid "dpkg suite"
+msgstr "комплект dpkg"
 
 # type: Plain text
-#: dpkg.1:191
-msgid "Erase the existing information about what packages are available."
-msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
-
-# type: TP
-#: dpkg.1:191
-#, no-wrap
-msgid "B<dpkg -C> | B<--audit>"
-msgstr "B<dpkg -C> | B<--audit>"
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg -- менеджер пакетов Debian"
 
 # type: Plain text
-#: dpkg.1:196
-msgid ""
-"Searches for packages that have been installed only partially on your "
-"system. B<dpkg> will suggest what to do with them to get them working."
-msgstr ""
-"Найти пакеты, которые были установлены в системе только частично. B<dpkg> "
-"посоветует, что делать, чтобы восстановить их работоспособность."
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
-# type: TP
-#: dpkg.1:196
+# type: SH
+#: dpkg.1:9
 #, no-wrap
-msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
-msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
+msgid "WARNING"
+msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
 # type: Plain text
-#: dpkg.1:200
-#, fuzzy
+#: dpkg.1:13
 msgid ""
-"Get list of package selections, and write it to stdout. Without a pattern, "
-"packages marked with state purge will not be shown."
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
 msgstr ""
-"Получить список выбранных пакетов и вывести его в стандартный выходной поток."
-
-# type: TP
-#: dpkg.1:200
-#, no-wrap
-msgid "B<dpkg --set-selections>"
-msgstr "B<dpkg --set-selections>"
+"Это руководство предназначено для пользователей, желающих более подробно "
+"ознакомиться с параметрами командной строки B<dpkg> и состояниями пакетов: "
+"здесь это описано более детально, чем в B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:206
+#: dpkg.1:18
 msgid ""
-"Set package selections using file read from stdin. This file should be in "
-"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
-"install, hold, deinstall or purge. Blank lines and comment lines beginning "
-"with '#' are also permitted."
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
 msgstr ""
-"Установить список выбранных пакетов, принимая его со стандартного ввода. "
-"Этот файл должен быть в формате 'E<lt>пакетE<gt> E<lt>состояниеE<gt>', где "
-"состоянием может быть install, hold, deinstall или purge. Допускаются пустые "
-"строки и строки комментариев (начинающиеся с #)."
-
-# type: TP
-#: dpkg.1:206
-#, fuzzy, no-wrap
-msgid "B<dpkg --clear-selections>"
-msgstr "B<dpkg --set-selections>"
+"Это руководство I<не> следует использовать сопровождающим пакетов, которые "
+"хотят понять, как B<dpkg> будет устанавливать их пакеты. Описание того, что "
+"делает B<dpkg> при установке и удалении пакетов особенно не полно."
 
 # type: Plain text
-#: dpkg.1:211
+#: dpkg.1:26
+#, fuzzy
 msgid ""
-"Set the requested state of every non-essential package to deinstall.  This "
-"is intended to be used immediately before --set-selections, to deinstall any "
-"packages not in list given to --set-selections."
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
 msgstr ""
-
-# type: TP
-#: dpkg.1:211
-#, no-wrap
-msgid "B<dpkg --yet-to-unpack>"
-msgstr "B<dpkg --yet-to-unpack>"
+"B<dpkg> -- это инструмент для установки, создания, удаления и управления "
+"пакетами Debian. Основная и более простая оболочка для B<dpkg> -- это "
+"B<dselect>(8). B<dpkg> полностью управляется параметрами командной строки, "
+"которые состоят из одного действия и нуля или более параметров. Действие "
+"говорит B<dpkg> что ему нужно сделать, а параметры управляют выполнением "
+"действия."
 
 # type: Plain text
-#: dpkg.1:215
+#: dpkg.1:31
+#, fuzzy
 msgid ""
-"Searches for packages selected for installation, but which for some reason "
-"still haven't been installed."
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
 msgstr ""
-"Найти пакеты, выбранные для установки, но по какой-то причине ещё не "
-"установленные."
-
-# type: TP
-#: dpkg.1:216
-#, no-wrap
-msgid "B<dpkg --print-architecture>"
-msgstr "B<dpkg --print-architecture>"
+"B<dpkg> может также использоваться как интерфейс к B<dpkg-deb>. "
+"Нижеследующие действия являются действиями B<dpkg-deb>, и если они "
+"встречаются, то B<dpkg> просто запускает B<dpkg-deb> с указанными "
+"параметрами:"
 
 # type: Plain text
-#: dpkg.1:219
-#, fuzzy
+#: dpkg.1:40
+#, no-wrap
 msgid ""
-"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
 msgstr ""
-"Показать архитектуру устанавливаемых пакетов с помощью dpkg (например, \"i386"
-"\")."
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract> и\n"
+"    B<--fsys-tarfile>.\n"
 
-# type: TP
-#: dpkg.1:219
+# type: Plain text
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr "Все эти действия описаны в B<dpkg-deb>(1)."
+
+# type: SH
+#: dpkg.1:43
 #, no-wrap
-msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
-msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "ИНФОРМАЦИЯ О ПАКЕТАХ"
 
 # type: Plain text
-#: dpkg.1:230
+#: dpkg.1:48
 msgid ""
-"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
-"success (zero result) if the specified condition is satisfied, and failure "
-"(nonzero result) otherwise. There are two groups of operators, which differ "
-"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
-"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
-"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
-"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
-"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"Сравнить номера версий, используя I<op> в качестве бинарного оператора. "
-"B<dpkg> возвращает код успешного завершения (нуль), если указанное условие "
-"удовлетворяется, или неудачу (не-нуль) в противном случае. Есть две группы "
-"операторов, которые работают по-разному при отсутствующем параметре I<ver1> "
-"или I<ver2>. Операторы B<lt le eq ne ge gt> считают отсутствующий номер "
-"версии более ранним, чем любой другой. Операторы B<lt-nl le-nl ge-nl gt-nl> "
-"считают отсутствующий номер версии более поздним, чем любой другой. "
-"Операторы B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> используются "
-"только для совместимости с синтаксисом файла control."
+"B<dpkg> управляет некоторой полезной информацией о доступных пакетах. Эта "
+"информация делится на три класса: B<состояния>, B<выбранные состояния> и "
+"B<флаги>. Предполагается, что в большинстве случаев эта информация "
+"изменяется с помощью B<dselect>."
 
-# type: TP
-#: dpkg.1:230
+# type: SS
+#: dpkg.1:48
 #, no-wrap
-msgid "B<dpkg --command-fd E<lt>nE<gt>>"
-msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
-
-# type: Plain text
-#: dpkg.1:235
-msgid ""
-"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
-"additional options set on the command line, and thru this file descriptor, "
-"are not reset for subsequent commands executed during the same run."
-msgstr ""
-"Принимает серию команд из входного файлового дескриптора B<E<lt>nE<gt>>. "
-"Замечание: дополнительные параметры, заданные в командной строке, а также "
-"через этот дескриптор, не сбрасываются для последующих команд, выполняющихся "
-"далее в этом запуске."
+msgid "PACKAGE STATES"
+msgstr "СОСТОЯНИЯ ПАКЕТА"
 
 # type: TP
-#: dpkg.1:235
+#: dpkg.1:49
 #, no-wrap
-msgid "B<dpkg --help>"
-msgstr "B<dpkg --help>"
+msgid "B<installed>"
+msgstr "B<installed>"
 
 # type: Plain text
-#: dpkg.1:238
-msgid "Display a brief help message."
-msgstr "Вывести небольшую подсказку."
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
+msgstr "Пакет распакован и успешно настроен."
 
 # type: TP
-#: dpkg.1:238
+#: dpkg.1:52
 #, no-wrap
-msgid "B<dpkg --force-help>"
-msgstr "B<dpkg --force-help>"
+msgid "B<half-installed>"
+msgstr "B<half-installed>"
 
 # type: Plain text
-#: dpkg.1:241
-msgid "Give help about the B<--force->I<thing> options."
-msgstr "Вывести подсказку о параметрах B<--force->I<что-нибудь>."
+#: dpkg.1:56
+msgid ""
+"The installation of the package has been started, but not completed for some "
+"reason."
+msgstr "Установка пакета была запущена, но не закончена по какой-либо причине."
 
 # type: TP
-#: dpkg.1:241
+#: dpkg.1:56
 #, no-wrap
-msgid "B<dpkg -Dh >|B< --debug=help>"
-msgstr "B<dpkg -Dh >|B< --debug=help>"
+msgid "B<not-installed>"
+msgstr "B<not-installed>"
 
 # type: Plain text
-#: dpkg.1:244
-msgid "Give help about debugging options."
-msgstr "Вывести подсказку о параметрах отладки."
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "Пакет в системе не установлен."
 
 # type: TP
-#: dpkg.1:244
+#: dpkg.1:59
 #, no-wrap
-msgid "B<dpkg --licence> | B<dpkg --license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+msgid "B<unpacked>"
+msgstr "B<unpacked>"
 
 # type: Plain text
-#: dpkg.1:247
-msgid "Display B<dpkg> licence."
-msgstr "Показать лицензию B<dpkg>."
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "Пакет распакован, но не настроен."
 
 # type: TP
-#: dpkg.1:247
+#: dpkg.1:62
 #, no-wrap
-msgid "B<dpkg --version>"
-msgstr "B<dpkg --version>"
+msgid "B<half-configured>"
+msgstr "B<half-configured>"
 
 # type: Plain text
-#: dpkg.1:250
-msgid "Display B<dpkg> version information."
-msgstr "Показать информацию о версии B<dpkg>."
+#: dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
+msgstr ""
+"Пакет распакован и настройка была запущена, но пока ещё не завершена по "
+"какой-либо причине."
 
 # type: TP
-#: dpkg.1:250
-#, fuzzy, no-wrap
-msgid "B<dpkg-deb actions>"
-msgstr "B<dpkg-deb-actions>"
+#: dpkg.1:66
+#, no-wrap
+msgid "B<config-files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg.1:253
-msgid "See B<dpkg-deb>(1) for more information about the following actions."
-msgstr ""
-"Смотрите B<dpkg-deb>(1) для более подробной информации о нижеследующих "
-"действиях."
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "В системе остались только конфигурационные файлы пакета."
 
-# type: Plain text
-#: dpkg.1:273
+# type: SS
+#: dpkg.1:69
 #, no-wrap
-msgid ""
-"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
-"    Build a deb package.\n"
-"B<dpkg -c> | B<--contents> I<filename>\n"
-"    List contents of a deb package.\n"
-"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
-"    Extract control-information from a package.\n"
-"B<dpkg -x> | B<--extract> I<filename directory>\n"
-"    Extract the files contained by package.\n"
-"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
-"    Display control field(s) of a package.\n"
-"B<dpkg --fsys-tarfile> I<filename>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
-"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
-"    Show information about a package.\n"
-"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
-"    Extract and display the filenames contained by a\n"
-"    package.\n"
-msgstr ""
-"B<dpkg -b> | B<--build> I<каталог> [I<имя файла>]\n"
-"    Собирает deb пакет.\n"
-"B<dpkg -c> | B<--contents> I<имя файла>\n"
-"    Показывает содержимое deb пакета.\n"
-"B<dpkg -e> | B<--control> I<имя файла> [I<каталог>]\n"
-"    Извлекает управляющую информацию из пакета.\n"
-"B<dpkg -x> | B<--extract> I<имя файла> <каталог>\n"
-"    Извлекает файлы, содержащиеся в данном пакете.\n"
-"B<dpkg -f> | B<--field>  I<имя файла> [I<управляющее-поле>] ...\n"
-"    Показывает управляющее(ие) поле(я) пакета.\n"
-"B<dpkg --fsys-tarfile> I<имя файла>\n"
-"    Выдает на стандартный вывод tar-файл с файловой\n"
-"    системой из указанного пакета Debian.\n"
-"B<dpkg -I> | B<--info> I<имя файла> [I<файл control>]\n"
-"    Выдает информацию о данном пакете.\n"
-"B<dpkg -X> | B<--vextract> I<имя файла> I<каталог>\n"
-"    Извлекает и выдает имена файлов, содержащиеся в пакете.\n"
+msgid "PACKAGE SELECTION STATES"
+msgstr "ВЫБРАННЫЕ СОСТОЯНИЯ ПАКЕТА"
 
 # type: TP
-#: dpkg.1:275
-#, fuzzy, no-wrap
-msgid "B<dpkg-query actions>"
-msgstr "B<dpkg-query-actions>"
+#: dpkg.1:70
+#, no-wrap
+msgid "B<install>"
+msgstr "B<install>"
 
 # type: Plain text
-#: dpkg.1:278
-msgid "See B<dpkg-query>(1) for more information about the following actions."
-msgstr ""
-"Смотрите B<dpkg-query>(1) для более подробной информации о нижеследующих "
-"действиях."
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "Пакет выбран для установки."
 
-# type: Plain text
-#: dpkg.1:291
+# type: TP
+#: dpkg.1:73
 #, no-wrap
-msgid ""
-"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
-"    List packages matching given pattern.\n"
-"B<dpkg -s> | B<--status> I<package-name> ...\n"
-"    Report status of specified package.\n"
-"B<dpkg -L> | B<--listfiles> I<package> ...\n"
-"    List files installed to your system from B<package>.\n"
-"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
-"    Search for a filename from installed packages.\n"
-"B<dpkg -p> | B<--print-avail> I<package>\n"
-"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
-msgstr ""
-"B<dpkg -l> | B<--list > I<шаблон имени пакета> ...\n"
-"    Показывает пакеты, соответствующие данному шаблону.\n"
-"B<dpkg -s> | B<--status > I<имя пакета> ...\n"
-"    Сообщает о состоянии указанного пакета.\n"
-"B<dpkg -L> | B<--listfiles> I<имя пакета> ...\n"
-"    Показывает файлы, установленные в системе из пакета с указанным именем.\n"
-"B<dpkg -S> | B<--search> I<шаблон имени файла> ...\n"
-"    Ищет в установленных пакетах имя файла по заданному шаблону.\n"
-"B<dpkg -p> | B<--print-avail> I <имя пакета>\n"
-"    Выводит детальную информацию о I<пакете>, которую извлекает\n"
-"    из файла I</var/lib/dpkg/available>.\n"
+msgid "B<deinstall>"
+msgstr "B<deinstall>"
 
 # type: Plain text
-#: dpkg.1:298
+#: dpkg.1:77
 msgid ""
-"All options can be specified both on the command line and in the B<dpkg> "
-"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
-"file is either an option (exactly the same as the command line option but "
-"without leading dashes) or a comment (if it starts with a B<#>)."
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
 msgstr ""
-"Все параметры можно указывать как в командной строке, так и в "
-"конфигурационном файле B<dpkg> -- I</etc/dpkg/dpkg.cfg>. Каждая строка в "
-"конфигурационном файле должна быть либо параметром (в точности как в "
-"командной строке, но без начальных дефисов), либо комментарием (если "
-"начинается с B<#>)."
+"Пакет выбран для удаления (т.е. будут удалены все файлы, кроме "
+"конфигурационных)."
 
 # type: TP
-#: dpkg.1:299
+#: dpkg.1:77
 #, no-wrap
-msgid "B<--abort-after=>I<number>"
-msgstr "B<--abort-after=>I<число>"
+msgid "B<purge>"
+msgstr "B<purge>"
 
 # type: Plain text
-#: dpkg.1:302
-#, fuzzy
-msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+#: dpkg.1:81
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
 msgstr ""
-"Задать количество ошибок после которого dpkg аварийно завершится. По "
-"умолчанию 50."
+"Пакет выбран для полной очистки (т.е. будут удалены абсолютно все файлы, "
+"включая конфигурационные)."
 
-# type: TP
-#: dpkg.1:302
+# type: SS
+#: dpkg.1:81
 #, no-wrap
-msgid "B<-B>|B<--auto-deconfigure>"
-msgstr "B<-B>|B<--auto-deconfigure>"
+msgid "PACKAGE FLAGS"
+msgstr "ФЛАГИ ПАКЕТА"
 
-# type: Plain text
-#: dpkg.1:308
+# type: TP
+#: dpkg.1:82
+#, no-wrap
+msgid "B<hold>"
+msgstr "B<hold>"
+
+# type: Plain text
+#: dpkg.1:86
 msgid ""
-"When a package is removed, there is a possibility that another installed "
-"package depended on the removed package. Specifying this option will cause "
-"automatic deconfiguration of the package which depended on the removed "
-"package."
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
 msgstr ""
-"При удалении пакета есть вероятность, что есть другой установленный пакет "
-"зависящий от удаляемого пакета. Указание этого параметра приведёт к "
-"автоматической деконфигурации пакета, который зависит от удаляемого пакета."
+"Пакет помечен как B<зафиксированный> и не обрабатывается B<dpkg>, только "
+"если не указан параметр B<--force-hold>."
 
 # type: TP
-#: dpkg.1:308
+#: dpkg.1:86
 #, no-wrap
-msgid "B<-D>I<octal>B< | --debug=>I<octal>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<reinst-required>"
+msgstr "B<reinst-required>"
 
 # type: Plain text
-#: dpkg.1:314
-#, fuzzy
+#: dpkg.1:91
 msgid ""
-"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-"together from the list below (note that these values may change in future "
-"releases). B<-Dh> or B<--debug=help> display these debugging values."
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
 msgstr ""
-"Включить отладку. I<octal> -- это восьмеричное число, сформированное побитно "
-"из нижеуказанных битовых масок, (заметим, что эти величины могут быть "
-"изменены в следующих версиях). Параметры B<-Dh> или B<--debug-help> выводят "
-"эти отладочные значения."
+"Пакет, помеченный как B<reinst-required>, является сломанным и требует "
+"переустановки. Такие пакеты не могут быть удалены, пока не указан параметр "
+"B<--force-reinstreq>."
 
-# type: Plain text
-#: dpkg.1:326
+# type: SH
+#: dpkg.1:92
 #, no-wrap
-msgid ""
-" number  description\n"
-"    1   Generally helpful progress information\n"
-"    2   Invocation and status of maintainer scripts\n"
-"   10   Output for each file processed\n"
-"  100   Lots of output for each file processed\n"
-"   20   Output for each configuration file\n"
-"  200   Lots of output for each configuration file\n"
-"   40   Dependencies and conflicts\n"
-"  400   Lots of dependencies/conflicts output\n"
-" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
-" 2000   Insane amounts of drivel\n"
-msgstr ""
-"Маска   Описание\n"
-"    1   Основная полезная информация по ходу выполнения\n"
-"    2   Вызов и состояния скриптов поддержки\n"
-"   10   Вывод по каждому обработанному файлу\n"
-"  100   Подробный вывод по каждому обработанному файлу\n"
-"   20   Вывод по каждому конфигурационному файлу\n"
-"  200   Подробный вывод по каждому конфигурационному файлу\n"
-"   40   Зависимости и конфликты\n"
-"  400   Подробное освещение зависимостей и конфликтов\n"
-" 1000   Подробная ерунда, например о каталоге dpkg/info\n"
-" 2000   Невероятное количество ерунды\n"
+msgid "ACTIONS"
+msgstr "ДЕЙСТВИЯ"
 
 # type: TP
-#: dpkg.1:326
+#: dpkg.1:93
 #, no-wrap
-msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
-msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
-#: dpkg.1:333
+#: dpkg.1:97
 msgid ""
-"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
-"things. I<things> is a comma separated list of things specified below. B<--"
-"force-help> displays a message describing them.  Things marked with (*) are "
-"forced by default."
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
 msgstr ""
-"Принудительно выполнять или же отказываться выполнять (B<no-force> и B<--"
-"refuse> означают одно и то же) те или иные вещи. I<things> -- это список "
-"через запятую элементов описанных далее). B<--force-help> выдает сообщение, "
-"описывающие их. Элементы, обозначенные звёздочкой (*), принудительно "
-"выполняются по умолчанию."
+"Установить заданный пакет. Если указан параметр B<--recursive> или B<-R>, то "
+"вместо I<имени файла пакета> должен быть указан каталог."
 
 # type: Plain text
-#: dpkg.1:337
-msgid ""
-"I<Warning: These options are mostly intended to be used by experts only. "
-"Using them without fully understanding their effects may break your whole "
-"system.>"
-msgstr ""
-"I<Предупреждение: Эти параметры предназначены только для использования "
-"экспертами. Использование без полного понимания их действия может нарушить "
-"работоспособность всей системы.>"
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "Установка состоит из следующих шагов:"
 
 # type: Plain text
-#: dpkg.1:340
-#, fuzzy
-msgid "B<all>: Turns on (or off) all force options."
-msgstr "B<all>: Включить (или выключить) все принудительные параметры."
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Извлечение управляющих файлов нового пакета."
 
 # type: Plain text
-#: dpkg.1:343
+#: dpkg.1:106
 msgid ""
-"B<downgrade>(*): Install a package, even if newer version of it is already "
-"installed."
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
 msgstr ""
-"B<downgrade>(*): Установить пакет, даже если уже установлена его более новая "
-"версия."
+"B<2.> Если другая версия этого пакета была установлена ранее, то запускается "
+"сценарий I<prerm> из старого пакета."
 
 # type: Plain text
-#: dpkg.1:350
-msgid ""
-"I<Warning: At present dpkg does not do any dependency checking on downgrades "
-"and therefore will not warn you if the downgrade breaks the dependency of "
-"some other package. This can have serious side effects, downgrading "
-"essential system components can even make your whole system unusable. Use "
-"with care.>"
-msgstr ""
-"I<Предупреждение: На данный момент dpkg не выполняет проверку зависимостей "
-"при переходе на более старую версию и поэтому не предупредит если это "
-"поломает зависимости с остальными пакетами. Это может иметь серьёзные "
-"последствия: замена на более старую версию системных компонентов первой "
-"необходимости может привести к полной неработоспособности системы. "
-"Использовать осторожно.>"
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
+msgstr "B<3.> Запускается сценарий I<preinst>, если он есть в пакете."
 
 # type: Plain text
-#: dpkg.1:354
+#: dpkg.1:113
 msgid ""
-"B<configure-any>: Configure also any unpacked but unconfigured packages on "
-"which the current package depends."
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
 msgstr ""
-"B<configure-any>: Настроить также все распакованные, но ненастроенные "
-"пакеты, от которых зависит текущий пакет."
-
-# type: Plain text
-#: dpkg.1:357
-msgid "B<hold>: Process packages even when marked \"hold\"."
-msgstr "B<hold>: Обрабатывать даже пакеты, помеченные как \"зафиксированные\"."
+"B<4.> Распаковываются новые файлы, в тоже самое время сохраняя старые, чтобы "
+"если что-то пойдет не так, можно было их восстановить."
 
 # type: Plain text
-#: dpkg.1:362
+#: dpkg.1:120
 msgid ""
-"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
-"require reinstallation. This may, for example, cause parts of the package to "
-"remain on the system, which will then be forgotten by B<dpkg>."
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
 msgstr ""
-"B<remove-reinstreq>: Удалить пакет, даже если он сломан и отмечен как "
-"требующий переустановки. Это может, например, привести к тому, что части "
-"пакета останутся в системе, а B<dpkg> про них забудет."
+"B<5.> Если ранее была установлена другая версия этого пакета, то запускается "
+"сценарий I<postrm> для старого пакета. Заметим, что этот сценарий "
+"запускается после сценария I<preinst> нового пакета, потому что новые файлы "
+"записываются в то же самое время, когда удаляются старые."
 
 # type: Plain text
-#: dpkg.1:367
+#: dpkg.1:124
 msgid ""
-"B<remove-essential>: Remove, even if the package is considered essential. "
-"Essential packages contain mostly very basic Unix commands. Removing them "
-"might cause the whole system to stop working, so use with caution."
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
 msgstr ""
-"B<remove-essential>: Удалить, даже если это пакет первой необходимости "
-"(имеет приоритет \"Essential\"). Эти пакеты в основном содержат базовые "
-"команды Unix. Удаление такого пакета может привести к потере "
-"работоспособности системы, так что используйте данный параметр осторожно."
+"B<6.> Настройка пакета. Смотрите описание B<--configure>, где приведена "
+"подробная информация об этом шаге."
 
-# type: Plain text
-#: dpkg.1:370
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Превратить проблемы с зависимостями в предупреждения."
+# type: TP
+#: dpkg.1:124
+#, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<имя файла пакета>..."
 
 # type: Plain text
-#: dpkg.1:373
+#: dpkg.1:129
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<depends-version>: Не обращать внимание на версии при проверке зависимостей."
+"Распаковать пакет, но не настраивать. Если указан параметр B<--recursive> "
+"или B<--R>, то вместо I<имени файла пакета> должен быть указан каталог."
+
+# type: TP
+#: dpkg.1:129
+#, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:377
+#: dpkg.1:134
 msgid ""
-"B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
 msgstr ""
-"B<conflicts>: Установить, даже если пакет конфликтует с другим пакетом. Это "
-"опасно, так как обычно приводит к перезаписи некоторых файлов."
+"Повторно настроить распакованный пакет. Если вместо I<имени пакета> задан "
+"параметр B<-a> или B<--pending>, то все распакованные, но не настроенные "
+"пакеты будут настроены."
 
 # type: Plain text
-#: dpkg.1:382
-msgid ""
-"B<confmiss>: Always install a missing configuration file. This is dangerous, "
-"since it means not preserving a change (removing) made to the file."
-msgstr ""
-"B<confmiss>: Всегда устанавливать пропущенный конфигурационный файл. Это "
-"опасно, так как не будут сохранены изменения (удаление) файла."
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
+msgstr "Настройка состоит из следующих шагов:"
 
 # type: Plain text
-#: dpkg.1:387
+#: dpkg.1:141
 msgid ""
-"B<confnew>: If a conffile has been modified always install the new version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
 msgstr ""
-"B<confnew>: Если конфигурационный файл был изменён, то всегда устанавливать "
-"новую версию без запроса подтверждения, если не задан также параметр B<--"
-"force-confdef>, при котором предпочтение отдаётся действию по умолчанию."
+"B<1.> Распаковка конфигурационных файлов, в то же самое время сохраняя "
+"старые конфигурационные файлы, чтобы можно было восстановить их, если что-то "
+"пойдет не так."
 
 # type: Plain text
-#: dpkg.1:392
-msgid ""
-"B<confold>: If a conffile has been modified always keep the old version "
-"without prompting, unless the B<--force-confdef> is also specified, in which "
-"case the default action is preferred."
-msgstr ""
-"B<confold>: Если конфигурационный файл был изменён, всегда сохранять старую "
-"версию без запроса подтверждения, если не задан также параметр B<--force-"
-"confdef>, при котором предпочтение отдаётся действию по умолчанию."
+#: dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
+msgstr "B<2.> Запуск сценария I<postinst>, если он есть в пакете."
+
+# type: TP
+#: dpkg.1:144
+#, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<имя пакета> ... | B<-a> | B<--pending>"
 
 # type: Plain text
-#: dpkg.1:398
+#: dpkg.1:155
 msgid ""
-"B<confdef>: If a conffile has been modified always choose the default "
-"action. If there is no default action it will stop to ask the user unless "
-"B<--force-confnew> or B<--force-confold> is also been given, in which case "
-"it will use that to decide the final action."
+"Remove an installed package. B<-r> or B<--remove> remove everything except "
+"configuration files. This may avoid having to reconfigure the package if it "
+"is reinstalled later. (Configuration files are the files listed in the "
+"I<debian/conffiles> control file). B<-P> or B<--purge> removes everything, "
+"including configuration files. If B<-a> or B<--pending> is given instead of "
+"a package name, then all packages unpacked, but marked to be removed or "
+"purged in file I</var/lib/dpkg/status>, are removed or purged, respectively."
 msgstr ""
-"B<confdef>: Если конфигурационный файл был изменён, всегда выбирать действие "
-"по умолчанию. Если такового нет, то спросить у пользователя, если не задан "
-"параметр B<--force-confnew> или B<--force-confold> (в этом случае "
-"соответствующий параметр используется для выяснения, что именно нужно "
-"делать)."
+"Удалить установленный пакет. Если указан параметр B<-r> или B<--remove> то "
+"удаляется всё, кроме конфигурационных файлов. Это позволяет избежать "
+"переконфигурации пакета, если он будет повторно установлен у будущем. "
+"(Конфигурационные файлы -- это те, что указаны в управляющем файле I<debian/"
+"confiles>). Если указан параметр B<-P> или B<--purge> то удаляется всё, "
+"включая конфигурационные файлы. Если вместо I<имени пакета> задан параметр "
+"B<-a> или B<--pending,> то все распакованные пакеты, но отмеченные в файле "
+"I</var/lib/dpkg/status> для удаления или полной очистки, соответственно, "
+"удаляются или полностью очищаются."
 
 # type: Plain text
-#: dpkg.1:401
-msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr ""
-"B<overwrite>: Перезаписать файл из одного пакета файлом из другого пакета."
+#: dpkg.1:157
+msgid "Removing of a package consists of the following steps:"
+msgstr "Удаление пакета состоит из следующих шагов:"
 
 # type: Plain text
-#: dpkg.1:404
-msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
-msgstr ""
-"B<overwrite-dir>: Перезаписать каталог из одного пакета файлом из другого."
+#: dpkg.1:160
+msgid "B<1.> Run I<prerm> script"
+msgstr "B<1.> Запуск сценария I<prerm>"
 
 # type: Plain text
-#: dpkg.1:407
-msgid ""
-"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
-msgstr ""
-"B<overwrite-diverted>: Перезаписать файл с изменённым расположением"
-"(diverted) его неизменённой версией."
+#: dpkg.1:163
+msgid "B<2.> Remove the installed files"
+msgstr "B<2.> Удаление установленных фалов"
 
 # type: Plain text
-#: dpkg.1:410
-msgid "B<architecture>: Process even packages with the wrong architecture."
-msgstr "B<architecture>: Обрабатывать даже пакеты с неправильной архитектурой."
+#: dpkg.1:166
+msgid "B<3.> Run I<postrm> script"
+msgstr "B<3.> Запуск сценария I<postrm>"
+
+# type: TP
+#: dpkg.1:167
+#, no-wrap
+msgid "B<dpkg --update-avail> | B<--merge-avail> I<Packages-file>"
+msgstr "B<dpkg --update-avail> | B<--merge-avail > I <файл Packages>"
 
 # type: Plain text
-#: dpkg.1:413
+#: dpkg.1:176
 msgid ""
-"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
+"Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
+"action B<--merge-avail>, old information is combined with information from "
+"I<Packages-file>. With action B<--update-avail>, old information is replaced "
+"with the information in the I<Packages-file>. The I<Packages-file> "
+"distributed with Debian is simply named I<Packages>. B<dpkg> keeps its "
+"record of available packages in I</var/lib/dpkg/available>."
 msgstr ""
-"B<bad-path>: В B<PATH> отсутствуют важные программы, поэтому могут "
-"возникнуть проблемы."
+"Обновить информацию B<dpkg> и B<dselect> о доступных пакетах. Действие B<--"
+"merge-avail> комбинирует старую информацию с информацией из I<файла "
+"Packages>. Действие B<--update-avail> перезаписывает старую информацию "
+"информацией из I<файла Packages>. I<Файл Packages> распространяется с Debian "
+"под именем I<Packages>. B<dpkg> хранит информацию о доступных пакетах в "
+"файле I</var/lib/dpkg/available>."
 
 # type: Plain text
-#: dpkg.1:416
-msgid "B<not-root>: Try to (de)install things even when not root."
+#: dpkg.1:179
+msgid ""
+"A simpler one-shot command to retrieve and update the I<available> file is "
+"B<dselect update>."
 msgstr ""
-"B<not-root>: Попытаться установить или удалить пакет, даже если не нет прав "
-"суперпользователя."
+"Для упрощения процедуры получения и обновления файла I<available> можно "
+"использовать команду B<dselect update>."
+
+# type: TP
+#: dpkg.1:179
+#, no-wrap
+msgid "B<dpkg -A> | B<--record-avail> I<package_file> ..."
+msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
 
 # type: Plain text
-#: dpkg.1:419
-msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+#: dpkg.1:185
+msgid ""
+"Update B<dpkg> and B<dselect>'s idea of which packages are available with "
+"information from the package I<package_file>. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
 msgstr ""
-"B<bad-verify>: Устанавливать пакет, даже если он не прошёл проверку "
-"подлинности."
+"Обновить информацию B<dpkg> и B<dselect> о доступных пакетах информацией из "
+"пакета I<имя файла пакета>. Если задан параметр B<--recursive> или B<-R>, то "
+"вместо I<имени файла пакета> должен быть указан каталог."
 
 # type: TP
-#: dpkg.1:420
+#: dpkg.1:185
 #, no-wrap
-msgid "B<--ignore-depends>=I<package>,..."
-msgstr "B<--ignore-depends>=I<пакет>,..."
+msgid "B<dpkg --forget-old-unavail>"
+msgstr "B<dpkg --forget-old-unavail>"
 
 # type: Plain text
-#: dpkg.1:424
-msgid ""
-"Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
-msgstr ""
-"Игнорировать проверку зависимостей для указанных пакетов (на самом деле, "
-"проверка выполняется, но выдаются только предупреждения о конфликтах и "
-"ничего более)."
+#: dpkg.1:188
+msgid "Forget about uninstalled unavailable packages."
+msgstr "Забыть о неустановленных недоступных пакетах."
 
 # type: TP
-#: dpkg.1:424
+#: dpkg.1:188
 #, no-wrap
-msgid "B<--new> | B<--old>"
-msgstr "B<--new> | B<--old>"
+msgid "B<dpkg --clear-avail>"
+msgstr "B<dpkg --clear-avail>"
 
 # type: Plain text
-#: dpkg.1:428
+#: dpkg.1:191
+msgid "Erase the existing information about what packages are available."
+msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
+
+# type: TP
+#: dpkg.1:191
+#, no-wrap
+msgid "B<dpkg -C> | B<--audit>"
+msgstr "B<dpkg -C> | B<--audit>"
+
+# type: Plain text
+#: dpkg.1:196
 msgid ""
-"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
+"Searches for packages that have been installed only partially on your "
+"system. B<dpkg> will suggest what to do with them to get them working."
 msgstr ""
-"Выбрать, соответственно, новый или старый формат пакета. Это параметр "
-"программы B<dpkg-deb>(1)."
+"Найти пакеты, которые были установлены в системе только частично. B<dpkg> "
+"посоветует, что делать, чтобы восстановить их работоспособность."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:196
 #, no-wrap
-msgid "B<--nocheck>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg --get-selections> [I<package-name-pattern>...]"
+msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
-#: dpkg.1:432
+#: dpkg.1:200
+#, fuzzy
 msgid ""
-"Don't read or check contents of control file while building a package.  This "
-"is a B<dpkg-deb>(1) option."
+"Get list of package selections, and write it to stdout. Without a pattern, "
+"packages marked with state purge will not be shown."
 msgstr ""
-"Не читать и не проверять содержимое файла control при создании пакета. Это "
-"параметр программы B<dpkg-deb>(1)."
+"Получить список выбранных пакетов и вывести его в стандартный выходной поток."
 
 # type: TP
-#: dpkg.1:432
+#: dpkg.1:200
 #, no-wrap
-msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
-msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgid "B<dpkg --set-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:437
+#: dpkg.1:206
 msgid ""
-"Do everything which is supposed to be done, but don't write any changes. "
-"This is used to see what would happen with the specified action, without "
-"actually modifying anything."
+"Set package selections using file read from stdin. This file should be in "
+"the format 'E<lt>packageE<gt> E<lt>stateE<gt>', where state is one of "
+"install, hold, deinstall or purge. Blank lines and comment lines beginning "
+"with '#' are also permitted."
 msgstr ""
-"Делать всё, что необходимо, но не записывать на диск изменения. Он "
-"используется для того, чтобы посмотреть, что произошло бы при выполнении "
-"указанного действия, но при этом ничего не меняется."
+"Установить список выбранных пакетов, принимая его со стандартного ввода. "
+"Этот файл должен быть в формате 'E<lt>пакетE<gt> E<lt>состояниеE<gt>', где "
+"состоянием может быть install, hold, deinstall или purge. Допускаются пустые "
+"строки и строки комментариев (начинающиеся с #)."
+
+# type: TP
+#: dpkg.1:206
+#, fuzzy, no-wrap
+msgid "B<dpkg --clear-selections>"
+msgstr "B<dpkg --set-selections>"
 
 # type: Plain text
-#: dpkg.1:442
+#: dpkg.1:211
 msgid ""
-"Be sure to give B<--no-act> before the action-parameter, or you might end up "
-"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
-"purge package foo and then try to purge package --no-act, even though you "
-"probably expected it to actually do nothing)"
+"Set the requested state of every non-essential package to deinstall.  This "
+"is intended to be used immediately before --set-selections, to deinstall any "
+"packages not in list given to --set-selections."
 msgstr ""
-"Убедитесь, что указали B<--no-act> перед действием, или у вас могут "
-"получиться нежелаемые результаты. (например, B<dpkg --purge foo --no-act> "
-"сперва выполнит полное удаление пакета foo, а затем будет пытаться полностью "
-"удалить пакет --no-act, хотя вы ожидали, что ничего выполнено не будет)"
 
 # type: TP
-#: dpkg.1:442
+#: dpkg.1:211
 #, no-wrap
-msgid "B<-R> | B<--recursive>"
-msgstr "B<-R> | B<--recursive>"
+msgid "B<dpkg --yet-to-unpack>"
+msgstr "B<dpkg --yet-to-unpack>"
 
 # type: Plain text
-#: dpkg.1:448
+#: dpkg.1:215
 msgid ""
-"Recursively handle all regular files matching pattern B<*.deb> found at "
-"specified directories and all of its subdirectories. This can be used with "
-"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
+"Searches for packages selected for installation, but which for some reason "
+"still haven't been installed."
 msgstr ""
-"Рекурсивная обработать все файлы, отвечающие шаблону B<*.deb>, которые "
-"найдены в заданных каталогах и во всех их подкаталогах. Этот параметр можно "
-"использовать вместе с действиями B<-i>, B<-A>, B<--install>, B<--unpack> и "
-"B<--avail>."
+"Найти пакеты, выбранные для установки, но по какой-то причине ещё не "
+"установленные."
 
 # type: TP
-#: dpkg.1:448
+#: dpkg.1:216
 #, no-wrap
-msgid "B<-G>"
-msgstr "B<-G>"
+msgid "B<dpkg --print-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg.1:452
+#: dpkg.1:219
 #, fuzzy
 msgid ""
-"Don't install a package if a newer version of the same package is already "
-"installed. This is an alias of B<--refuse-downgrade>."
+"Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgstr ""
-"Не устанавливать пакет, если новая версия такого же пакета уже установлена. "
-"Это синоним параметра B<--refuse-downgrade>."
+"Показать архитектуру устанавливаемых пакетов с помощью dpkg (например, \"i386"
+"\")."
 
 # type: TP
-#: dpkg.1:452
+#: dpkg.1:219
 #, no-wrap
-msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgid "B<dpkg --compare-versions >I<ver1 op ver2>"
+msgstr "B<dpkg --compare-versions >I<ver1 op ver2>"
 
 # type: Plain text
-#: dpkg.1:463
-#, fuzzy
+#: dpkg.1:230
 msgid ""
-"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
-"contains many files that give information about status of installed or "
-"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
-"directory where packages are to be installed. B<instdir> is also the "
-"directory passed to B<chroot>(2) before running package's installation "
-"scripts, which means that the scripts see B<instdir> as a root directory.  "
-"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-"var/lib/dpkg>."
+"Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
+"success (zero result) if the specified condition is satisfied, and failure "
+"(nonzero result) otherwise. There are two groups of operators, which differ "
+"in how they treat an empty I<ver1> or I<ver2>. These treat an empty version "
+"as earlier than any version: B<lt le eq ne ge gt>. These treat an empty "
+"version as later than any version: B<lt-nl le-nl ge-nl gt-nl>. These are "
+"provided only for compatibility with control file syntax: B<E<lt> E<lt>E<lt> "
+"E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgstr ""
-"Изменить каталоги по умолчанию. Каталог B<admindir> по умолчанию имеет "
-"значение B</var/lib/dpkg> и содержит много файлов, в которых даётся "
-"информация о состоянии установленных или удалённых пакетов и т.д. Каталог "
-"B<instdir> по умолчанию равен I</> и указывает каталог, куда будут "
-"устанавливаться пакеты. Он также передаётся функции B<chroot>(2) перед "
-"запуском сценария установки B<пакета> -- это означает, что сценарии будут "
-"считать B<instdir> корневым каталогом. Изменение каталога B<root> "
-"устанавливает каталог B<instdir> в значение B<dir>, а каталога B<admindir> "
-"-- в значение I<dir>B</var/lib/dpkg>."
+"Сравнить номера версий, используя I<op> в качестве бинарного оператора. "
+"B<dpkg> возвращает код успешного завершения (нуль), если указанное условие "
+"удовлетворяется, или неудачу (не-нуль) в противном случае. Есть две группы "
+"операторов, которые работают по-разному при отсутствующем параметре I<ver1> "
+"или I<ver2>. Операторы B<lt le eq ne ge gt> считают отсутствующий номер "
+"версии более ранним, чем любой другой. Операторы B<lt-nl le-nl ge-nl gt-nl> "
+"считают отсутствующий номер версии более поздним, чем любой другой. "
+"Операторы B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> используются "
+"только для совместимости с синтаксисом файла control."
 
 # type: TP
-#: dpkg.1:463
+#: dpkg.1:230
 #, no-wrap
-msgid "B<-O> | B<--selected-only>"
-msgstr "B<-O> | B<--selected-only>"
+msgid "B<dpkg --command-fd E<lt>nE<gt>>"
+msgstr "B<dpkg --command-fd E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg.1:469
+#: dpkg.1:235
 msgid ""
-"Only process the packages that are selected for installation. The actual "
-"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
-"example, when a package is removed, it will be marked selected for "
-"deinstallation."
+"Accept a series of commands on input file descriptor B<E<lt>nE<gt>>. Note: "
+"additional options set on the command line, and thru this file descriptor, "
+"are not reset for subsequent commands executed during the same run."
 msgstr ""
-"Обрабатывать только пакеты, выбранные для установки. Такой выбор делается "
-"программой B<dselect> или же самой программой B<dpkg> при работе с пакетами. "
-"Например, когда пакет удаляется, он будет помечен для удаления."
+"Принимает серию команд из входного файлового дескриптора B<E<lt>nE<gt>>. "
+"Замечание: дополнительные параметры, заданные в командной строке, а также "
+"через этот дескриптор, не сбрасываются для последующих команд, выполняющихся "
+"далее в этом запуске."
 
 # type: TP
-#: dpkg.1:469
+#: dpkg.1:235
 #, no-wrap
-msgid "B<-E> | B<--skip-same-version>"
-msgstr "B<-E> | B<--skip-same-version>"
+msgid "B<dpkg --help>"
+msgstr "B<dpkg --help>"
 
 # type: Plain text
-#: dpkg.1:473
-msgid ""
-"Don't install the package if the same version of the package is already "
-"installed."
-msgstr ""
-"Не устанавливать пакет, если та же версия этого пакета уже установлена."
+#: dpkg.1:238
+msgid "Display a brief help message."
+msgstr "Вывести небольшую подсказку."
 
 # type: TP
-#: dpkg.1:473
+#: dpkg.1:238
 #, no-wrap
-msgid "B<--status-fd >I<E<lt>nE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+msgid "B<dpkg --force-help>"
+msgstr "B<dpkg --force-help>"
 
 # type: Plain text
-#: dpkg.1:480
-#, fuzzy
-msgid ""
-"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
-"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
-"extend-error-message'.  Configuration file conflicts are reported as "
-"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
-"useredited distedited'."
-msgstr ""
-"Послать информацию о состоянии пакета в файловый дескриптор I<E<lt>nE<gt>>. "
-"Этот параметр можно задавать несколько раз. Эта информация выдаётся в виде "
-"`status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'. Ошибки выдаются в форме "
-"`status: E<lt>pkgE<gt>: error: extend-error-message'. Конфликты "
-"конфигурационных файлов выдаются в форме `status: conffile-prompt: "
-"conffile : 'current-conffile' 'new-conffile' useredited distedited'"
+#: dpkg.1:241
+msgid "Give help about the B<--force->I<thing> options."
+msgstr "Вывести подсказку о параметрах B<--force->I<что-нибудь>."
 
 # type: TP
-#: dpkg.1:480
+#: dpkg.1:241
 #, no-wrap
-msgid "B<--log=>I<filename>"
-msgstr "B<--log=>I<имя файла>"
+msgid "B<dpkg -Dh >|B< --debug=help>"
+msgstr "B<dpkg -Dh >|B< --debug=help>"
 
 # type: Plain text
-#: dpkg.1:492
-#, fuzzy
-msgid ""
-"Log status change updates and actions to I<filename>, instead of the default "
-"I</var/log/dpkg.log>. If this option is given multiple times, the last "
-"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
-"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
-"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt> E<lt>available-versionE<gt>' for actions where "
-"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
-"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
-"changes where I<E<lt>decisionE<gt>> is either install or keep."
-msgstr ""
-"Протоколировать изменения обновлений и действия в I<файл>, вместо файл по "
-"умолчанию I</var/log/dpkg.log>. Если этот параметр указан несколько раз, то "
-"используется последнее имя файла. Протоколируемые сообщения имеют вид `YYYY-"
-"MM-DD HH:MM:SS status E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-"
-"versionE<gt>' при изменении состояния обновлений; `YYYY-MM-DD HH:MM:SS "
-"E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt> E<lt>available-"
-"versionE<gt>' при выполнении действия, где I<E<lt>actionE<gt>> может быть "
-"install, upgrade, remove, purge; и `YYYY-MM-DD HH:MM:SS conffile "
-"E<lt>filenameE<gt> E<lt>decisionE<gt>' при изменении конфигурационных "
-"файлов, \n"
-"где I<E<lt>decision> может быть install или keep."
+#: dpkg.1:244
+msgid "Give help about debugging options."
+msgstr "Вывести подсказку о параметрах отладки."
 
 # type: TP
-#: dpkg.1:492
+#: dpkg.1:244
 #, no-wrap
-msgid "B<--no-debsig>"
-msgstr "B<--no-debsig>"
+msgid "B<dpkg --licence> | B<dpkg --license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg.1:495
-msgid "Do not try to verify package signatures."
-msgstr "Не пытаться проверять подпись пакета."
+#: dpkg.1:247
+msgid "Display B<dpkg> licence."
+msgstr "Показать лицензию B<dpkg>."
 
 # type: TP
-#: dpkg.1:497 dpkg.cfg.5:14
+#: dpkg.1:247
 #, no-wrap
-msgid "I</etc/dpkg/dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+msgid "B<dpkg --version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:500
-msgid "Configuration file with default options."
-msgstr "Файл конфигурации с параметрами по умолчанию."
+#: dpkg.1:250
+msgid "Display B<dpkg> version information."
+msgstr "Показать информацию о версии B<dpkg>."
 
 # type: TP
-#: dpkg.1:500
-#, no-wrap
-msgid "I</var/log/dpkg.log>"
-msgstr "I</var/log/dpkg.log>"
+#: dpkg.1:250
+#, fuzzy, no-wrap
+msgid "B<dpkg-deb actions>"
+msgstr "B<dpkg-deb-actions>"
 
 # type: Plain text
-#: dpkg.1:504
-msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
+#: dpkg.1:253
+msgid "See B<dpkg-deb>(1) for more information about the following actions."
 msgstr ""
-"Файл журнала по умолчанию (смотрите I</etc/dpkg/dpkg.cfg>(5) и параметр B<--"
-"log>)."
+"Смотрите B<dpkg-deb>(1) для более подробной информации о нижеследующих "
+"действиях."
 
 # type: Plain text
-#: dpkg.1:507
+#: dpkg.1:273
+#, no-wrap
 msgid ""
-"The other files listed below are in their default directories, see option "
-"B<--admindir> to see how to change locations of these files."
+"B<dpkg -b> | B<--build> I<directory> [I<filename>]\n"
+"    Build a deb package.\n"
+"B<dpkg -c> | B<--contents> I<filename>\n"
+"    List contents of a deb package.\n"
+"B<dpkg -e> | B<--control> I<filename> [I<directory>]\n"
+"    Extract control-information from a package.\n"
+"B<dpkg -x> | B<--extract> I<filename directory>\n"
+"    Extract the files contained by package.\n"
+"B<dpkg -f> | B<--field>  I<filename> [I<control-field>] ...\n"
+"    Display control field(s) of a package.\n"
+"B<dpkg --fsys-tarfile> I<filename>\n"
+"    Display the filesystem tar-file contained by a\n"
+"    Debian package.\n"
+"B<dpkg -I> | B<--info> I<filename> [I<control-file>]\n"
+"    Show information about a package.\n"
+"B<dpkg -X> | B<--vextract> I<filename> I<directory>\n"
+"    Extract and display the filenames contained by a\n"
+"    package.\n"
 msgstr ""
-"Остальные файлы перечислены с указанием их каталогов по умолчанию, смотрите "
-"параметр B<admindir>, чтобы узнать, как изменить местоположение этих файлов."
+"B<dpkg -b> | B<--build> I<каталог> [I<имя файла>]\n"
+"    Собирает deb пакет.\n"
+"B<dpkg -c> | B<--contents> I<имя файла>\n"
+"    Показывает содержимое deb пакета.\n"
+"B<dpkg -e> | B<--control> I<имя файла> [I<каталог>]\n"
+"    Извлекает управляющую информацию из пакета.\n"
+"B<dpkg -x> | B<--extract> I<имя файла> <каталог>\n"
+"    Извлекает файлы, содержащиеся в данном пакете.\n"
+"B<dpkg -f> | B<--field>  I<имя файла> [I<управляющее-поле>] ...\n"
+"    Показывает управляющее(ие) поле(я) пакета.\n"
+"B<dpkg --fsys-tarfile> I<имя файла>\n"
+"    Выдает на стандартный вывод tar-файл с файловой\n"
+"    системой из указанного пакета Debian.\n"
+"B<dpkg -I> | B<--info> I<имя файла> [I<файл control>]\n"
+"    Выдает информацию о данном пакете.\n"
+"B<dpkg -X> | B<--vextract> I<имя файла> I<каталог>\n"
+"    Извлекает и выдает имена файлов, содержащиеся в пакете.\n"
 
 # type: TP
-#: dpkg.1:507
-#, no-wrap
-msgid "I</var/lib/dpkg/available>"
-msgstr "I</var/lib/dpkg/available>"
+#: dpkg.1:275
+#, fuzzy, no-wrap
+msgid "B<dpkg-query actions>"
+msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg.1:510
-msgid "List of available packages."
-msgstr "Список доступных пакетов."
-
-# type: TP
-#: dpkg.1:510
-#, no-wrap
-msgid "I</var/lib/dpkg/status>"
-msgstr "I</var/lib/dpkg/status>"
+#: dpkg.1:278
+msgid "See B<dpkg-query>(1) for more information about the following actions."
+msgstr ""
+"Смотрите B<dpkg-query>(1) для более подробной информации о нижеследующих "
+"действиях."
 
 # type: Plain text
-#: dpkg.1:516
+#: dpkg.1:291
+#, no-wrap
 msgid ""
-"Statuses of available packages. This file contains information about whether "
-"a package is marked for removing or not, whether it is installed or not, "
-"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
+"B<dpkg -l> | B<--list> I<package-name-pattern> ...\n"
+"    List packages matching given pattern.\n"
+"B<dpkg -s> | B<--status> I<package-name> ...\n"
+"    Report status of specified package.\n"
+"B<dpkg -L> | B<--listfiles> I<package> ...\n"
+"    List files installed to your system from B<package>.\n"
+"B<dpkg -S> | B<--search> I<filename-search-pattern> ...\n"
+"    Search for a filename from installed packages.\n"
+"B<dpkg -p> | B<--print-avail> I<package>\n"
+"    Display details about I<package>, as found in I</var/lib/dpkg/available>.\n"
 msgstr ""
-"Состояния доступных пакетов. Этот файл содержит информацию о том, помечен ли "
-"пакет для удаления или нет, установлен он или нет, и т.д. Смотрите раздел "
-"B<ИНФОРМАЦИЯ О ПАКЕТАХ>, где приведена подробная информация."
+"B<dpkg -l> | B<--list > I<шаблон имени пакета> ...\n"
+"    Показывает пакеты, соответствующие данному шаблону.\n"
+"B<dpkg -s> | B<--status > I<имя пакета> ...\n"
+"    Сообщает о состоянии указанного пакета.\n"
+"B<dpkg -L> | B<--listfiles> I<имя пакета> ...\n"
+"    Показывает файлы, установленные в системе из пакета с указанным именем.\n"
+"B<dpkg -S> | B<--search> I<шаблон имени файла> ...\n"
+"    Ищет в установленных пакетах имя файла по заданному шаблону.\n"
+"B<dpkg -p> | B<--print-avail> I <имя пакета>\n"
+"    Выводит детальную информацию о I<пакете>, которую извлекает\n"
+"    из файла I</var/lib/dpkg/available>.\n"
 
 # type: Plain text
-#: dpkg.1:519
+#: dpkg.1:298
 msgid ""
-"The following files are components of a binary package. See B<deb>(5)  for "
-"more information about them:"
+"All options can be specified both on the command line and in the B<dpkg> "
+"configuration file I</etc/dpkg/dpkg.cfg>. Each line in the configuration "
+"file is either an option (exactly the same as the command line option but "
+"without leading dashes) or a comment (if it starts with a B<#>)."
 msgstr ""
-"Нижеследующие файлы являются компонентами бинарного пакета. Смотрите B<deb>"
-"(5), где приведена подробная информация:"
+"Все параметры можно указывать как в командной строке, так и в "
+"конфигурационном файле B<dpkg> -- I</etc/dpkg/dpkg.cfg>. Каждая строка в "
+"конфигурационном файле должна быть либо параметром (в точности как в "
+"командной строке, но без начальных дефисов), либо комментарием (если "
+"начинается с B<#>)."
 
 # type: TP
-#: dpkg.1:519
+#: dpkg.1:299
 #, no-wrap
-msgid "I<control>"
-msgstr "I<control>"
+msgid "B<--abort-after=>I<number>"
+msgstr "B<--abort-after=>I<число>"
 
-# type: TP
-#: dpkg.1:521
-#, no-wrap
-msgid "I<conffiles>"
-msgstr "I<conffiles>"
+# type: Plain text
+#: dpkg.1:302
+#, fuzzy
+msgid "Change after how many errors B<dpkg> will abort. The default is 50."
+msgstr ""
+"Задать количество ошибок после которого dpkg аварийно завершится. По "
+"умолчанию 50."
 
 # type: TP
-#: dpkg.1:523
+#: dpkg.1:302
 #, no-wrap
-msgid "I<preinst>"
-msgstr "I<preinst>"
+msgid "B<-B>|B<--auto-deconfigure>"
+msgstr "B<-B>|B<--auto-deconfigure>"
 
-# type: TP
-#: dpkg.1:525
-#, no-wrap
-msgid "I<postinst>"
-msgstr "I<postinst>"
+# type: Plain text
+#: dpkg.1:308
+msgid ""
+"When a package is removed, there is a possibility that another installed "
+"package depended on the removed package. Specifying this option will cause "
+"automatic deconfiguration of the package which depended on the removed "
+"package."
+msgstr ""
+"При удалении пакета есть вероятность, что есть другой установленный пакет "
+"зависящий от удаляемого пакета. Указание этого параметра приведёт к "
+"автоматической деконфигурации пакета, который зависит от удаляемого пакета."
 
 # type: TP
-#: dpkg.1:527
+#: dpkg.1:308
 #, no-wrap
-msgid "I<prerm>"
-msgstr "I<prerm>"
+msgid "B<-D>I<octal>B< | --debug=>I<octal>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
 
-# type: TP
-#: dpkg.1:529
-#, no-wrap
-msgid "I<postrm>"
-msgstr "I<postrm>"
+# type: Plain text
+#: dpkg.1:314
+#, fuzzy
+msgid ""
+"Switch debugging on. I<octal> is formed by bitwise-orring desired values "
+"together from the list below (note that these values may change in future "
+"releases). B<-Dh> or B<--debug=help> display these debugging values."
+msgstr ""
+"Включить отладку. I<octal> -- это восьмеричное число, сформированное побитно "
+"из нижеуказанных битовых масок, (заметим, что эти величины могут быть "
+"изменены в следующих версиях). Параметры B<-Dh> или B<--debug-help> выводят "
+"эти отладочные значения."
 
-# type: SH
-#: dpkg.1:532
+# type: Plain text
+#: dpkg.1:326
 #, no-wrap
-msgid "ENVIRONMENT VARIABLES"
-msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
+msgid ""
+" number  description\n"
+"    1   Generally helpful progress information\n"
+"    2   Invocation and status of maintainer scripts\n"
+"   10   Output for each file processed\n"
+"  100   Lots of output for each file processed\n"
+"   20   Output for each configuration file\n"
+"  200   Lots of output for each configuration file\n"
+"   40   Dependencies and conflicts\n"
+"  400   Lots of dependencies/conflicts output\n"
+" 1000   Lots of drivel about e.g. the dpkg/info dir\n"
+" 2000   Insane amounts of drivel\n"
+msgstr ""
+"Маска   Описание\n"
+"    1   Основная полезная информация по ходу выполнения\n"
+"    2   Вызов и состояния скриптов поддержки\n"
+"   10   Вывод по каждому обработанному файлу\n"
+"  100   Подробный вывод по каждому обработанному файлу\n"
+"   20   Вывод по каждому конфигурационному файлу\n"
+"  200   Подробный вывод по каждому конфигурационному файлу\n"
+"   40   Зависимости и конфликты\n"
+"  400   Подробное освещение зависимостей и конфликтов\n"
+" 1000   Подробная ерунда, например о каталоге dpkg/info\n"
+" 2000   Невероятное количество ерунды\n"
 
 # type: TP
-#: dpkg.1:533
+#: dpkg.1:326
 #, no-wrap
-msgid "B<DPKG_NO_TSTP>"
-msgstr "B<DPKG_NO_TSTP>"
+msgid "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
+msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
 
 # type: Plain text
-#: dpkg.1:537
+#: dpkg.1:333
 msgid ""
-"Define this to something if you prefer B<dpkg> starting a new shell rather "
-"than suspending itself, while doing a shell escape."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things. I<things> is a comma separated list of things specified below. B<--"
+"force-help> displays a message describing them.  Things marked with (*) are "
+"forced by default."
 msgstr ""
-"Если она определена, то B<dpkg> при запуске оболочки не приостанавливает "
-"себя, а создаёт новый процесс."
+"Принудительно выполнять или же отказываться выполнять (B<no-force> и B<--"
+"refuse> означают одно и то же) те или иные вещи. I<things> -- это список "
+"через запятую элементов описанных далее). B<--force-help> выдает сообщение, "
+"описывающие их. Элементы, обозначенные звёздочкой (*), принудительно "
+"выполняются по умолчанию."
 
-# type: TP
-#: dpkg.1:537
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+# type: Plain text
+#: dpkg.1:337
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only. "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Предупреждение: Эти параметры предназначены только для использования "
+"экспертами. Использование без полного понимания их действия может нарушить "
+"работоспособность всей системы.>"
 
 # type: Plain text
-#: dpkg.1:540
+#: dpkg.1:340
 #, fuzzy
-msgid "The program B<dpkg> will execute when starting a new shell."
-msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
-
-# type: TP
-#: dpkg.1:540 dpkg-query.1:168
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<all>: Turns on (or off) all force options."
+msgstr "B<all>: Включить (или выключить) все принудительные параметры."
 
 # type: Plain text
-#: dpkg.1:544
+#: dpkg.1:343
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text. Currently only used by -l."
+"B<downgrade>(*): Install a package, even if newer version of it is already "
+"installed."
 msgstr ""
-"Задаёт количество колонок текста, используемых программой B<dpkg> при "
-"форматировании текста. В настоящий момент используется только с параметром "
-"B<-l>."
+"B<downgrade>(*): Установить пакет, даже если уже установлена его более новая "
+"версия."
 
-# type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
-#, no-wrap
-msgid "EXAMPLES"
-msgstr "ПРИМЕРЫ"
+# type: Plain text
+#: dpkg.1:350
+msgid ""
+"I<Warning: At present dpkg does not do any dependency checking on downgrades "
+"and therefore will not warn you if the downgrade breaks the dependency of "
+"some other package. This can have serious side effects, downgrading "
+"essential system components can even make your whole system unusable. Use "
+"with care.>"
+msgstr ""
+"I<Предупреждение: На данный момент dpkg не выполняет проверку зависимостей "
+"при переходе на более старую версию и поэтому не предупредит если это "
+"поломает зависимости с остальными пакетами. Это может иметь серьёзные "
+"последствия: замена на более старую версию системных компонентов первой "
+"необходимости может привести к полной неработоспособности системы. "
+"Использовать осторожно.>"
 
 # type: Plain text
-#: dpkg.1:547
-#, fuzzy
-msgid "To list packages related to the editor B<vi>(1):"
-msgstr "Показать список пакетов, относящихся к редактору vi:"
+#: dpkg.1:354
+msgid ""
+"B<configure-any>: Configure also any unpacked but unconfigured packages on "
+"which the current package depends."
+msgstr ""
+"B<configure-any>: Настроить также все распакованные, но ненастроенные "
+"пакеты, от которых зависит текущий пакет."
 
 # type: Plain text
-#: dpkg.1:549
-#, fuzzy, no-wrap
-msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
-msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
+#: dpkg.1:357
+msgid "B<hold>: Process packages even when marked \"hold\"."
+msgstr "B<hold>: Обрабатывать даже пакеты, помеченные как \"зафиксированные\"."
 
 # type: Plain text
-#: dpkg.1:552
-#, fuzzy
-msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
-msgstr "Посмотреть записи о двух пакетах в файле B</var/lib/dpkg/available>:"
+#: dpkg.1:362
+msgid ""
+"B<remove-reinstreq>: Remove a package, even if it's broken and marked to "
+"require reinstallation. This may, for example, cause parts of the package to "
+"remain on the system, which will then be forgotten by B<dpkg>."
+msgstr ""
+"B<remove-reinstreq>: Удалить пакет, даже если он сломан и отмечен как "
+"требующий переустановки. Это может, например, привести к тому, что части "
+"пакета останутся в системе, а B<dpkg> про них забудет."
 
 # type: Plain text
-#: dpkg.1:554
-#, fuzzy, no-wrap
-msgid "     B<dpkg --print-avail elvis vim | less>\n"
-msgstr "B< dpkg --print-avail elvis vim | less>"
+#: dpkg.1:367
+msgid ""
+"B<remove-essential>: Remove, even if the package is considered essential. "
+"Essential packages contain mostly very basic Unix commands. Removing them "
+"might cause the whole system to stop working, so use with caution."
+msgstr ""
+"B<remove-essential>: Удалить, даже если это пакет первой необходимости "
+"(имеет приоритет \"Essential\"). Эти пакеты в основном содержат базовые "
+"команды Unix. Удаление такого пакета может привести к потере "
+"работоспособности системы, так что используйте данный параметр осторожно."
 
 # type: Plain text
-#: dpkg.1:557
-msgid "To search the listing of packages yourself:"
-msgstr "Вручную просмотреть список пакетов:"
+#: dpkg.1:370
+msgid "B<depends>: Turn all dependency problems into warnings."
+msgstr "B<depends>: Превратить проблемы с зависимостями в предупреждения."
 
 # type: Plain text
-#: dpkg.1:559
-#, fuzzy, no-wrap
-msgid "     B<less /var/lib/dpkg/available>\n"
-msgstr "B< less /var/lib/dpkg/available>"
+#: dpkg.1:373
+msgid ""
+"B<depends-version>: Don't care about versions when checking dependencies."
+msgstr ""
+"B<depends-version>: Не обращать внимание на версии при проверке зависимостей."
 
 # type: Plain text
-#: dpkg.1:562
-msgid "To remove an installed elvis package:"
-msgstr "Удалить установленный пакет elvis:"
+#: dpkg.1:377
+msgid ""
+"B<conflicts>: Install, even if it conflicts with another package. This is "
+"dangerous, for it will usually cause overwriting of some files."
+msgstr ""
+"B<conflicts>: Установить, даже если пакет конфликтует с другим пакетом. Это "
+"опасно, так как обычно приводит к перезаписи некоторых файлов."
 
 # type: Plain text
-#: dpkg.1:564
-#, fuzzy, no-wrap
-msgid "     B<dpkg -r elvis>\n"
-msgstr "B< dpkg -r elvis>"
+#: dpkg.1:382
+msgid ""
+"B<confmiss>: Always install a missing configuration file. This is dangerous, "
+"since it means not preserving a change (removing) made to the file."
+msgstr ""
+"B<confmiss>: Всегда устанавливать пропущенный конфигурационный файл. Это "
+"опасно, так как не будут сохранены изменения (удаление) файла."
 
 # type: Plain text
-#: dpkg.1:569
+#: dpkg.1:387
 msgid ""
-"To install a package, you first need to find it in an archive or CDROM. The "
-"\"available\" file shows that the vim package is in section \"editors\":"
+"B<confnew>: If a conffile has been modified always install the new version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
 msgstr ""
-"Чтобы установить пакет, сначала нужно найти его в архиве или на CDROM. Файл "
-"\"available\" показывает, что пакет vim находится в секции \"editors"
-"\" (\"редакторы\"):"
+"B<confnew>: Если конфигурационный файл был изменён, то всегда устанавливать "
+"новую версию без запроса подтверждения, если не задан также параметр B<--"
+"force-confdef>, при котором предпочтение отдаётся действию по умолчанию."
+
+# type: Plain text
+#: dpkg.1:392
+msgid ""
+"B<confold>: If a conffile has been modified always keep the old version "
+"without prompting, unless the B<--force-confdef> is also specified, in which "
+"case the default action is preferred."
+msgstr ""
+"B<confold>: Если конфигурационный файл был изменён, всегда сохранять старую "
+"версию без запроса подтверждения, если не задан также параметр B<--force-"
+"confdef>, при котором предпочтение отдаётся действию по умолчанию."
 
 # type: Plain text
-#: dpkg.1:572
-#, fuzzy, no-wrap
+#: dpkg.1:398
 msgid ""
-"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
-"     B<dpkg -i vim_4.5-3.deb>\n"
-msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
+"B<confdef>: If a conffile has been modified always choose the default "
+"action. If there is no default action it will stop to ask the user unless "
+"B<--force-confnew> or B<--force-confold> is also been given, in which case "
+"it will use that to decide the final action."
+msgstr ""
+"B<confdef>: Если конфигурационный файл был изменён, всегда выбирать действие "
+"по умолчанию. Если такового нет, то спросить у пользователя, если не задан "
+"параметр B<--force-confnew> или B<--force-confold> (в этом случае "
+"соответствующий параметр используется для выяснения, что именно нужно "
+"делать)."
 
 # type: Plain text
-#: dpkg.1:575
-msgid "To make a local copy of the package selection states:"
-msgstr "Получить локальную копию состояний выбранных пакетов:"
+#: dpkg.1:401
+msgid "B<overwrite>: Overwrite one package's file with another's file."
+msgstr ""
+"B<overwrite>: Перезаписать файл из одного пакета файлом из другого пакета."
 
 # type: Plain text
-#: dpkg.1:577
-#, fuzzy, no-wrap
-msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "B< dpkg --get-selections E<gt>myselections>"
+#: dpkg.1:404
+msgid "B<overwrite-dir> Overwrite one package's directory with another's file."
+msgstr ""
+"B<overwrite-dir>: Перезаписать каталог из одного пакета файлом из другого."
 
 # type: Plain text
-#: dpkg.1:581
+#: dpkg.1:407
 msgid ""
-"You might transfer this file to another computer, and install it there with:"
+"B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
-"Вы можете перенести этот файл на другой компьютер и установить его там с "
-"помощью:"
+"B<overwrite-diverted>: Перезаписать файл с изменённым расположением"
+"(diverted) его неизменённой версией."
 
 # type: Plain text
-#: dpkg.1:584
-#, fuzzy, no-wrap
-msgid ""
-"     B<dpkg --clear-selections>\n"
-"     B<dpkg --set-selections E<lt>myselections>\n"
-msgstr "B< dpkg --set-selections E<lt>myselections>"
+#: dpkg.1:410
+msgid "B<architecture>: Process even packages with the wrong architecture."
+msgstr "B<architecture>: Обрабатывать даже пакеты с неправильной архитектурой."
 
 # type: Plain text
-#: dpkg.1:590
+#: dpkg.1:413
 msgid ""
-"Note that this will not actually install or remove anything, but just set "
-"the selection state on the requested packages. You will need some other "
-"application to actually download and install the requested packages. For "
-"example, run B<dselect> and choose \"Install\"."
+"B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
-"Заметим, что при этом ничего не будет ни установлено, ни удалено, просто "
-"будут заданы состояния запрошенных пакетов. Для того, чтобы на самом деле "
-"скачать и установить запрошенные пакеты, вам понадобится другая программа. "
-"Например, запустите B<dselect> и выберите \"Установить\"."
+"B<bad-path>: В B<PATH> отсутствуют важные программы, поэтому могут "
+"возникнуть проблемы."
 
 # type: Plain text
-#: dpkg.1:593
-msgid ""
-"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
-"to modify the package selection states."
+#: dpkg.1:416
+msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
-"Обычно B<dselect>(8) предоставляет более удобный способ изменить состояния "
-"выбранных пакетов."
+"B<not-root>: Попытаться установить или удалить пакет, даже если не нет прав "
+"суперпользователя."
 
-# type: SH
-#: dpkg.1:595
+# type: Plain text
+#: dpkg.1:419
+msgid "B<bad-verify>: Install a package even if it fails authenticity check."
+msgstr ""
+"B<bad-verify>: Устанавливать пакет, даже если он не прошёл проверку "
+"подлинности."
+
+# type: TP
+#: dpkg.1:420
 #, no-wrap
-msgid "ADDITIONAL FUNCTIONALITY"
-msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ"
+msgid "B<--ignore-depends>=I<package>,..."
+msgstr "B<--ignore-depends>=I<пакет>,..."
 
 # type: Plain text
-#: dpkg.1:598
+#: dpkg.1:424
 msgid ""
-"Additional functionality can be gained by installing any of the following "
-"packages: I<apt>, I<aptitude> and I<debsums>."
+"Ignore dependency-checking for specified packages (actually, checking is "
+"performed, but only warnings about conflicts are given, nothing else)."
 msgstr ""
-"Дополнительная функциональность может быть получена установкой любых "
-"следующих пакетов: I<apt>, I<aptitude> и I<debsums>."
+"Игнорировать проверку зависимостей для указанных пакетов (на самом деле, "
+"проверка выполняется, но выдаются только предупреждения о конфликтах и "
+"ничего более)."
+
+# type: TP
+#: dpkg.1:424
+#, no-wrap
+msgid "B<--new> | B<--old>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg.1:608
+#: dpkg.1:428
 msgid ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
+"Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
 msgstr ""
-"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
-"(5), B<dpkg.cfg>(5) и B<dpkg-reconfigure>(8)."
-
-# type: Plain text
-#: dpkg.1:611
-msgid "B<--no-act> usually gives less information than might be helpful."
-msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
+"Выбрать, соответственно, новый или старый формат пакета. Это параметр "
+"программы B<dpkg-deb>(1)."
 
-# type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
+# type: TP
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
-msgid "AUTHORS"
-msgstr "АВТОРЫ"
+msgid "B<--nocheck>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg.1:616
-#, no-wrap
+#: dpkg.1:432
 msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
-"contributed to B<dpkg>.\n"
-msgstr "Смотрите файл I</usr/share/doc/dpkg/THANKS>, где приведён список тех, кто участвовал в разработке B<dpkg>.\n"
+"Don't read or check contents of control file while building a package.  This "
+"is a B<dpkg-deb>(1) option."
+msgstr ""
+"Не читать и не проверять содержимое файла control при создании пакета. Это "
+"параметр программы B<dpkg-deb>(1)."
 
 # type: TP
-#: dpkg-architecture.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-architecture"
-msgstr "B<dpkg --print-architecture>"
-
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, fuzzy, no-wrap
-msgid "2006-06-17"
-msgstr "2006-02-28"
+#: dpkg.1:432
+#, no-wrap
+msgid "B<--no-act> | B<--dry-run> | B<--simulate>"
+msgstr "B<--no-act> | B<--dry-run> | B<--simulate>"
 
 # type: Plain text
-#: dpkg-architecture.1:4
+#: dpkg.1:437
 msgid ""
-"dpkg-architecture - set and determine the architecture for package building"
+"Do everything which is supposed to be done, but don't write any changes. "
+"This is used to see what would happen with the specified action, without "
+"actually modifying anything."
 msgstr ""
+"Делать всё, что необходимо, но не записывать на диск изменения. Он "
+"используется для того, чтобы посмотреть, что произошло бы при выполнении "
+"указанного действия, но при этом ничего не меняется."
 
 # type: Plain text
-#: dpkg-architecture.1:9
-#, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+#: dpkg.1:442
+msgid ""
+"Be sure to give B<--no-act> before the action-parameter, or you might end up "
+"with undesirable results. (e.g. B<dpkg --purge foo --no-act> will first "
+"purge package foo and then try to purge package --no-act, even though you "
+"probably expected it to actually do nothing)"
+msgstr ""
+"Убедитесь, что указали B<--no-act> перед действием, или у вас могут "
+"получиться нежелаемые результаты. (например, B<dpkg --purge foo --no-act> "
+"сперва выполнит полное удаление пакета foo, а затем будет пытаться полностью "
+"удалить пакет --no-act, хотя вы ожидали, что ничего выполнено не будет)"
+
+# type: TP
+#: dpkg.1:442
+#, no-wrap
+msgid "B<-R> | B<--recursive>"
+msgstr "B<-R> | B<--recursive>"
 
 # type: Plain text
-#: dpkg-architecture.1:14
+#: dpkg.1:448
 msgid ""
-"dpkg-architecture does provide a facility to determine and set the build and "
-"host architecture for package building."
+"Recursively handle all regular files matching pattern B<*.deb> found at "
+"specified directories and all of its subdirectories. This can be used with "
+"B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgstr ""
+"Рекурсивная обработать все файлы, отвечающие шаблону B<*.deb>, которые "
+"найдены в заданных каталогах и во всех их подкаталогах. Этот параметр можно "
+"использовать вместе с действиями B<-i>, B<-A>, B<--install>, B<--unpack> и "
+"B<--avail>."
+
+# type: TP
+#: dpkg.1:448
+#, no-wrap
+msgid "B<-G>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:17
+#: dpkg.1:452
+#, fuzzy
 msgid ""
-"The build architecture is always determined by an external call to B<dpkg>"
-"(1), and can not be set at the command line."
+"Don't install a package if a newer version of the same package is already "
+"installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
+"Не устанавливать пакет, если новая версия такого же пакета уже установлена. "
+"Это синоним параметра B<--refuse-downgrade>."
+
+# type: TP
+#: dpkg.1:452
+#, no-wrap
+msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
+msgstr "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
 
 # type: Plain text
-#: dpkg-architecture.1:26
+#: dpkg.1:463
+#, fuzzy
 msgid ""
-"You can specify the host architecture by providing one or both of the "
-"options B<-a> and B<-t>. The default is determined by an external call to "
-"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
-"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
-"the other will be set to a usable default. Indeed, it is often better to "
-"only specify one, because B<dpkg-architecture> will warn you if your choice "
-"does not match the default."
+"Change default directories. B<admindir> defaults to I</var/lib/dpkg> and "
+"contains many files that give information about status of installed or "
+"uninstalled packages, etc. B<instdir> defaults to I</> and refers to the "
+"directory where packages are to be installed. B<instdir> is also the "
+"directory passed to B<chroot>(2) before running package's installation "
+"scripts, which means that the scripts see B<instdir> as a root directory.  "
+"Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
+"var/lib/dpkg>."
 msgstr ""
+"Изменить каталоги по умолчанию. Каталог B<admindir> по умолчанию имеет "
+"значение B</var/lib/dpkg> и содержит много файлов, в которых даётся "
+"информация о состоянии установленных или удалённых пакетов и т.д. Каталог "
+"B<instdir> по умолчанию равен I</> и указывает каталог, куда будут "
+"устанавливаться пакеты. Он также передаётся функции B<chroot>(2) перед "
+"запуском сценария установки B<пакета> -- это означает, что сценарии будут "
+"считать B<instdir> корневым каталогом. Изменение каталога B<root> "
+"устанавливает каталог B<instdir> в значение B<dir>, а каталога B<admindir> "
+"-- в значение I<dir>B</var/lib/dpkg>."
 
 # type: TP
-#: dpkg-architecture.1:28
-#, fuzzy, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<dpkg --print-architecture>"
+#: dpkg.1:463
+#, no-wrap
+msgid "B<-O> | B<--selected-only>"
+msgstr "B<-O> | B<--selected-only>"
 
 # type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
+#: dpkg.1:469
+msgid ""
+"Only process the packages that are selected for installation. The actual "
+"marking is done with B<dselect> or by B<dpkg>, when it handles packages. For "
+"example, when a package is removed, it will be marked selected for "
+"deinstallation."
 msgstr ""
+"Обрабатывать только пакеты, выбранные для установки. Такой выбор делается "
+"программой B<dselect> или же самой программой B<dpkg> при работе с пакетами. "
+"Например, когда пакет удаляется, он будет помечен для удаления."
 
 # type: TP
-#: dpkg-architecture.1:31
+#: dpkg.1:469
 #, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr ""
+msgid "B<-E> | B<--skip-same-version>"
+msgstr "B<-E> | B<--skip-same-version>"
 
 # type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
+#: dpkg.1:473
+msgid ""
+"Don't install the package if the same version of the package is already "
+"installed."
 msgstr ""
+"Не устанавливать пакет, если та же версия этого пакета уже установлена."
 
 # type: TP
-#: dpkg-architecture.1:34
-#, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "B<-B>"
+#: dpkg.1:473
+#, no-wrap
+msgid "B<--status-fd >I<E<lt>nE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-architecture.1:41
+#: dpkg.1:480
+#, fuzzy
 msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
+"Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
+"given multiple times. Status updates are of the form `status: E<lt>pkgE<gt>: "
+"E<lt>pkg stateE<gt>'.  Errors are reported as `status: E<lt>pkgE<gt>: error: "
+"extend-error-message'.  Configuration file conflicts are reported as "
+"`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' "
+"useredited distedited'."
 msgstr ""
+"Послать информацию о состоянии пакета в файловый дескриптор I<E<lt>nE<gt>>. "
+"Этот параметр можно задавать несколько раз. Эта информация выдаётся в виде "
+"`status: E<lt>pkgE<gt>: E<lt>pkg qstateE<gt>'. Ошибки выдаются в форме "
+"`status: E<lt>pkgE<gt>: error: extend-error-message'. Конфликты "
+"конфигурационных файлов выдаются в форме `status: conffile-prompt: "
+"conffile : 'current-conffile' 'new-conffile' useredited distedited'"
 
 # type: TP
-#: dpkg-architecture.1:43
-#, fuzzy, no-wrap
-msgid "B<-l>"
-msgstr "B<-B>"
+#: dpkg.1:480
+#, no-wrap
+msgid "B<--log=>I<filename>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg.1:492
+#, fuzzy
 msgid ""
-"Print the environment variables, one each line, in the format "
-"I<VARIABLE=value>. This is the default action."
+"Log status change updates and actions to I<filename>, instead of the default "
+"I</var/log/dpkg.log>. If this option is given multiple times, the last "
+"filename is used. Log messages are of the form `YYYY-MM-DD HH:MM:SS status "
+"E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt>' for status change "
+"updates; `YYYY-MM-DD HH:MM:SS E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt> E<lt>available-versionE<gt>' for actions where "
+"I<E<lt>actionE<gt>> is one of install, upgrade, remove, purge; and `YYYY-MM-"
+"DD HH:MM:SS conffile E<lt>filenameE<gt> E<lt>decisionE<gt>' for conffile "
+"changes where I<E<lt>decisionE<gt>> is either install or keep."
 msgstr ""
+"Протоколировать изменения обновлений и действия в I<файл>, вместо файл по "
+"умолчанию I</var/log/dpkg.log>. Если этот параметр указан несколько раз, то "
+"используется последнее имя файла. Протоколируемые сообщения имеют вид `YYYY-"
+"MM-DD HH:MM:SS status E<lt>stateE<gt> E<lt>pkgE<gt> E<lt>installed-"
+"versionE<gt>' при изменении состояния обновлений; `YYYY-MM-DD HH:MM:SS "
+"E<lt>actionE<gt> E<lt>pkgE<gt> E<lt>installed-versionE<gt> E<lt>available-"
+"versionE<gt>' при выполнении действия, где I<E<lt>actionE<gt>> может быть "
+"install, upgrade, remove, purge; и `YYYY-MM-DD HH:MM:SS conffile "
+"E<lt>filenameE<gt> E<lt>decisionE<gt>' при изменении конфигурационных "
+"файлов, \n"
+"где I<E<lt>decision> может быть install или keep."
 
 # type: TP
-#: dpkg-architecture.1:47
-#, fuzzy, no-wrap
-msgid "B<-e>I<debian-architecture>"
-msgstr "B<dpkg --print-architecture>"
+#: dpkg.1:492
+#, no-wrap
+msgid "B<--no-debsig>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
-msgid ""
-"Check for equality of architecture. By default I<debian-architecture> is "
-"compared against the current Debian architecture, being the host.  This "
-"action will not expand the architecture wildcards. Command finishes with an "
-"exit status of 0 if matched, 1 if not matched."
-msgstr ""
+#: dpkg.1:495
+msgid "Do not try to verify package signatures."
+msgstr "Не пытаться проверять подпись пакета."
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg.1:497 dpkg.cfg.5:14
 #, no-wrap
-msgid "B<-i>I<architecture-wildcard>"
-msgstr ""
+msgid "I</etc/dpkg/dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-architecture.1:59
-msgid ""
-"Check for identity of architecture by expanding I<architecture-wildcard> as "
-"an architecture wildcard and comparing against the current Debian "
-"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
-"matched."
-msgstr ""
+#: dpkg.1:500
+msgid "Configuration file with default options."
+msgstr "Файл конфигурации с параметрами по умолчанию."
 
 # type: TP
-#: dpkg-architecture.1:59
-#, fuzzy, no-wrap
-msgid "B<-q>I<variable-name>"
-msgstr "B<--log=>I<имя файла>"
+#: dpkg.1:500
+#, no-wrap
+msgid "I</var/log/dpkg.log>"
+msgstr "I</var/log/dpkg.log>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
-msgid "Print the value of a single variable."
+#: dpkg.1:504
+msgid "Default log file (see I</etc/dpkg/dpkg.cfg>(5) and option B<--log>)."
 msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:62
-#, fuzzy, no-wrap
-msgid "B<-s>"
-msgstr "B<-B>"
+"Файл журнала по умолчанию (смотрите I</etc/dpkg/dpkg.cfg>(5) и параметр B<--"
+"log>)."
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg.1:507
 msgid ""
-"Print an export command. This can be used to set the environment variables "
-"using eval."
+"The other files listed below are in their default directories, see option "
+"B<--admindir> to see how to change locations of these files."
 msgstr ""
+"Остальные файлы перечислены с указанием их каталогов по умолчанию, смотрите "
+"параметр B<admindir>, чтобы узнать, как изменить местоположение этих файлов."
 
 # type: TP
-#: dpkg-architecture.1:66
-#, fuzzy, no-wrap
-msgid "B<-u>"
-msgstr "B<-B>"
+#: dpkg.1:507
+#, no-wrap
+msgid "I</var/lib/dpkg/available>"
+msgstr "I</var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:69
-msgid "Print a similar command to B<-s> but to unset all variables."
-msgstr ""
+#: dpkg.1:510
+msgid "List of available packages."
+msgstr "Список доступных пакетов."
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg.1:510
 #, no-wrap
-msgid "B<-c>I< command>"
-msgstr ""
+msgid "I</var/lib/dpkg/status>"
+msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg.1:516
 msgid ""
-"Execute a I<command> in an environment which has all variables set to the "
-"determined value."
+"Statuses of available packages. This file contains information about whether "
+"a package is marked for removing or not, whether it is installed or not, "
+"etc. See section B<INFORMATION ABOUT PACKAGES> for more info."
 msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:73
-#, fuzzy, no-wrap
-msgid "B<-L>"
-msgstr "B<-B>"
+"Состояния доступных пакетов. Этот файл содержит информацию о том, помечен ли "
+"пакет для удаления или нет, установлен он или нет, и т.д. Смотрите раздел "
+"B<ИНФОРМАЦИЯ О ПАКЕТАХ>, где приведена подробная информация."
 
 # type: Plain text
-#: dpkg-architecture.1:76
-msgid "Print a list of valid architecture names."
+#: dpkg.1:519
+msgid ""
+"The following files are components of a binary package. See B<deb>(5)  for "
+"more information about them:"
 msgstr ""
+"Нижеследующие файлы являются компонентами бинарного пакета. Смотрите B<deb>"
+"(5), где приведена подробная информация:"
 
-# type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
-msgstr ""
+# type: TP
+#: dpkg.1:519
+#, no-wrap
+msgid "I<control>"
+msgstr "I<control>"
 
-# type: Plain text
-#: dpkg-architecture.1:82
-msgid "Print program version."
-msgstr ""
+# type: TP
+#: dpkg.1:521
+#, no-wrap
+msgid "I<conffiles>"
+msgstr "I<conffiles>"
 
-# type: SH
-#: dpkg-architecture.1:83
+# type: TP
+#: dpkg.1:523
 #, no-wrap
-msgid "TERMS"
-msgstr ""
+msgid "I<preinst>"
+msgstr "I<preinst>"
 
-# type: IP
-#: dpkg-architecture.1:84
+# type: TP
+#: dpkg.1:525
 #, no-wrap
-msgid "build machine"
-msgstr ""
+msgid "I<postinst>"
+msgstr "I<postinst>"
 
-# type: Plain text
-#: dpkg-architecture.1:86
-msgid "The machine the package is built on."
-msgstr ""
+# type: TP
+#: dpkg.1:527
+#, no-wrap
+msgid "I<prerm>"
+msgstr "I<prerm>"
 
-# type: IP
-#: dpkg-architecture.1:86
+# type: TP
+#: dpkg.1:529
 #, no-wrap
-msgid "host machine"
-msgstr ""
+msgid "I<postrm>"
+msgstr "I<postrm>"
 
-# type: Plain text
-#: dpkg-architecture.1:88
-msgid "The machine the package is built for."
-msgstr ""
+# type: SH
+#: dpkg.1:532
+#, no-wrap
+msgid "ENVIRONMENT VARIABLES"
+msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
-# type: TH
-#: dpkg-architecture.1:88
-#, fuzzy, no-wrap
-msgid "Debian architecture"
-msgstr "Проект Debian"
+# type: TP
+#: dpkg.1:533
+#, no-wrap
+msgid "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_NO_TSTP>"
 
 # type: Plain text
-#: dpkg-architecture.1:91
+#: dpkg.1:537
 msgid ""
-"The Debian architecture string, which specifies the binary tree in the \\s-"
-"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
+"Define this to something if you prefer B<dpkg> starting a new shell rather "
+"than suspending itself, while doing a shell escape."
 msgstr ""
+"Если она определена, то B<dpkg> при запуске оболочки не приостанавливает "
+"себя, а создаёт новый процесс."
 
-# type: IP
-#: dpkg-architecture.1:91
+# type: TP
+#: dpkg.1:537
 #, no-wrap
-msgid "architecture wildcard"
-msgstr ""
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
+
+# type: Plain text
+#: dpkg.1:540
+#, fuzzy
+msgid "The program B<dpkg> will execute when starting a new shell."
+msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
+
+# type: TP
+#: dpkg.1:540 dpkg-query.1:144
+#, no-wrap
+msgid "B<COLUMNS>"
+msgstr "B<COLUMNS>"
 
 # type: Plain text
-#: dpkg-architecture.1:95
+#: dpkg.1:544
 msgid ""
-"An architecture wildcard is a special architecture string that will match "
-"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
-"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
+"Sets the number of columns B<dpkg> should use when displaying formatted "
+"text. Currently only used by -l."
 msgstr ""
+"Задаёт количество колонок текста, используемых программой B<dpkg> при "
+"форматировании текста. В настоящий момент используется только с параметром "
+"B<-l>."
 
-# type: IP
-#: dpkg-architecture.1:95
+# type: SH
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
-msgid "\\s-1GNU\\s0 system type"
-msgstr ""
+msgid "EXAMPLES"
+msgstr "ПРИМЕРЫ"
 
 # type: Plain text
-#: dpkg-architecture.1:99
-msgid ""
-"An architecture specification string consisting of two parts separated by a "
-"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
-"x86_64-netbsd."
-msgstr ""
+#: dpkg.1:547
+#, fuzzy
+msgid "To list packages related to the editor B<vi>(1):"
+msgstr "Показать список пакетов, относящихся к редактору vi:"
 
 # type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
+#: dpkg.1:549
+#, fuzzy, no-wrap
+msgid "     B<dpkg -l \\(aq*vi*\\(aq>\n"
+msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
 
 # type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
+#: dpkg.1:552
+#, fuzzy
+msgid "To see the entries in I</var/lib/dpkg/available> of two packages:"
+msgstr "Посмотреть записи о двух пакетах в файле B</var/lib/dpkg/available>:"
 
 # type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-msgstr ""
+#: dpkg.1:554
+#, fuzzy, no-wrap
+msgid "     B<dpkg --print-avail elvis vim | less>\n"
+msgstr "B< dpkg --print-avail elvis vim | less>"
 
 # type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
-msgstr ""
+#: dpkg.1:557
+msgid "To search the listing of packages yourself:"
+msgstr "Вручную просмотреть список пакетов:"
 
 # type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr ""
+#: dpkg.1:559
+#, fuzzy, no-wrap
+msgid "     B<less /var/lib/dpkg/available>\n"
+msgstr "B< less /var/lib/dpkg/available>"
 
 # type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr ""
+#: dpkg.1:562
+msgid "To remove an installed elvis package:"
+msgstr "Удалить установленный пакет elvis:"
 
 # type: Plain text
-#: dpkg-architecture.1:117
-msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
-msgstr ""
+#: dpkg.1:564
+#, fuzzy, no-wrap
+msgid "     B<dpkg -r elvis>\n"
+msgstr "B< dpkg -r elvis>"
 
 # type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
+#: dpkg.1:569
+msgid ""
+"To install a package, you first need to find it in an archive or CDROM. The "
+"\"available\" file shows that the vim package is in section \"editors\":"
 msgstr ""
+"Чтобы установить пакет, сначала нужно найти его в архиве или на CDROM. Файл "
+"\"available\" показывает, что пакет vim находится в секции \"editors"
+"\" (\"редакторы\"):"
 
 # type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
-
-# type: SH
-#: dpkg-architecture.1:122
+#: dpkg.1:572
 #, fuzzy, no-wrap
-msgid "VARIABLES"
-msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
+msgid ""
+"     B<cd /cdrom/hamm/hamm/binary/editors>\n"
+"     B<dpkg -i vim_4.5-3.deb>\n"
+msgstr "B< cd /cdrom/hamm/hamm/binary/editors> B< dpkg -i vim_4.5-3.deb>"
 
 # type: Plain text
-#: dpkg-architecture.1:124
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:124
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH\\s0"
-msgstr ""
+#: dpkg.1:575
+msgid "To make a local copy of the package selection states:"
+msgstr "Получить локальную копию состояний выбранных пакетов:"
 
 # type: Plain text
-#: dpkg-architecture.1:126
-msgid "The Debian architecture of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:126
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
-msgstr ""
+#: dpkg.1:577
+#, fuzzy, no-wrap
+msgid "     B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "B< dpkg --get-selections E<gt>myselections>"
 
 # type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:128
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+#: dpkg.1:581
+msgid ""
+"You might transfer this file to another computer, and install it there with:"
 msgstr ""
+"Вы можете перенести этот файл на другой компьютер и установить его там с "
+"помощью:"
 
 # type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
-msgstr ""
+#: dpkg.1:584
+#, fuzzy, no-wrap
+msgid ""
+"     B<dpkg --clear-selections>\n"
+"     B<dpkg --set-selections E<lt>myselections>\n"
+msgstr "B< dpkg --set-selections E<lt>myselections>"
 
-# type: IP
-#: dpkg-architecture.1:130
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
+# type: Plain text
+#: dpkg.1:590
+msgid ""
+"Note that this will not actually install or remove anything, but just set "
+"the selection state on the requested packages. You will need some other "
+"application to actually download and install the requested packages. For "
+"example, run B<dselect> and choose \"Install\"."
 msgstr ""
+"Заметим, что при этом ничего не будет ни установлено, ни удалено, просто "
+"будут заданы состояния запрошенных пакетов. Для того, чтобы на самом деле "
+"скачать и установить запрошенные пакеты, вам понадобится другая программа. "
+"Например, запустите B<dselect> и выберите \"Установить\"."
 
 # type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
+#: dpkg.1:593
+msgid ""
+"Ordinarily, you will find that B<dselect>(1) provides a more convenient way "
+"to modify the package selection states."
 msgstr ""
+"Обычно B<dselect>(8) предоставляет более удобный способ изменить состояния "
+"выбранных пакетов."
 
-# type: IP
-#: dpkg-architecture.1:132
+# type: SH
+#: dpkg.1:595
 #, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr ""
+msgid "ADDITIONAL FUNCTIONALITY"
+msgstr "ДОПОЛНИТЕЛЬНАЯ ФУНКЦИОНАЛЬНОСТЬ"
 
 # type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
+#: dpkg.1:598
+msgid ""
+"Additional functionality can be gained by installing any of the following "
+"packages: I<apt>, I<aptitude> and I<debsums>."
 msgstr ""
+"Дополнительная функциональность может быть получена установкой любых "
+"следующих пакетов: I<apt>, I<aptitude> и I<debsums>."
 
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+# type: Plain text
+#: dpkg.1:608
+msgid ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5), and B<dpkg-reconfigure>(8)."
 msgstr ""
+"B<dselect>(1), B<dpkg-deb>(1), B<dpkg-query>(1), B<deb>(5), B<deb-control>"
+"(5), B<dpkg.cfg>(5) и B<dpkg-reconfigure>(8)."
 
 # type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
-msgstr ""
+#: dpkg.1:611
+msgid "B<--no-act> usually gives less information than might be helpful."
+msgstr "B<--no-act> обычно дает меньше информации, чем могло бы быть полезным."
 
-# type: IP
-#: dpkg-architecture.1:136
+# type: SH
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
-msgstr ""
+msgid "AUTHORS"
+msgstr "АВТОРЫ"
 
 # type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:138
+#: dpkg.1:616
 #, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr ""
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have\n"
+"contributed to B<dpkg>.\n"
+msgstr "Смотрите файл I</usr/share/doc/dpkg/THANKS>, где приведён список тех, кто участвовал в разработке B<dpkg>.\n"
+
+# type: TP
+#: dpkg-architecture.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-architecture"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
+#: dpkg-architecture.1:4
+msgid ""
+"dpkg-architecture - set and determine the architecture for package building"
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:140
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
-msgstr ""
+# type: Plain text
+#: dpkg-architecture.1:9
+#, fuzzy
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
+#: dpkg-architecture.1:14
+msgid ""
+"dpkg-architecture does provide a facility to determine and set the build and "
+"host architecture for package building."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:142
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+# type: Plain text
+#: dpkg-architecture.1:17
+msgid ""
+"The build architecture is always determined by an external call to B<dpkg>"
+"(1), and can not be set at the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
+#: dpkg-architecture.1:26
+msgid ""
+"You can specify the host architecture by providing one or both of the "
+"options B<-a> and B<-t>. The default is determined by an external call to "
+"B<gcc>(1), or the same as the build architecture if \\s-1CC\\s0 or gcc are "
+"both not available. One out of B<-a> and B<-t> is sufficient, the value of "
+"the other will be set to a usable default. Indeed, it is often better to "
+"only specify one, because B<dpkg-architecture> will warn you if your choice "
+"does not match the default."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:144
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgid "COMMANDS"
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:28
+#, fuzzy, no-wrap
+msgid "B<-l>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg-architecture.1:32
+msgid ""
+"Print the environment variables, one each line, in the format "
+"I<VARIABLE=value>. This is the default action."
 msgstr ""
 
-# type: IP
-#: dpkg-architecture.1:146
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:32
+#, fuzzy, no-wrap
+msgid "B<-e>I<debian-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+#: dpkg-architecture.1:38
+msgid ""
+"Check for equality of architecture. By default I<debian-architecture> is "
+"compared against the current Debian architecture, being the host.  This "
+"action will not expand the architecture wildcards. Command finishes with an "
+"exit status of 0 if matched, 1 if not matched."
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:149
+# type: TP
+#: dpkg-architecture.1:38
 #, no-wrap
-msgid "DEBIAN/RULES"
+msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:157
+#: dpkg-architecture.1:44
 msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
+"Check for identity of architecture by expanding I<architecture-wildcard> as "
+"an architecture wildcard and comparing against the current Debian "
+"architecture. Command finishes with an exit status of 0 if matched, 1 if not "
+"matched."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:44
+#, fuzzy, no-wrap
+msgid "B<-q>I<variable-name>"
+msgstr "B<--log=>I<имя файла>"
+
 # type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
+#: dpkg-architecture.1:47
+msgid "Print the value of a single variable."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:47
+#, fuzzy, no-wrap
+msgid "B<-s>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:164
-#, no-wrap
+#: dpkg-architecture.1:51
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
+"Print an export command. This can be used to set the environment variables "
+"using eval."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
-msgstr ""
+# type: TP
+#: dpkg-architecture.1:51
+#, fuzzy, no-wrap
+msgid "B<-u>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+#: dpkg-architecture.1:54
+msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:173
+# type: TP
+#: dpkg-architecture.1:54
 #, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:183
-#, no-wrap
+#: dpkg-architecture.1:58
 msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+"Execute a I<command> in an environment which has all variables set to the "
+"determined value."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:58
+#, fuzzy, no-wrap
+msgid "B<-L>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
+#: dpkg-architecture.1:61
+msgid "Print a list of valid architecture names."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:69
+#, fuzzy, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<dpkg --print-architecture>"
+
 # type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:193
+# type: TP
+#: dpkg-architecture.1:72
 #, no-wrap
-msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
+msgid "B<-t>I<gnu-system-type>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:197
-msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-architecture.1:202
+#: dpkg-architecture.1:82
 msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
 
 # type: SH
-#: dpkg-architecture.1:203
+#: dpkg-architecture.1:83
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
+msgid "TERMS"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:209
-msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+# type: IP
+#: dpkg-architecture.1:84
+#, no-wrap
+msgid "build machine"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+#: dpkg-architecture.1:86
+msgid "The machine the package is built on."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:218
+# type: IP
+#: dpkg-architecture.1:86
 #, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgid "host machine"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:232
-#, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+#: dpkg-architecture.1:88
+msgid "The machine the package is built for."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
-msgstr ""
+# type: TH
+#: dpkg-architecture.1:88
+#, fuzzy, no-wrap
+msgid "Debian architecture"
+msgstr "Проект Debian"
 
 # type: Plain text
-#: dpkg-architecture.1:238
+#: dpkg-architecture.1:91
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"The Debian architecture string, which specifies the binary tree in the \\s-"
+"1FTP\\s0 archive. Examples: i386, sparc, hurd-i386."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:248
+# type: IP
+#: dpkg-architecture.1:91
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+msgid "architecture wildcard"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:253
-#, no-wrap
+#: dpkg-architecture.1:95
 msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"An architecture wildcard is a special architecture string that will match "
+"any real architecture being part of it. The general form is E<lt>kernelE<gt>-"
+"E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+# type: IP
+#: dpkg-architecture.1:95
+#, no-wrap
+msgid "\\s-1GNU\\s0 system type"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:264
+#: dpkg-architecture.1:99
 msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+"An architecture specification string consisting of two parts separated by a "
+"dash: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-gnu, "
+"x86_64-netbsd."
 msgstr ""
 
+# type: SH
+#: dpkg-architecture.1:100
+#, fuzzy, no-wrap
+msgid "VARIABLES"
+msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
+
 # type: Plain text
-#: dpkg-architecture.1:267
-msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+#: dpkg-architecture.1:102
+msgid "The following variables are set by B<dpkg-architecture>:"
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:102
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:271
-#, fuzzy
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+#: dpkg-architecture.1:104
+msgid "The Debian architecture of the build machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:104
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:276
-msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
-#, fuzzy, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg"
+# type: IP
+#: dpkg-architecture.1:106
+#, no-wrap
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:108
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:11
-msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
-# type: TP
-#: dpkg.cfg.5:16
-#, fuzzy
-msgid "I<~/.dpkg.cfg>"
-msgstr "I</etc/dpkg/dpkg.cfg>"
+# type: IP
+#: dpkg-architecture.1:110
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:20
-#, fuzzy
-msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
-"Смотрите файл I</usr/share/doc/dpkg/THANKS>, где приведён список тех, кто "
-"участвовал в разработке B<dpkg>.\n"
 
-# type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-#, fuzzy
-msgid "B<dpkg>(1)."
-msgstr "B<date>(1)."
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:1
-#, no-wrap
-msgid "dpkg-checkbuilddeps"
-msgstr "dpkg-checkbuilddeps"
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
+msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2006-05-23"
-msgstr "2006-02-28"
+# type: IP
+#: dpkg-architecture.1:114
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
-msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg-checkbuilddeps.1:7
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+# type: IP
+#: dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
-msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
+msgstr ""
+
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
 msgstr ""
-"Эта программа проверяет установленные в системе пакеты на предмет сборочных "
-"зависимостей и конфликтов, описанных в файле control. Если какие-то из этих "
-"зависимостей или конфликтов не удовлетворены, то об этом сообщается и работа "
-"завершается с ненулевым кодом возврата."
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
 msgstr ""
-"По умолчанию читается I<debian/control>, но в командной строке можно задать "
-"другое имя файла control."
 
-# type: TP
-#: dpkg-checkbuilddeps.1:17
+# type: IP
+#: dpkg-architecture.1:120
 #, no-wrap
-msgid "B<-B>"
-msgstr "B<-B>"
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
-msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
 msgstr ""
-"Игнорировать строки I<Build-Depends-Indep>. Используется, если пакеты, "
-"независящие от архитектуры не собираются."
 
-# type: TP
-#: dpkg-checkbuilddeps.1:21
-#, fuzzy, no-wrap
-msgid "B<-h>"
-msgstr "B<-B>"
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-msgid "Copyright 2001 Joey Hess"
-msgstr "Copyright 2001 Joey Hess"
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
 
-# type: UR
-#: dpkg-checkbuilddeps.1:27
+# type: IP
+#: dpkg-architecture.1:124
 #, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:joeyh@debian.org"
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
 
-# type: TH
-#: dpkg-deb.1:1
-#, fuzzy, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg"
+# type: SH
+#: dpkg-architecture.1:127
+#, no-wrap
+msgid "DEBIAN/RULES"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+#: dpkg-architecture.1:135
+msgid ""
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:12
-#, fuzzy
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+#: dpkg-architecture.1:142
+#, no-wrap
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:16
-#, fuzzy
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+#: dpkg-architecture.1:145
+msgid "please use the following:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
+#: dpkg-architecture.1:149
+#, no-wrap
+msgid ""
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#: dpkg-architecture.1:151
+#, no-wrap
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#: dpkg-architecture.1:161
+#, no-wrap
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
+#: dpkg-architecture.1:164
+msgid "please use:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
+#: dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:39
-#, fuzzy
+#: dpkg-architecture.1:171
+#, no-wrap
 msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
 msgstr ""
-"Смотрите B<dpkg-deb>(1) для более подробной информации о нижеследующих "
-"действиях."
 
 # type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
+#: dpkg-architecture.1:175
+msgid ""
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-architecture.1:180
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
 msgstr ""
 
 # type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
-#, fuzzy, no-wrap
-msgid "ACTION OPTIONS"
-msgstr "ПАРАМЕТРЫ"
-
-# type: TP
-#: dpkg-deb.1:54
+#: dpkg-architecture.1:181
 #, no-wrap
-msgid "B<--build>, B<-b>"
+msgid "BACKWARD COMPATIBILITY"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
+#: dpkg-architecture.1:187
 msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:72
+#: dpkg-architecture.1:192
 msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:84
+#: dpkg-architecture.1:196
+#, no-wrap
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:210
+#, no-wrap
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:216
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, fuzzy, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--new> | B<--old>"
-
-# type: Plain text
-#: dpkg-deb.1:112
-#, fuzzy
-msgid "Provides information about a binary package archive."
-msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
-
 # type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-architecture.1:226
+#, no-wrap
 msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:125
+#: dpkg-architecture.1:231
+#, no-wrap
 msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:125
-#, fuzzy, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--new> | B<--old>"
-
 # type: Plain text
-#: dpkg-deb.1:132
+#: dpkg-architecture.1:235
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:132
-#, fuzzy, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--new> | B<--old>"
-
 # type: Plain text
-#: dpkg-deb.1:135
-#, fuzzy
-msgid "Extracts control file information from a binary package archive."
-msgstr "B<1.> Извлечение управляющих файлов нового пакета."
+#: dpkg-architecture.1:242
+msgid ""
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg-architecture.1:245
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:148
+#: dpkg-architecture.1:249
 msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:150
-#, fuzzy, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--new> | B<--old>"
+# type: Plain text
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:156
+#: dpkg-architecture.1:256
 msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:156
-#, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+# type: Plain text
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:160
-msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:165
+#: dpkg-architecture.1:263
 msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:171
-msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr ""
+# type: Plain text
+#: dpkg-architecture.1:271
+#, fuzzy
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg-architecture.1:276
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
 
-# type: TP
-#: dpkg-deb.1:182
+# type: TH
+#: dpkg.cfg.5:1
 #, fuzzy, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "I<control>"
-
-# type: Plain text
-#: dpkg-deb.1:186
-msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
-msgstr ""
+msgid "dpkg.cfg"
+msgstr "dpkg"
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg.cfg.5:11
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, fuzzy, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--new> | B<--old>"
+#: dpkg.cfg.5:16
+#, fuzzy
+msgid "I<~/.dpkg.cfg>"
+msgstr "I</etc/dpkg/dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#: dpkg.cfg.5:20
+#, fuzzy
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
+"Смотрите файл I</usr/share/doc/dpkg/THANKS>, где приведён список тех, кто "
+"участвовал в разработке B<dpkg>.\n"
 
 # type: Plain text
-#: dpkg-deb.1:203
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
 #, fuzzy
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Показать информацию о версии B<dpkg>."
-
-# type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
-#, fuzzy, no-wrap
-msgid "B<--licence>"
-msgstr "B<--nocheck>"
+msgid "B<dpkg>(1)."
+msgstr "B<date>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:210
-msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
-msgstr ""
-
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
+#: dpkg-buildpackage.1:1
 #, fuzzy, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "ПАРАМЕТРЫ"
-
-# type: TP
-#: dpkg-deb.1:211
-#, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr ""
+msgid "dpkg-buildpackage"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
-msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build source packages"
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:225
-msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
-msgstr ""
+#: dpkg-buildpackage.1:8
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+#: dpkg-buildpackage.1:13
+msgid ""
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:227
+#: dpkg-buildpackage.1:15
 #, fuzzy, no-wrap
-msgid "B<--new>"
-msgstr "B<--nocheck>"
+msgid "B<-b>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:19
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:232
-#, fuzzy, no-wrap
-msgid "B<--old>"
-msgstr "B<hold>"
-
-# type: Plain text
-#: dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
-msgstr ""
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
+#, no-wrap
+msgid "B<-B>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:23
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
 
 # type: TP
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:23
 #, fuzzy, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
+#: dpkg-buildpackage.1:26
+msgid "Specifies a source-only build, no binary packages need to be made."
 msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:254
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:258
-msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-buildpackage.1:40
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:270
-#, fuzzy
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+# type: TP
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-deb.1:278
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
 msgstr ""
 
-# type: TH
-#: dpkg-divert.8:1
-#, no-wrap
-msgid "dpkg-divert"
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:4
-msgid "dpkg-divert - override a package's version of a file"
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:10
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+# type: TP
+#: dpkg-buildpackage.1:46
+#, fuzzy, no-wrap
+msgid "B<-a>I<architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:51
+msgid ""
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<-V>|B<--version>"
+
 # type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
+msgid ""
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-msgstr ""
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, fuzzy, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B< >E<lt>длинное описаниеE<gt>"
 
 # type: Plain text
-#: dpkg-divert.8:36
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
+msgstr ""
+
+# type: TP
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
+#, no-wrap
+msgid "B<-m>I<maintaineraddress>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
-#, fuzzy, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
+#, no-wrap
+msgid "B<-e>I<maintaineraddress>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:48
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:48
+#: dpkg-buildpackage.1:72
 #, fuzzy, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<Priority:> E<lt>приоритетE<gt>"
+msgid "B<-D>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:52
-msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
-msgstr ""
+#: dpkg-buildpackage.1:75
+#, fuzzy
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
+msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 # type: TP
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:75
 #, fuzzy, no-wrap
-msgid "B<--local>"
-msgstr "B<--nocheck>"
+msgid "B<-d>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:58
-msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
-msgstr ""
+#: dpkg-buildpackage.1:78
+#, fuzzy
+msgid "Do not check build dependencies and conflicts."
+msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 # type: TP
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
 #, fuzzy, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<Package:> E<lt>имя пакетаE<gt>"
+msgid "B<-W>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:63
+#: dpkg-buildpackage.1:84
 msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
 #, fuzzy, no-wrap
-msgid "B<--quiet>"
-msgstr "B<-q>|B<--quiet>"
+msgid "B<-E>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
+#: dpkg-buildpackage.1:92
+msgid ""
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:66
+#: dpkg-buildpackage.1:92
 #, fuzzy, no-wrap
-msgid "B<--rename>"
-msgstr "B<--log=>I<имя файла>"
+msgid "B<-nc>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:70
-msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
+#: dpkg-buildpackage.1:95
 #, fuzzy, no-wrap
-msgid "B<--test>"
-msgstr "B<-t>|B<--test>"
+msgid "B<-tc>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: dpkg-buildpackage.1:101
+msgid ""
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:76
-msgid "Output short usage instructions, and exit successfully."
+# type: TP
+#: dpkg-buildpackage.1:101
+#, no-wrap
+msgid "B<-r>I<gain-root-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:79
-msgid "Output program name and version and exit successfully."
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
+msgid ""
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
 
-# type: SH
-#: dpkg-divert.8:80
+# type: TP
+#: dpkg-buildpackage.1:127
 #, no-wrap
-msgid "NOTES"
+msgid "B<-p>I<sign-command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg-buildpackage.1:152
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
+# type: TP
+#: dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:92
-msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+#: dpkg-buildpackage.1:155
+msgid "Specify a key-ID to use when signing packages."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:155
+#, fuzzy, no-wrap
+msgid "B<-us>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-divert.8:97
-msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
+#: dpkg-buildpackage.1:158
+msgid "Do not sign the source package."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:158
+#, fuzzy, no-wrap
+msgid "B<-uc>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
+# type: TP
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
+#, fuzzy, no-wrap
+msgid "B<-I>I<filename>"
+msgstr "B<--log=>I<имя файла>"
+
 # type: Plain text
-#: dpkg-divert.8:107
-msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:109
-msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+# type: TP
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
+#, no-wrap
+msgid "B<--admindir=>I<dir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
+msgid ""
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
 #, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "I</var/lib/dpkg/status>"
+msgid "B<-h>, B<--help>"
+msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: dpkg-divert.8:120
+#: dpkg-buildpackage.1:185
 msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:123
+#: dpkg-buildpackage.1:192
+#, fuzzy
 msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
-msgstr ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr ""
+#: dpkg-checkbuilddeps.1:1
+#, no-wrap
+msgid "dpkg-checkbuilddeps"
+msgstr "dpkg-checkbuilddeps"
 
-# type: TH
-#: dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg"
+# type: Plain text
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:14
+msgid ""
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
+"Эта программа проверяет установленные в системе пакеты на предмет сборочных "
+"зависимостей и конфликтов, описанных в файле control. Если какие-то из этих "
+"зависимостей или конфликтов не удовлетворены, то об этом сообщается и работа "
+"завершается с ненулевым кодом возврата."
 
 # type: Plain text
-#: dpkg-name.1:22
+#: dpkg-checkbuilddeps.1:17
 msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
+"По умолчанию читается I<debian/control>, но в командной строке можно задать "
+"другое имя файла control."
 
 # type: Plain text
-#: dpkg-name.1:33
+#: dpkg-checkbuilddeps.1:27
 msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
+"Игнорировать строки I<Build-Depends-Indep>. Используется, если пакеты, "
+"независящие от архитектуры не собираются."
 
 # type: TP
-#: dpkg-name.1:34
+#: dpkg-checkbuilddeps.1:27
 #, fuzzy, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<-h>"
+msgstr "B<-B>"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:33
+msgid "Copyright 2001 Joey Hess"
+msgstr "Copyright 2001 Joey Hess"
+
+# type: UR
+#: dpkg-checkbuilddeps.1:33
+#, no-wrap
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:joeyh@debian.org"
+
+# type: Plain text
+#: dpkg-checkbuilddeps.1:35
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>joeyh@debian.orgE<gt>."
+
+# type: TH
+#: dpkg-distaddfile.1:1
+#, no-wrap
+msgid "dpkg-distaddfile"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
+#: dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:37
-#, fuzzy, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-distaddfile.1:8
+#, fuzzy
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:40
-#, no-wrap
-msgid "B<-o, --overwrite>"
+# type: Plain text
+#: dpkg-distaddfile.1:18
+msgid ""
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-distaddfile.1:26
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:44
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
+msgid "B<-f>I<fileslistfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:56
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:56
-#, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr ""
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
+#, fuzzy, no-wrap
+msgid "B<debian/files>"
+msgstr "B<config-files>"
 
 # type: Plain text
-#: dpkg-name.1:61
+#: dpkg-distaddfile.1:46
 msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:61
+# type: TH
+#: dpkg-deb.1:1
 #, fuzzy, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<dpkg --help>"
+msgid "dpkg-deb"
+msgstr "dpkg"
+
+# type: TH
+#: dpkg-deb.1:1
+#, fuzzy, no-wrap
+msgid "2007-03-13"
+msgstr "2006-02-28"
 
 # type: Plain text
-#: dpkg-name.1:64
-msgid "Print a usage message and exit successfully."
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:64
-#, fuzzy, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
+#: dpkg-deb.1:13
 #, fuzzy
-msgid "Print version information and exit successfully."
-msgstr "Выдать информацию о версии и завершить работу."
+msgid ""
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+msgstr ""
+"Смотрите B<dpkg-deb>(1) для более подробной информации о нижеследующих "
+"действиях."
 
-# type: TP
-#: dpkg-name.1:67
-#, no-wrap
-msgid "B<-l, --license>"
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:71
+#: dpkg-deb.1:27
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:72
+#: dpkg-deb.1:29
 #, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-deb.1:41
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:77
-#, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+# type: Plain text
+#: dpkg-deb.1:53
+msgid ""
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-deb.1:60
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+# type: Plain text
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-deb.1:78
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:88
-#, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+# type: Plain text
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+
+# type: Plain text
+#: dpkg-deb.1:81
+#, fuzzy
+msgid "Provides information about a binary package archive."
+msgstr "Очистить имеющуюся информацию о том, какие пакеты доступны."
+
+# type: Plain text
+#: dpkg-deb.1:86
+msgid ""
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:91
-msgid "This can be used when building new packages."
+#: dpkg-deb.1:94
+msgid ""
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
 msgstr ""
 
+# type: TP
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<-d>|B<--chdir> I<путь>"
+
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:101
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:107
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-checkbuilddeps> -B<-B> [I<файл control>]"
+
+# type: Plain text
+#: dpkg-deb.1:104
 #, fuzzy
-msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid "Extracts control file information from a binary package archive."
+msgstr "B<1.> Извлечение управляющих файлов нового пакета."
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
-#, no-wrap
-msgid "COPYRIGHT"
+# type: Plain text
+#: dpkg-deb.1:108
+msgid ""
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:113
-#, fuzzy
+#: dpkg-deb.1:117
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
+msgstr ""
+
+# type: Plain text
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
 msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
 
 # type: TP
-#: dpkg-query.1:1
+#: dpkg-deb.1:119
 #, fuzzy, no-wrap
-msgid "dpkg-query"
-msgstr "B<dpkg-query-actions>"
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<--new> | B<--old>"
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
+#: dpkg-deb.1:125
+msgid ""
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:9
-#, fuzzy
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
-
-# type: TP
-#: dpkg-query.1:13
-#, fuzzy
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
-# type: TP
-#: dpkg-query.1:17
-#, fuzzy
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+# type: Plain text
+#: dpkg-deb.1:129
+msgid ""
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
+msgstr ""
 
-# type: TP
-#: dpkg-query.1:21
-#, fuzzy
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+# type: Plain text
+#: dpkg-deb.1:135
+msgid ""
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:29
-#, fuzzy
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
+#: dpkg-deb.1:138
+#, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr ""
 
-# type: TP
-#: dpkg-query.1:32
-#, fuzzy
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
+# type: Plain text
+#: dpkg-deb.1:143
+msgid ""
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:35
-#, fuzzy
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg --version>"
+#: dpkg-deb.1:143
+#, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-deb.1:151
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:40
+# type: TP
+#: dpkg-deb.1:151
 #, no-wrap
-msgid "COMMANDS"
+msgid "B<-e>, B<--control> I<archive directory>"
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:41
-#, fuzzy, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
-
 # type: Plain text
-#: dpkg-query.1:50
+#: dpkg-deb.1:155
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:54
-#, fuzzy, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
+#: dpkg-deb.1:159
+msgid ""
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-deb.1:162
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:60
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
 #, fuzzy, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
+msgid "B<--license>, B<--licence>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
 
 # type: Plain text
-#: dpkg-query.1:67
-msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:67
-#, fuzzy, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<-a>|B<--startas> I<полное_имя>"
+#: dpkg-deb.1:173
+#, no-wrap
+msgid "B<--showformat=>I<format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-deb.1:178 dpkg-query.1:79
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
 
-# type: TP
-#: dpkg-query.1:71
-#, fuzzy, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
-
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:187
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
+msgstr ""
+
+# type: Plain text
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:76
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
+msgid "B<-z>I<compress_level>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:193
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:82
+#: dpkg-deb.1:193
 #, fuzzy, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<-n>|B<--name> I<имя_процесса>"
+msgid "B<-Z>I<compress_type>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-query.1:86
+#: dpkg-deb.1:198
 msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:86
+#: dpkg-deb.1:198
 #, fuzzy, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<dpkg --licence> | B<dpkg --license>"
-
-# type: Plain text
-#: dpkg-query.1:89
-#, fuzzy
-msgid "Display licence and copyright information."
-msgstr "Показать информацию о версии B<dpkg>."
+msgid "B<--new>"
+msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-query.1:92
-#, fuzzy
-msgid "Display version information."
-msgstr "Показать информацию о версии B<dpkg>."
+#: dpkg-deb.1:203
+msgid ""
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+msgstr ""
 
 # type: TP
-#: dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
+#: dpkg-deb.1:203
+#, fuzzy, no-wrap
+msgid "B<--old>"
+msgstr "B<hold>"
+
+# type: Plain text
+#: dpkg-deb.1:211
+msgid ""
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:217
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
 
 # type: TP
-#: dpkg-query.1:98
+#: dpkg-deb.1:217
 #, fuzzy, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<-r>|B<--chroot> I<root>"
+msgid "B<-D>, B<--debug>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:226
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:230
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:237
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
-msgstr ""
+#: dpkg-deb.1:243
+#, fuzzy
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:252
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
 msgstr ""
 
-# type: Plain text
-#: dpkg-query.1:165
+# type: TH
+#: dpkg-divert.8:1
 #, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+msgid "dpkg-divert"
 msgstr ""
 
-# type: SH
-#: dpkg-query.1:167
-#, fuzzy, no-wrap
-msgid "ENVIRONMENT"
-msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
-
 # type: Plain text
-#: dpkg-query.1:172
-msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+#: dpkg-divert.8:4
+msgid "dpkg-divert - override a package's version of a file"
 msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:175
+#: dpkg-divert.8:9
 #, fuzzy
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Copyright 2001 Joey Hess"
-
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
-#, fuzzy, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:joeyh@debian.org"
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-#, fuzzy
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>joeyh@debian.orgE<gt>."
+#: dpkg-divert.8:13
+msgid ""
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
+msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
+# type: Plain text
+#: dpkg-divert.8:23
+msgid ""
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-divert.8:25
 #, fuzzy, no-wrap
-msgid "2006-05-10"
-msgstr "2006-02-28"
+msgid "[B<--add>] I<file>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:30
-msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+#: dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:43
-msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--log=>I<имя файла>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:53
-msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:60
+#: dpkg-divert.8:42
 msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<Priority:> E<lt>приоритетE<gt>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-divert.8:46
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:46
+#, fuzzy, no-wrap
+msgid "B<--local>"
+msgstr "B<--nocheck>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:67
+#: dpkg-divert.8:52
 msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr ""
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<Package:> E<lt>имя пакетаE<gt>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-divert.8:57
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, fuzzy, no-wrap
+msgid "B<--quiet>"
+msgstr "B<-q>|B<--quiet>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:80
-msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr ""
+# type: TP
+#: dpkg-divert.8:60
+#, fuzzy, no-wrap
+msgid "B<--rename>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-divert.8:64
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
+#, fuzzy, no-wrap
+msgid "B<--test>"
+msgstr "B<-t>|B<--test>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:91
-msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+# type: SH
+#: dpkg-divert.8:74
+#, no-wrap
+msgid "NOTES"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-divert.8:78
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
-msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:119
+#: dpkg-divert.8:86
 msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:124
+#: dpkg-divert.8:91
 msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
-#, no-wrap
-msgid "DIAGNOSTICS"
+# type: Plain text
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
-msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:135
-#, fuzzy
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
-
-# type: TH
-#: dpkg-scansources.1:1
-#, no-wrap
-msgid "dpkg-scansources"
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-divert.8:101
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-divert.8:103
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:18
-msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:109
+#, fuzzy, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "I</var/lib/dpkg/status>"
+
 # type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-divert.8:114
 msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:33
+#: dpkg-divert.8:117
 msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:44
-msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
 msgstr ""
 
-# type: TP
-#: dpkg-scansources.1:45 install-info.8:272
+# type: TH
+#: dpkg-genchanges.1:1
 #, fuzzy, no-wrap
-msgid "B<--debug>"
-msgstr "B<--no-debsig>"
+msgid "dpkg-genchanges"
+msgstr "dpkg"
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
+#: dpkg-genchanges.1:4
+msgid "dpkg-genchanges - generate Debian .changes files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
-msgstr ""
+#: dpkg-genchanges.1:8
+#, fuzzy
+msgid "B<dpkg-genchanges> [I<options>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
-# type: TP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-o>|B<--oknodo>"
+# type: Plain text
+#: dpkg-genchanges.1:16
+msgid ""
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-genchanges.1:23
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
 # type: TP
-#: dpkg-scansources.1:52
+#: dpkg-genchanges.1:41 dpkg-source.1:137
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-p>|B<--pidfile> I<pid-файл>"
+msgid "B<-si>, B<-sa>, B<-sd>"
+msgstr "B<-s>|B<--signal> I<сигнал>"
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-genchanges.1:49
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:63
-#, fuzzy
-msgid "Print the version number and exit."
-msgstr "Выдать информацию о версии и завершить работу."
-
-# type: Plain text
-#: dpkg-scansources.1:66
-msgid "B<dpkg-scanpackages>(1)."
+#: dpkg-genchanges.1:62 dpkg-source.1:158
+msgid ""
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
-# type: TH
-#: dpkg-source.1:2
-#, fuzzy, no-wrap
-msgid "dpkg-source"
-msgstr "комплект dpkg"
-
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, no-wrap
+msgid "B<-T>I<substvarsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:15
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
+#, fuzzy, no-wrap
+msgid "B<-D>I<field>B<=>I<value>"
+msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+
 # type: Plain text
-#: dpkg-source.1:18
-#, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:21
-#, fuzzy
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-deb-actions>"
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+#, fuzzy, no-wrap
+msgid "B<-U>I<field>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-source.1:24
-#, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:27
-#, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-source.1:30
-#, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+#: dpkg-genchanges.1:101
+msgid ""
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
+msgstr ""
+
+# type: TP
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
+#, fuzzy, no-wrap
+msgid "B<-c>I<controlfile>"
+msgstr "I<control>"
 
 # type: Plain text
-#: dpkg-source.1:33
-#, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
-msgstr "B<dpkg> [I<параметры>] I<действие>"
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:36
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
+#, no-wrap
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:42
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-genchanges.1:115
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+# type: TP
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
+#, no-wrap
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:80
-msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+# type: TP
+#: dpkg-genchanges.1:120
+#, no-wrap
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+#: dpkg-genchanges.1:131
+msgid ""
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:131
+#, fuzzy, no-wrap
+msgid "B<-q>"
+msgstr "B<-B>"
+
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-genchanges.1:139
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-genchanges.1:155
 msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
+# type: Plain text
+#: dpkg-gencontrol.1:1
 #, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr "ПАРАМЕТРЫ"
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-source.1:96
-msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:96
-#, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-H>|B<--help>"
+# type: Plain text
+#: dpkg-gencontrol.1:8
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-source.1:101
+#: dpkg-gencontrol.1:15
 msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:106
-msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+#: dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:106
-#, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<-V>|B<--version>"
-
 # type: Plain text
-#: dpkg-source.1:114
+#: dpkg-gencontrol.1:24
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:55
+#, fuzzy, no-wrap
+msgid "B<-p>I<package>"
+msgstr "B<unpacked>"
+
 # type: Plain text
-#: dpkg-source.1:119
+#: dpkg-gencontrol.1:62
 msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:119
+# type: TP
+#: dpkg-gencontrol.1:62
 #, fuzzy, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B< >E<lt>длинное описаниеE<gt>"
+msgid "B<-n>I<filename>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:67
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:126
+#: dpkg-gencontrol.1:67
 #, no-wrap
-msgid "B<-m>I<maintaineraddress>"
+msgid "B<-is>, B<-ip>, B<-isp>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:76
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:134
+#: dpkg-gencontrol.1:76
 #, no-wrap
-msgid "B<-e>I<maintaineraddress>"
+msgid "B<-P>I<packagebuilddir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:89
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<-s>|B<--signal> I<сигнал>"
+msgid "B<-O>"
+msgstr "B<-B>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-gencontrol.1:98
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-gencontrol.1:106
+#, fuzzy, no-wrap
+msgid "B<debian/control>"
+msgstr "deb-control"
+
+# type: Plain text
+#: dpkg-gencontrol.1:111
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-gencontrol.1:118
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:163
-#, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
+# type: TH
+#: dpkg-name.1:6
+#, fuzzy, no-wrap
+msgid "dpkg-name"
+msgstr "dpkg"
+
+# type: Plain text
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+# type: Plain text
+#: dpkg-name.1:27
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:169
-#, no-wrap
-msgid "B<-T>I<substvarsfile>"
+#: dpkg-name.1:29
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<dpkg --print-architecture>"
+
+# type: Plain text
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
 msgstr ""
 
+# type: TP
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<dpkg --version>"
+
 # type: Plain text
-#: dpkg-source.1:179
-msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:179
+#: dpkg-name.1:35
 #, fuzzy, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
-msgstr "B<-D>I<octal>B< | --debug=>I<octal>"
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:184
+#: dpkg-name.1:39
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-name.1:39
 #, fuzzy, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<--log=>I<имя файла>"
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<-s>|B<--signal> I<сигнал>"
 
 # type: Plain text
-#: dpkg-source.1:189
+#: dpkg-name.1:51
 msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:189
+#: dpkg-name.1:51
 #, fuzzy, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr "B<-t>|B<--test>"
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-name.1:56
 msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
+msgstr ""
+
+# type: TP
+#: dpkg-name.1:59
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr "B<dpkg --version>"
+
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#: dpkg-name.1:67
+#, no-wrap
+msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-name.1:72
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:217
-#, fuzzy, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "I<control>"
+#: dpkg-name.1:72
+#, no-wrap
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:224
+#: dpkg-name.1:77
 msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:224
+#: dpkg-name.1:77
 #, no-wrap
-msgid "B<-l>I<changelogfile>"
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-name.1:83
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:231
+#: dpkg-name.1:83
 #, no-wrap
-msgid "B<-f>I<fileslistfile>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-name.1:86
+msgid "This can be used when building new packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:237
+#: dpkg-name.1:96
+msgid ""
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
+msgstr ""
+
+# type: Plain text
+#: dpkg-name.1:104
+#, fuzzy
+msgid ""
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
+
+# type: Plain text
+#: dpkg-name.1:111
+#, fuzzy
 msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
+"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+"гарантий."
 
-# type: TP
-#: dpkg-source.1:237
-#, no-wrap
-msgid "B<-F>I<changelogformat>"
-msgstr ""
+# type: Plain text
+#: dpkg-parsechangelog.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-source.1:244
-msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-parsechangelog.1:4
+msgid "dpkg-parsechangelog - parse Debian changelog files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:244
-#, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<-B>"
+# type: Plain text
+#: dpkg-parsechangelog.1:8
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-parsechangelog.1:14
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:251
+#: dpkg-parsechangelog.1:26
 #, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<-B>"
+msgid "B<-L>I<libdir>"
+msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: dpkg-source.1:257
-msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:257
+# type: TP
+#: dpkg-parsechangelog.1:41
 #, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-parsechangelog.1:47
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:262
+#: dpkg-query.1:1
 #, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<-B>"
+msgid "dpkg-query"
+msgstr "B<dpkg-query-actions>"
 
 # type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:280
-msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
-msgstr ""
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-query.1:12
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:288
+#: dpkg-query.1:14
 #, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<-B>"
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
-#: dpkg-source.1:303
+#: dpkg-query.1:23
 msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
-#, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:311
-msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
-msgstr ""
+#: dpkg-query.1:27
+#, fuzzy, no-wrap
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "B< dpkg -l \\(aq*vi*\\(aq>"
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-query.1:33
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+#: dpkg-query.1:33
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<--log=>I<имя файла>"
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
-#: dpkg-source.1:330
+#: dpkg-query.1:40
 msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:330
-#, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr ""
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 # type: Plain text
-#: dpkg-source.1:345
+#: dpkg-query.1:44
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:357
-msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
-msgstr ""
+# type: TP
+#: dpkg-query.1:44
+#, fuzzy, no-wrap
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
-#: dpkg-source.1:368
+#: dpkg-query.1:49
 msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:377
-msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
-msgstr ""
+# type: TP
+#: dpkg-query.1:49
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 
 # type: Plain text
-#: dpkg-source.1:406
+#: dpkg-query.1:55
 msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
 
+# type: TP
+#: dpkg-query.1:55
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-n>|B<--name> I<имя_процесса>"
+
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-query.1:59
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
+#: dpkg-query.1:74
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-r>|B<--chroot> I<root>"
 
 # type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:422
+#: dpkg-query.1:87
+#, no-wrap
 msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-query.1:92
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-query.1:98
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:435
-#, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:438
-#, fuzzy
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-msgstr "B<822-date> не использует аргументов или параметров."
-
-# type: TP
-#: dpkg-source.1:438
-#, fuzzy, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<unpacked>"
-
-# type: Plain text
-#: dpkg-source.1:445
+#: dpkg-query.1:129
+#, no-wrap
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:445
-#, fuzzy, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<--log=>I<имя файла>"
-
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-query.1:137
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:450
+# type: Plain text
+#: dpkg-query.1:141
 #, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
 msgstr ""
 
+# type: SH
+#: dpkg-query.1:143
+#, fuzzy, no-wrap
+msgid "ENVIRONMENT"
+msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
+
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-query.1:148
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:459
-#, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:472
-msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
-msgstr ""
+#: dpkg-query.1:151
+#, fuzzy
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr "Copyright 2001 Joey Hess"
 
-# type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
 #, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<-B>"
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:joeyh@debian.org"
 
 # type: Plain text
-#: dpkg-source.1:482
-msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
-msgstr ""
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+#, fuzzy
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>joeyh@debian.orgE<gt>."
 
-# type: SH
-#: dpkg-source.1:482
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid "dpkg-scanpackages"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:487
-msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:487
-#, fuzzy, no-wrap
-msgid "B<-e>I<executable>"
-msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
-
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-scanpackages.1:28
 msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:491
-#, no-wrap
-msgid "B<-d>I<dependencyfield>"
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:497
+#: dpkg-scanpackages.1:41
 msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-scanpackages.1:51
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-scanpackages.1:58
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-scanpackages.1:62
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:534
+#: dpkg-scanpackages.1:65
 msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:69
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:71
 #, fuzzy, no-wrap
-msgid "B<-t>I<type>"
-msgstr "B<-t>|B<--test>"
+msgid "B<-u>, B<--udeb>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
-msgstr ""
-
-# type: SH
-#: dpkg-source.1:549
-#, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
+#: dpkg-scanpackages.1:74
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:552
-#, fuzzy
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
-msgstr "B<822-date> не использует аргументов или параметров."
-
 # type: TP
-#: dpkg-source.1:552
-#, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
-msgstr ""
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<путь>"
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:563
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<-B>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:571
-msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:571
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
 #, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+msgid "DIAGNOSTICS"
+msgstr ""
+
+# type: Plain text
+#: dpkg-scanpackages.1:94
+msgid ""
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:574
+#: dpkg-scanpackages.1:99
 #, fuzzy
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr "B<822-date> не использует аргументов или параметров."
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg-source.1:574
+# type: TH
+#: dpkg-scansources.1:1
 #, no-wrap
-msgid "B<-k>I<key-id>"
+msgid "dpkg-scansources"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:577
-msgid "Specify a key-ID to use when signing packages."
+#: dpkg-scansources.1:4
+msgid ""
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
+# type: Plain text
+#: dpkg-scansources.1:13
+msgid ""
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scansources.1:18
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
+# type: Plain text
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scansources.1:33
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:628
-#, fuzzy, no-wrap
-msgid "B<-tc>"
-msgstr "B<-B>"
-
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scansources.1:44
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:634
+#: dpkg-scansources.1:46
 #, fuzzy, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<-q>|B<--quiet>"
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: dpkg-scansources.1:49
+msgid ""
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
+#: dpkg-scansources.1:49
 #, fuzzy, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 # type: Plain text
-#: dpkg-source.1:642
+#: dpkg-scansources.1:52
 msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:651
+#: dpkg-scansources.1:58 install-info.8:272
 #, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<-B>"
+msgid "B<--debug>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-source.1:654
-#, fuzzy
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
-msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
-
-# type: TP
-#: dpkg-source.1:654
-#, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<-B>"
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:657
+#: dpkg-scansources.1:68
 #, fuzzy
-msgid "Do not check build dependencies and conflicts."
-msgstr "dpkg-checkbuilddeps -- проверяет сборочные зависимости и конфликты"
-
-# type: TP
-#: dpkg-source.1:657
-#, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<-B>"
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
-msgstr ""
+# type: Plain text
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
+#, fuzzy, no-wrap
+msgid "dpkg-shlibdeps"
+msgstr "dpkg-checkbuilddeps"
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-shlibdeps.1:10
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-shlibdeps.1:35
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:674
-#, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+# type: Plain text
+#: dpkg-shlibdeps.1:41
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
 msgstr ""
 
+# type: TP
+#: dpkg-shlibdeps.1:41
+#, fuzzy, no-wrap
+msgid "B<-e>I<executable>"
+msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
+
 # type: Plain text
-#: dpkg-source.1:677
-#, fuzzy
+#: dpkg-shlibdeps.1:45
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
-msgstr "B<822-date> не использует аргументов или параметров."
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
+msgstr ""
 
-# type: SH
-#: dpkg-source.1:677
+# type: TP
+#: dpkg-shlibdeps.1:45
 #, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-shlibdeps.1:51
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:61
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:69
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:69
+#, no-wrap
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-shlibdeps.1:80
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-shlibdeps.1:86
+msgid ""
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-shlibdeps.1:86
 #, fuzzy, no-wrap
-msgid "B<Arch>"
-msgstr "B<-B>"
+msgid "B<-t>I<type>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:93
+msgid ""
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:720
+#: dpkg-shlibdeps.1:93
 #, no-wrap
-msgid "B<source:Version>"
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:723
-msgid "The source package version."
+#: dpkg-shlibdeps.1:99
+msgid ""
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-shlibdeps.1:105
+msgid ""
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:723
+#: dpkg-shlibdeps.1:117
 #, no-wrap
-msgid "B<source:Upstream-Version>"
+msgid "B<debian/shlibs.local>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
-msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:727
+#: dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<binary:Version>"
+msgid "B</etc/dpkg/shlibs.override>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:731
-msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:731
-#, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<-V>|B<--version>"
+#: dpkg-shlibdeps.1:123
+#, no-wrap
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:736
-msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:736
+# type: Plain text
+#: dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
+msgstr ""
+
+# type: TH
+#: dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<installed>"
+msgid "dpkg-source"
+msgstr "комплект dpkg"
 
 # type: Plain text
-#: dpkg-source.1:745
-msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+#: dpkg-source.1:6
+msgid "dpkg-source, - Debian source package tools"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:745
-#, no-wrap
-msgid "B<Extra-Size>"
-msgstr ""
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-source.1:754
-msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+#: dpkg-source.1:15
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:754
-#, fuzzy, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<--log=>I<имя файла>"
-
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-source.1:19
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:761
+#: dpkg-source.1:21
 #, no-wrap
-msgid "B<Format>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:771
+#: dpkg-source.1:31
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:771
-#, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
+# type: Plain text
+#: dpkg-source.1:37
+msgid ""
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-source.1:45
+msgid ""
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:774
+#: dpkg-source.1:45
 #, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:60
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:779
-#, fuzzy, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:75
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-source.1:82
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
-#, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg --version>"
+# type: Plain text
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:118
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "deb-control"
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:137
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:794
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B<debian/changelog>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
+msgstr ""
+
+# type: Plain text
+#: dpkg-source.1:173
+msgid ""
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:185
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:800
-#, fuzzy, no-wrap
-msgid "B<debian/files>"
-msgstr "B<config-files>"
-
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:196
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, fuzzy, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<deinstall>"
-
 # type: Plain text
-#: dpkg-source.1:816
-#, fuzzy
-msgid "List of substitution variables and values."
-msgstr "Список доступных пакетов."
-
-# type: TP
-#: dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
+#: dpkg-source.1:205
+msgid ""
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:819
-#, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
+#: dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:822
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:250
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
-msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-source.1:258
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:845
-#, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
-msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
-
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
+#: dpkg-source.1:263
+msgid ""
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:851
-msgid "Copyright (C) 2000 Wichert Akkerman"
+#: dpkg-source.1:274
+msgid ""
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:857
+#: dpkg-source.1:279
 #, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
-"версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
-"гарантий."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: TH
 #: dpkg-split.1:2
@@ -6451,41 +6562,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr ""
-
-# type: TP
-#: dpkg-split.1:13
-#, fuzzy
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
-
-# type: TP
-#: dpkg-split.1:17
-#, fuzzy
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr ""
-
-# type: TP
-#: dpkg-split.1:24
+#: dpkg-split.1:10
 #, fuzzy
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg -C> | B<--audit>"
-
-# type: TP
-#: dpkg-split.1:28
-#, fuzzy
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6493,14 +6576,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6509,25 +6592,25 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:49
-#, fuzzy, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<-t>|B<--test>"
+#: dpkg-split.1:33
+#, no-wrap
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6535,27 +6618,27 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 #, fuzzy, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6563,7 +6646,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6571,17 +6654,23 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr ""
 
+# type: TP
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6589,25 +6678,25 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:92
+#: dpkg-split.1:76
 #, no-wrap
-msgid "B<--auto>, B<-a>"
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6615,21 +6704,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6637,18 +6726,18 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 #, fuzzy, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-l>, B<--listq>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -6656,96 +6745,77 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:134
-#, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr ""
+#: dpkg-split.1:118
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
 msgstr ""
 
-# type: Plain text
-#: dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr ""
-
-# type: Plain text
-#: dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:166
-#, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
-msgstr ""
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
+msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:170
+#: dpkg-split.1:147
 #, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 #, fuzzy, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--new> | B<--old>"
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -6754,19 +6824,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -6774,20 +6844,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
 msgstr ""
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -6795,14 +6865,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -6810,28 +6880,28 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -6839,19 +6909,19 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -6859,13 +6929,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 #, fuzzy
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
 "Copyright (C) 1995-1996 by him and released under the GNU General Public "
@@ -6892,23 +6962,12 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -6919,123 +6978,101 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:34
+#: dpkg-statoverride.8:25
 #, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+msgid "B<--add>I< user group mode file>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, fuzzy, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
 "glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr ""
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<822-date>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 
-# type: Plain text
-#: dpkg-statoverride.8:64
-msgid "Be less verbose about what we do."
-msgstr ""
-
 # type: Plain text
 #: dpkg-statoverride.8:67
-msgid "Show usage information."
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
-msgstr ""
-
-# type: TP
-#: dpkg-statoverride.8:70
-#, no-wrap
-msgid "B<--admindir>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
+msgid "Be less verbose about what we do."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -7043,14 +7080,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 #, fuzzy
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Copyright 2001 Joey Hess"
@@ -7128,6 +7165,12 @@ msgstr ""
 "командной строке, но без начальных дефисов), либо комментарием (если "
 "начинается с B<#>)."
 
+# type: TP
+#: dselect.1:52
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7349,6 +7392,12 @@ msgid ""
 "successfully."
 msgstr ""
 
+# type: Plain text
+#: dselect.1:131
+#, fuzzy
+msgid "Print version information and exit successfully."
+msgstr "Выдать информацию о версии и завершить работу."
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -8400,28 +8449,13 @@ msgstr ""
 "start-stop-daemon -- запускает и останавливает системные программы-демоны"
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr ""
-"B<start-stop-daemon> B<-S>|B<--start> I<параметры> [B<-->] I<аргументы>"
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
-msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<параметры>"
-
-# type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
+msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<параметры>"
 
 # type: Plain text
-#: start-stop-daemon.8:29
+#: start-stop-daemon.8:17
 msgid ""
 "B<start-stop-daemon> is used to control the creation and termination of "
 "system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
@@ -8434,15 +8468,42 @@ msgstr ""
 "запущенных экземпляров процесса."
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:36
+#, fuzzy
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
+msgstr ""
+"Заметим, что если не указан параметр B<--pidfile>, то B<start-stop-daemon> "
+"действует подобно B<killall(1).> B<start-stop-daemon> сканирует таблицу "
+"процессов в поисках любых процессов с нужным именем, uid, и/или gid (если "
+"указаны). Любой подходящий процесс предотвратит запуск демона, если указан "
+"параметр B<--start>. Всем подходящим процессам будет послан сигнал KILL, "
+"если указан параметр B<--stop>. Для демонов, у которых есть долго живущие "
+"потомки, которых нужно оставить работать при параметре B<--stop>нужно "
+"указывать pidfile."
+
+# type: Plain text
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|B<--start> I<параметры> [B<-->] I<аргументы>"
+
+# type: Plain text
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 "B<start-stop-daemon> с параметром B<--start> проверяет существование "
 "указанного процесса. Если такой процесс существует, B<start-stop-daemon> "
@@ -8452,15 +8513,22 @@ msgstr ""
 "(либо параметром B<--startas>). Все аргументы, заданные в командной строке "
 "после B<-->, будут без изменений переданы запускаемой программе."
 
+# type: TP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-o>|B<--oknodo>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 "B<start-stop-daemon> с параметром B<--stop> также проверяет существование "
 "заданного процесса. Если такой процесс существует, то B<start-stop-daemon> "
@@ -8470,35 +8538,38 @@ msgstr ""
 "B<--oknodo>). Если указан параметр B<--retry>, то B<start-stop-daemon> будет "
 "проверять, что процесс(ы) завершили работу."
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-H>|B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:76
 #, fuzzy
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
-msgstr ""
-"Заметим, что если не указан параметр B<--pidfile>, то B<start-stop-daemon> "
-"действует подобно B<killall(1).> B<start-stop-daemon> сканирует таблицу "
-"процессов в поисках любых процессов с нужным именем, uid, и/или gid (если "
-"указаны). Любой подходящий процесс предотвратит запуск демона, если указан "
-"параметр B<--start>. Всем подходящим процессам будет послан сигнал KILL, "
-"если указан параметр B<--stop>. Для демонов, у которых есть долго живущие "
-"потомки, которых нужно оставить работать при параметре B<--stop>нужно "
-"указывать pidfile."
+msgid "Show usage information and exit."
+msgstr "Выдать подсказку и завершить работу."
 
 # type: TP
-#: start-stop-daemon.8:90
-#, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Выдать информацию о версии и завершить работу."
+
+# type: TP
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<исполняемый_файл>"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -8507,24 +8578,24 @@ msgstr ""
 "(согласно B</proc/>I<pid>B</exe>)."
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Проверить какой процесс создал I<pid-файл>."
 
 # type: TP
-#: start-stop-daemon.8:98
-#, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>|B<--user> I<имя_пользователя>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -8532,24 +8603,24 @@ msgstr ""
 "I<имени_пользователя> или I<uid>."
 
 # type: TP
-#: start-stop-daemon.8:104
-#, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>|B<--group> I<группа>|I<gid>"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Изменить группу на I<группу> или I<gid> при запуске процесса."
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<имя_процесса>"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -8558,13 +8629,13 @@ msgstr ""
 "stat>)."
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -8573,13 +8644,13 @@ msgstr ""
 "будет послан процессам для их останова (по умолчанию 15)."
 
 # type: TP
-#: start-stop-daemon.8:118
-#, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>|B<--retry> I<время_ожидания>|I<затем>"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -8593,7 +8664,7 @@ msgstr ""
 "заданное в параметре I<затем>."
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -8605,7 +8676,7 @@ msgstr ""
 "signal>."
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -8621,7 +8692,7 @@ msgstr ""
 "вечно, если нужно."
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -8633,13 +8704,13 @@ msgstr ""
 "игнорируется."
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -8649,13 +8720,13 @@ msgstr ""
 "параметра B<--exec>."
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -8664,37 +8735,37 @@ msgstr ""
 "код завершения, но не выполнять эти действия."
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Возвращать код 0 вместо 1, если не было выполнено (или не должно было быть "
 "выполнено) никаких действий."
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr "Не выдавать информационных сообщений; только сообщения об ошибках."
 
 # type: TP
-#: start-stop-daemon.8:183
-#, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c>|B<--chuid> I<имя-пользователя>|I<uid>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 #, fuzzy
 msgid ""
 "Change to this username/uid before starting the process. You can also "
@@ -8714,13 +8785,13 @@ msgstr ""
 "состоит (например, в случае с системным пользователем B<nobody>)."
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<root>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -8729,13 +8800,13 @@ msgstr ""
 "Заметим, что pid-файл будет создан после установки нового корневого каталога."
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<путь>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -8747,13 +8818,13 @@ msgstr ""
 "перед запуском процесса."
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 #, fuzzy
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
@@ -8774,36 +8845,36 @@ msgstr ""
 "добавить в них код для этого."
 
 # type: TP
-#: start-stop-daemon.8:226
-#, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+#: start-stop-daemon.8:217
+#, fuzzy, no-wrap
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<int>"
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "Этот параметр перед запуском изменяет приоритет процесса."
 
 # type: TP
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 #, fuzzy, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 #, fuzzy
 msgid "This sets the umask of the process before starting it."
 msgstr "Этот параметр перед запуском изменяет приоритет процесса."
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -8824,40 +8895,18 @@ msgstr ""
 "использовании вместе с параметром B<--background>."
 
 # type: TP
-#: start-stop-daemon.8:247
-#, no-wrap
-msgid "B<-v>|B<--verbose>"
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "Выдавать подробные информационные сообщения."
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr "Выдать подсказку и завершить работу."
-
-# type: TP
-#: start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr "Выдать информацию о версии и завершить работу."
-
 # type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -8866,7 +8915,7 @@ msgstr ""
 "на версии, сделанной Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -8880,12 +8929,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -8893,61 +8936,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr ""
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
 
 # type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -8958,7 +8960,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -8973,7 +8975,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -8984,7 +8986,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -8994,7 +8996,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -9006,7 +9008,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -9017,7 +9019,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -9027,7 +9029,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -9035,7 +9037,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -9047,14 +9049,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -9063,39 +9065,39 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -9103,227 +9105,113 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:223
-msgid ""
-"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
-"alternatives>' state information."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:223
-#, no-wrap
-msgid "link group"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:226
-msgid "A set of related symlinks, intended to be updated as a group."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:226
-#, no-wrap
-msgid "master link"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:230
-msgid ""
-"The link in a link group which determines how the other links in the group "
-"are configured."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:230
-#, no-wrap
-msgid "slave link"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:234
-msgid ""
-"A link in a link group which is controlled by the setting of the master link."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:234
-#, no-wrap
-msgid "automatic mode"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:240
-msgid ""
-"When a link group is in automatic mode, the alternatives system ensures that "
-"the links in the group point to the highest priority alternative appropriate "
-"for the group."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:240
-#, no-wrap
-msgid "manual mode"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:245
-msgid ""
-"When a link group is in manual mode, the alternatives system will not make "
-"any changes to the system administrator's settings."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:290
+#: update-alternatives.8:180
 msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
+"A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
+"alternatives>' state information."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:291
-#, fuzzy, no-wrap
-msgid "B<--verbose>"
-msgstr "B<-v>|B<--verbose>"
+#: update-alternatives.8:180
+#, no-wrap
+msgid "link group"
+msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
+#: update-alternatives.8:183
+msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
+# type: TP
+#: update-alternatives.8:183
+#, no-wrap
+msgid "master link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:304
+#: update-alternatives.8:187
 msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
+"The link in a link group which determines how the other links in the group "
+"are configured."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:307
-msgid "Give some usage information."
+# type: TP
+#: update-alternatives.8:187
+#, no-wrap
+msgid "slave link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
+#: update-alternatives.8:191
+msgid ""
+"A link in a link group which is controlled by the setting of the master link."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:312
+#: update-alternatives.8:191
 #, no-wrap
-msgid "B<--altdir> I<directory>"
+msgid "automatic mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:316
+#: update-alternatives.8:197
 msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
+"When a link group is in automatic mode, the alternatives system ensures that "
+"the links in the group point to the highest priority alternative appropriate "
+"for the group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:316
+#: update-alternatives.8:197
 #, no-wrap
-msgid "B<--admindir> I<directory>"
+msgid "manual mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:320
+#: update-alternatives.8:202
 msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
+"When a link group is in manual mode, the alternatives system will not make "
+"any changes to the system administrator's settings."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -9335,7 +9223,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -9347,26 +9235,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -9379,37 +9267,37 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, fuzzy, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<install>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, no-wrap
 msgid "B<--auto> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -9417,13 +9305,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, no-wrap
 msgid "B<--display> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -9433,24 +9321,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, no-wrap
 msgid "B<--list> I<link>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, fuzzy, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--log=>I<имя файла>"
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -9458,57 +9346,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:311
+#, fuzzy, no-wrap
+msgid "B<--verbose>"
+msgstr "B<-v>|B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -9518,14 +9451,59 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:367
+msgid "B<update-alternatives --display vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:374
+msgid "B<update-alternatives --config vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:381
+msgid "B<update-alternatives --auto vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -9533,7 +9511,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 #, fuzzy
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
@@ -9545,7 +9523,7 @@ msgstr ""
 "гарантий."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 #, fuzzy
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
@@ -9557,17 +9535,240 @@ msgstr ""
 "гарантий."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+# type: Plain text
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+
+# type: Plain text
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+
+# type: Plain text
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> и эту страницу руководства написал и передал в общественное "
+#~ "достояние Ian Jackson."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-23"
+#~ msgstr "2006-02-28"
+
+# type: SH
+#, fuzzy
+#~ msgid "ACTION OPTIONS"
+#~ msgstr "ПАРАМЕТРЫ"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "I<control>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Показать информацию о версии B<dpkg>."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--licence>"
+#~ msgstr "B<--nocheck>"
+
+# type: SH
+#, fuzzy
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "ПАРАМЕТРЫ"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<dpkg --help>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg -i> | B<--install> I<имя файла пакета>..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg -A> | B<--record-avail> I<имя файла пакета> ..."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg --licence> | B<dpkg --license>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg --version>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Показать информацию о версии B<dpkg>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Display version information."
+#~ msgstr "Показать информацию о версии B<dpkg>."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-10"
+#~ msgstr "2006-02-28"
+
+# type: SH
+#, fuzzy
+#~ msgid "COMMON OPTIONS"
+#~ msgstr "ПАРАМЕТРЫ"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<-B>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<--log=>I<имя файла>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#~ msgstr "B<822-date> не использует аргументов или параметров."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#~ msgstr "B<822-date> не использует аргументов или параметров."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#~ msgstr "B<822-date> не использует аргументов или параметров."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
+#~ "arguments."
+#~ msgstr "B<822-date> не использует аргументов или параметров."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "Это свободная программа; смотрите Универсальную Общественную Лицензии GNU "
+#~ "версии 2 или более позднюю, где изложены условия распространения. НИКАКИХ "
+#~ "гарантий."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg -C> | B<--audit>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<-t>|B<--test>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--new> | B<--old>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+
+# type: TP
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "Print version information; then exit."
+#~ msgstr "Выдать информацию о версии и завершить работу."
+
 # type: TP
 #~ msgid "B<DPKG_OLD_CONFFILE>"
 #~ msgstr "B<DPKG_OLD_CONFFILE>"
diff --git a/man/po/sv.po b/man/po/sv.po
index 90930a16..bedb09a5 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2007-01-13 19:21+0100\n"
+"POT-Creation-Date: 2007-03-20 23:52+0200\n"
 "PO-Revision-Date: 2006-05-14 16:18+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -14,35 +14,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
-#: 822-date.1:3
+#: 822-date.1:2
 #, no-wrap
 msgid "822-date"
 msgstr "822-date"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
-#: dpkg.cfg.5:1 dpkg-name.1:6 dpkg-split.1:2 dselect.1:1 dselect.cfg.5:1
-#: install-info.8:5 start-stop-daemon.8:1
-#, no-wrap
-msgid "2006-02-28"
+#: 822-date.1:2
+#, fuzzy, no-wrap
+msgid "2007-01-24"
 msgstr "2006-02-28"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.1:1
-#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-checkbuilddeps.1:1 dpkg-deb.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1 dpkg-scanpackages.1:16
-#: dpkg-scansources.1:1 dpkg-source.1:2 dpkg-split.1:2 dselect.1:1
-#: dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
+#: 822-date.1:2 cleanup-info.8:1 deb.5:1 deb-control.5:3 deb-old.5:1
+#: deb-override.5:16 deb-shlibs.5:16 deb-substvars.5:2 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg.cfg.5:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-deb.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:16
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2
+#: dselect.1:1 dselect.cfg.5:1 install-info.8:5 start-stop-daemon.8:1
 #: update-alternatives.8:8
 #, no-wrap
 msgid "Debian Project"
 msgstr "Debianprojektet"
 
 # type: TH
-#: 822-date.1:3 cleanup-info.8:1 dpkg-architecture.1:1 dpkg-checkbuilddeps.1:1
-#: dpkg-divert.8:1 dpkg-name.1:6 dpkg-scanpackages.1:16 dpkg-scansources.1:1
-#: dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1 install-info.8:5
-#: start-stop-daemon.8:1 update-alternatives.8:8
+#: 822-date.1:2 cleanup-info.8:1 deb-override.5:16 deb-shlibs.5:16
+#: deb-substvars.5:2 dpkg-architecture.1:1 dpkg-buildpackage.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-divert.8:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-name.1:6
+#: dpkg-parsechangelog.1:1 dpkg-scanpackages.1:16 dpkg-scansources.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-split.1:2 dpkg-statoverride.8:1
+#: install-info.8:5 start-stop-daemon.8:1 update-alternatives.8:8
 #, fuzzy, no-wrap
 msgid "dpkg utilities"
 msgstr ""
@@ -52,130 +56,140 @@ msgstr ""
 "dpkg-verktygen"
 
 # type: SH
-#: 822-date.1:4 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2 dpkg.1:2
-#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-checkbuilddeps.1:2 dpkg-deb.1:2
-#: dpkg-divert.8:2 dpkg-name.1:7 dpkg-query.1:2 dpkg-scanpackages.1:17
-#: dpkg-scansources.1:2 dpkg-source.1:3 dpkg-split.1:3 dpkg-statoverride.8:2
-#: dselect.1:2 dselect.cfg.5:2 install-info.8:6 start-stop-daemon.8:2
-#: update-alternatives.8:9
+#: 822-date.1:3 cleanup-info.8:2 deb.5:2 deb-control.5:4 deb-old.5:2
+#: deb-override.5:17 deb-shlibs.5:17 deb-substvars.5:3 dpkg.1:2
+#: dpkg-architecture.1:2 dpkg.cfg.5:2 dpkg-buildpackage.1:2
+#: dpkg-checkbuilddeps.1:2 dpkg-distaddfile.1:2 dpkg-deb.1:2 dpkg-divert.8:2
+#: dpkg-genchanges.1:2 dpkg-gencontrol.1:2 dpkg-name.1:7
+#: dpkg-parsechangelog.1:2 dpkg-query.1:2 dpkg-scanpackages.1:17
+#: dpkg-scansources.1:2 dpkg-shlibdeps.1:2 dpkg-source.1:3 dpkg-split.1:3
+#: dpkg-statoverride.8:2 dselect.1:2 dselect.cfg.5:2 install-info.8:6
+#: start-stop-daemon.8:2 update-alternatives.8:9
 #, no-wrap
 msgid "NAME"
 msgstr "NAMN"
 
 # type: Plain text
-#: 822-date.1:6
-msgid "822-date - Print date and time in RFC822 format"
+#: 822-date.1:5
+#, fuzzy
+msgid "822-date - Print date and time in RFC2822 format"
 msgstr "822-date - Skriv datum och tid i RFC822-format"
 
 # type: SH
-#: 822-date.1:7 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5 dpkg.1:5
-#: dpkg-architecture.1:5 dpkg-checkbuilddeps.1:5 dpkg-deb.1:4 dpkg-divert.8:5
-#: dpkg-name.1:9 dpkg-query.1:5 dpkg-scanpackages.1:20 dpkg-scansources.1:5
-#: dpkg-source.1:8 dpkg-split.1:5 dpkg-statoverride.8:5 dselect.1:5
+#: 822-date.1:6 cleanup-info.8:5 deb.5:4 deb-control.5:7 deb-old.5:5
+#: deb-override.5:20 deb-shlibs.5:20 deb-substvars.5:7 dpkg.1:5
+#: dpkg-architecture.1:5 dpkg-buildpackage.1:5 dpkg-checkbuilddeps.1:5
+#: dpkg-distaddfile.1:5 dpkg-deb.1:5 dpkg-divert.8:5 dpkg-genchanges.1:5
+#: dpkg-gencontrol.1:5 dpkg-name.1:10 dpkg-parsechangelog.1:5 dpkg-query.1:5
+#: dpkg-scanpackages.1:20 dpkg-scansources.1:5 dpkg-shlibdeps.1:5
+#: dpkg-source.1:7 dpkg-split.1:6 dpkg-statoverride.8:5 dselect.1:5
 #: install-info.8:9 start-stop-daemon.8:5 update-alternatives.8:12
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPS"
 
 # type: Plain text
-#: 822-date.1:9
+#: 822-date.1:8
 msgid "B<822-date>"
 msgstr "B<822-date>"
 
 # type: SH
-#: 822-date.1:10 cleanup-info.8:10 deb.5:6 deb-control.5:10 deb-old.5:8
-#: dpkg.1:19 dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-checkbuilddeps.1:8
-#: dpkg-deb.1:36 dpkg-divert.8:26 dpkg-name.1:22 dpkg-query.1:36
-#: dpkg-scanpackages.1:31 dpkg-scansources.1:14 dpkg-source.1:33
-#: dpkg-split.1:28 dpkg-statoverride.8:19 dselect.1:18 dselect.cfg.5:5
-#: install-info.8:25 start-stop-daemon.8:22 update-alternatives.8:60
+#: 822-date.1:9 cleanup-info.8:11 deb.5:6 deb-control.5:10 deb-old.5:8
+#: deb-override.5:23 deb-shlibs.5:23 deb-substvars.5:10 dpkg.1:19
+#: dpkg-architecture.1:11 dpkg.cfg.5:5 dpkg-buildpackage.1:9
+#: dpkg-checkbuilddeps.1:10 dpkg-distaddfile.1:9 dpkg-deb.1:10
+#: dpkg-divert.8:10 dpkg-genchanges.1:10 dpkg-gencontrol.1:9 dpkg-name.1:16
+#: dpkg-parsechangelog.1:9 dpkg-query.1:9 dpkg-scanpackages.1:29
+#: dpkg-scansources.1:14 dpkg-shlibdeps.1:11 dpkg-source.1:12 dpkg-split.1:11
+#: dpkg-statoverride.8:10 dselect.1:18 dselect.cfg.5:5 install-info.8:25
+#: start-stop-daemon.8:10 update-alternatives.8:17
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
 # type: Plain text
-#: 822-date.1:14
+#: 822-date.1:15
+#, fuzzy
 msgid ""
 "B<822-date> displays the current date and time in the format described in "
-"RFC822, using a numeric timezone offset as recommended in RFC1123."
+"RFC2822.  It does so by simply calling B<date>(1)  with the B<-R> option."
 msgstr ""
 "B<822-date> visar aktuellt datum och tid i det format som beskrivs av "
 "RFC822, med en numerisk tidszonsförskjutning enligt rekommendationen i "
 "RFC1123."
 
+# type: Plain text
+#: 822-date.1:19
+msgid ""
+"B<Using 822-date is deprecated since> B<date>(1)  provides the same "
+"functionality when called with the B<-R>."
+msgstr ""
+
 # type: SH
-#: 822-date.1:15 cleanup-info.8:29 dpkg.1:293 dpkg-architecture.1:27
-#: dpkg-checkbuilddeps.1:16 dpkg-divert.8:44 dpkg-name.1:33 dpkg-query.1:93
-#: dpkg-scansources.1:44 dpkg-statoverride.8:33 dselect.1:45 install-info.8:39
-#: start-stop-daemon.8:88 update-alternatives.8:285
+#: 822-date.1:20 cleanup-info.8:30 dpkg.1:293 dpkg-architecture.1:68
+#: dpkg-buildpackage.1:14 dpkg-checkbuilddeps.1:18 dpkg-distaddfile.1:27
+#: dpkg-deb.1:172 dpkg-divert.8:38 dpkg-genchanges.1:17 dpkg-gencontrol.1:16
+#: dpkg-name.1:28 dpkg-parsechangelog.1:15 dpkg-query.1:69
+#: dpkg-scanpackages.1:70 dpkg-scansources.1:45 dpkg-shlibdeps.1:36
+#: dpkg-source.1:67 dpkg-split.1:137 dpkg-statoverride.8:51 dselect.1:45
+#: install-info.8:39 start-stop-daemon.8:80 update-alternatives.8:302
 #, no-wrap
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
 # type: Plain text
-#: 822-date.1:18
+#: 822-date.1:23
 msgid "B<822-date> does not take any arguments or options."
 msgstr "B<822-date> tar inga flaggor eller parametrar."
 
 # type: SH
-#: 822-date.1:19 cleanup-info.8:47 dpkg.1:609 dpkg-deb.1:249 dpkg-name.1:91
-#: dpkg-source.1:825 dpkg-split.1:221 dselect.1:427 update-alternatives.8:446
+#: 822-date.1:24 cleanup-info.8:48 deb-substvars.5:126 dpkg.1:609
+#: dpkg-buildpackage.1:181 dpkg-deb.1:221 dpkg-name.1:87 dpkg-source.1:264
+#: dpkg-split.1:200 dselect.1:427 update-alternatives.8:383
 #, no-wrap
 msgid "BUGS"
 msgstr "PROGRAMFEL"
 
 # type: Plain text
-#: 822-date.1:22
+#: 822-date.1:27
 msgid "This facility really ought to be part of B<date>(1)."
 msgstr "Denna funktion borde ingå i B<date>(1)."
 
 # type: SH
-#: 822-date.1:23 cleanup-info.8:50 deb.5:67 deb-control.5:204 deb-old.5:51
-#: dpkg.1:599 dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:265
-#: dpkg-divert.8:124 dpkg-name.1:100 dpkg-query.1:182 dpkg-scanpackages.1:132
-#: dpkg-scansources.1:64 dpkg-source.1:839 dpkg-split.1:245
-#: dpkg-statoverride.8:85 dselect.1:443 dselect.cfg.5:21 install-info.8:277
-#: update-alternatives.8:466
+#: 822-date.1:28 cleanup-info.8:51 deb.5:67 deb-control.5:204 deb-old.5:51
+#: deb-override.5:67 deb-shlibs.5:29 deb-substvars.5:130 dpkg.1:599
+#: dpkg-architecture.1:268 dpkg.cfg.5:21 dpkg-deb.1:238 dpkg-divert.8:118
+#: dpkg-name.1:97 dpkg-query.1:158 dpkg-scanpackages.1:95
+#: dpkg-scansources.1:65 dpkg-shlibdeps.1:127 dpkg-source.1:275
+#: dpkg-split.1:226 dpkg-statoverride.8:78 dselect.1:443 dselect.cfg.5:21
+#: install-info.8:277 update-alternatives.8:403
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SE ÄVEN"
 
 # type: Plain text
-#: 822-date.1:26
-msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-
-# type: Plain text
-#: 822-date.1:29
-msgid ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
+#: 822-date.1:32
+msgid "I<Internet Message Format> (RFC2822), B<date>(1)."
 msgstr ""
-"I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-"section 5.2.14,"
-
-# type: Plain text
-#: 822-date.1:31
-msgid "B<date>(1)."
-msgstr "B<date>(1)."
 
 # type: SH
-#: 822-date.1:32 cleanup-info.8:53 dpkg-architecture.1:272 dpkg.cfg.5:17
-#: dpkg-checkbuilddeps.1:25 dpkg-deb.1:270 dpkg-divert.8:126 dpkg-query.1:173
-#: dpkg-scansources.1:67 dpkg-source.1:845 dpkg-split.1:251
-#: dpkg-statoverride.8:88 dselect.cfg.5:17 update-alternatives.8:455
+#: 822-date.1:33 cleanup-info.8:54 deb-substvars.5:137 dpkg-architecture.1:272
+#: dpkg.cfg.5:17 dpkg-checkbuilddeps.1:31 dpkg-deb.1:244 dpkg-divert.8:121
+#: dpkg-query.1:149 dpkg-scansources.1:69 dpkg-split.1:232
+#: dpkg-statoverride.8:81 dselect.cfg.5:17 update-alternatives.8:392
 #, no-wrap
 msgid "AUTHOR"
 msgstr "FÖRFATTARE"
 
 # type: Plain text
-#: 822-date.1:35
+#: 822-date.1:40
 msgid ""
-"B<822-date> and this manpage were written by Ian Jackson. They are hereby "
-"placed by him into the public domain."
+"B<822-date> is a really simple wrapper around B<date>(1).  By its "
+"simplicity, the code is probably not copyrightable and should be considered "
+"to be in the public domain. This man page was written by Frank Lichtenheld "
+"based on an earlier version by Ian Jackson and was also put in the public "
+"domain."
 msgstr ""
-"B<822-date> och denna manualsida skrevs av Ian Jackson. De är härmed av "
-"honom släppta som allmängods (public domain)."
 
 # type: TH
 #: cleanup-info.8:1
@@ -183,20 +197,28 @@ msgstr ""
 msgid "cleanup-info"
 msgstr ""
 
+# type: TH
+#: cleanup-info.8:1 deb-substvars.5:2 dpkg-architecture.1:1
+#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-name.1:6 dpkg-query.1:1
+#: dpkg-scanpackages.1:16 dpkg-scansources.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 start-stop-daemon.8:1 update-alternatives.8:8
+#, fuzzy, no-wrap
+msgid "2007-03-06"
+msgstr "2006-04-09"
+
 # type: Plain text
 #: cleanup-info.8:4
 msgid "cleanup-info - clean up the mess that bogus install-info may have done"
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:9
-msgid ""
-"B<cleanup-info> [B<--help>] [B<--unsafe>] [B<--version>] [B<-->] "
-"[I<E<lt>dirnameE<gt>>]"
-msgstr ""
+#: cleanup-info.8:10
+#, fuzzy
+msgid "B<cleanup-info> [I<options>] [B<-->] [I<dirname>]"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: cleanup-info.8:17
+#: cleanup-info.8:18
 msgid ""
 "B<cleanup-info> is a Perl script that tries to clean up the mess that bogus "
 "B<install-info>(8)  may have done.  It gathers all sections with the same "
@@ -205,21 +227,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:20
+#: cleanup-info.8:21
 msgid ""
 "Other clean-ups include removing of empty sections, and squeezing the blank "
 "lines (in entries part only)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:23
+#: cleanup-info.8:24
 msgid ""
 "Order of sections is preserved (the first encountered section counts).  "
 "Order of entries within a section is preserved."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:28
+#: cleanup-info.8:29
 msgid ""
 "Please be B<extremely careful> when using this utility - it might not be "
 "100% safe. cleanup-info tries to be careful with your info dir file, but "
@@ -228,89 +250,103 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:30 dpkg-architecture.1:76 dpkg-divert.8:73
-#: dpkg-scansources.1:47 dpkg-statoverride.8:64 dselect.1:121
-#: install-info.8:195 update-alternatives.8:304
-#, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: Plain text
-#: cleanup-info.8:33
-#, fuzzy
-msgid "Output the help screen and exit successfully."
-msgstr "Visar en kort hjälptext och ger lyckat avslut."
-
-# type: TP
-#: cleanup-info.8:33
+#: cleanup-info.8:31
 #, fuzzy, no-wrap
 msgid "B<--unsafe>"
 msgstr "B<--new>"
 
 # type: Plain text
-#: cleanup-info.8:36
+#: cleanup-info.8:34
 msgid "Set some additional possibly useful options."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:38
+#: cleanup-info.8:36
 msgid "B<Warning: the `--unsafe' option may garble an otherwise correct file!>"
 msgstr ""
 
 # type: TP
-#: cleanup-info.8:38 dpkg-architecture.1:79 dpkg-deb.1:198 dpkg-divert.8:76
-#: dpkg-query.1:89 dpkg-scansources.1:61 dpkg-source.1:101 dpkg-split.1:148
-#: dpkg-statoverride.8:67 dselect.1:128 install-info.8:200
-#: update-alternatives.8:307
+#: cleanup-info.8:36 dpkg-architecture.1:61 dpkg-divert.8:67
+#: dpkg-scansources.1:60 dpkg-statoverride.8:44 dselect.1:121
+#: install-info.8:195 update-alternatives.8:295
+#, no-wrap
+msgid "B<--help>"
+msgstr "B<--help>"
+
+# type: Plain text
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-checkbuilddeps.1:30 dpkg-distaddfile.1:35 dpkg-deb.1:165
+#: dpkg-divert.8:70 dpkg-genchanges.1:142 dpkg-gencontrol.1:101 dpkg-name.1:59
+#: dpkg-parsechangelog.1:36 dpkg-query.1:62 dpkg-scanpackages.1:84
+#: dpkg-scansources.1:62 dpkg-shlibdeps.1:112 dpkg-source.1:63
+#: dpkg-split.1:130 dpkg-statoverride.8:47 update-alternatives.8:298
+#, fuzzy
+msgid "Show the usage message and exit."
+msgstr "Visar en kort hjälptext och ger lyckat avslut."
+
+# type: TP
+#: cleanup-info.8:39 dpkg-architecture.1:64 dpkg-buildpackage.1:177
+#: dpkg-distaddfile.1:35 dpkg-deb.1:165 dpkg-divert.8:70 dpkg-genchanges.1:142
+#: dpkg-gencontrol.1:101 dpkg-parsechangelog.1:36 dpkg-query.1:62
+#: dpkg-scanpackages.1:84 dpkg-scansources.1:62 dpkg-shlibdeps.1:112
+#: dpkg-source.1:63 dpkg-split.1:130 dpkg-statoverride.8:47 dselect.1:128
+#: install-info.8:200 update-alternatives.8:298
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
-#: cleanup-info.8:41
+#: cleanup-info.8:42 dpkg-architecture.1:67 dpkg-buildpackage.1:180
+#: dpkg-distaddfile.1:38 dpkg-deb.1:168 dpkg-divert.8:73 dpkg-genchanges.1:145
+#: dpkg-gencontrol.1:104 dpkg-name.1:62 dpkg-parsechangelog.1:39
+#: dpkg-query.1:65 dpkg-scanpackages.1:87 dpkg-scansources.1:64
+#: dpkg-shlibdeps.1:115 dpkg-source.1:66 dpkg-split.1:133
+#: dpkg-statoverride.8:50 update-alternatives.8:301
 #, fuzzy
-msgid "Output version and exit successfully."
-msgstr "Visar versionsinformation och ger lyckat avslut."
+msgid "Show the version and exit."
+msgstr "Skriv ut versionsinformation och avsluta sedan."
 
 # type: SH
-#: cleanup-info.8:42 dpkg.1:496 dpkg.cfg.5:12 dpkg-divert.8:114
-#: dpkg-source.1:788 dpkg-split.1:235 dpkg-statoverride.8:75 dselect.cfg.5:12
-#: update-alternatives.8:415
+#: cleanup-info.8:43 deb-substvars.5:121 dpkg.1:496 dpkg.cfg.5:12
+#: dpkg-buildpackage.1:186 dpkg-distaddfile.1:39 dpkg-divert.8:108
+#: dpkg-genchanges.1:146 dpkg-gencontrol.1:105 dpkg-parsechangelog.1:40
+#: dpkg-shlibdeps.1:116 dpkg-split.1:215 dpkg-statoverride.8:68
+#: dselect.cfg.5:12 update-alternatives.8:325
 #, no-wrap
 msgid "FILES"
 msgstr "FILER"
 
 # type: TP
-#: cleanup-info.8:43
+#: cleanup-info.8:44
 #, fuzzy, no-wrap
 msgid "I</usr/info/dir> or I<E<lt>dirnameE<gt>/dir>"
 msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
 
 # type: Plain text
-#: cleanup-info.8:46
+#: cleanup-info.8:47
 msgid ""
 "The info directory file. The lock file is named the same, with \".lock\" "
 "suffix."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:49
+#: cleanup-info.8:50
 msgid "Probably many."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:53
+#: cleanup-info.8:54
 msgid "B<install-info>(8), B<info>(1)."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:55
+#: cleanup-info.8:56
 msgid "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
 # type: Plain text
-#: cleanup-info.8:57 dpkg-checkbuilddeps.1:32 dpkg-divert.8:130
-#: dpkg-query.1:181 dpkg-statoverride.8:95
+#: cleanup-info.8:58 dpkg-checkbuilddeps.1:38 dpkg-divert.8:125
+#: dpkg-query.1:157 dpkg-statoverride.8:88
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
 "for copying conditions. There is NO warranty."
@@ -324,6 +360,13 @@ msgstr ""
 msgid "deb"
 msgstr "deb"
 
+# type: TH
+#: deb.5:1 deb-control.5:3 deb-old.5:1 dpkg.cfg.5:1 dselect.1:1
+#: dselect.cfg.5:1 install-info.8:5
+#, no-wrap
+msgid "2006-02-28"
+msgstr "2006-02-28"
+
 # type: TH
 #: deb.5:1 deb-control.5:3 deb-old.5:1 dselect.1:1
 #, no-wrap
@@ -1030,434 +1073,852 @@ msgid "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgstr "B<deb>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 # type: TH
-#: dpkg.1:1
-#, no-wrap
-msgid "dpkg"
-msgstr "dpkg"
+#: deb-override.5:16
+#, fuzzy, no-wrap
+msgid "deb-override"
+msgstr "deb-old"
 
 # type: TH
-#: dpkg.1:1 dpkg-query.1:1
-#, no-wrap
-msgid "2006-04-09"
+#: deb-override.5:16 dpkg-buildpackage.1:1 dpkg-distaddfile.1:1
+#: dpkg-genchanges.1:1 dpkg-gencontrol.1:1 dpkg-parsechangelog.1:1
+#: dpkg-shlibdeps.1:1 dpkg-source.1:2
+#, fuzzy, no-wrap
+msgid "2007-03-07"
 msgstr "2006-04-09"
 
-# type: TH
-#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
-#, no-wrap
-msgid "dpkg suite"
-msgstr "Dpkg-sviten"
-
 # type: Plain text
-#: dpkg.1:4
-msgid "dpkg - package manager for Debian"
-msgstr "dpkg - en mellannivåpakethanterare för Debian"
+#: deb-override.5:19
+msgid "deb-override - Debian archive override file"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:8
-msgid "B<dpkg> [I<options>] I<action>"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
-
-# type: SH
-#: dpkg.1:9
-#, no-wrap
-msgid "WARNING"
-msgstr "VARNING"
+#: deb-override.5:22
+msgid "override"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:13
+#: deb-override.5:29
 msgid ""
-"This manual is intended for users wishing to understand B<dpkg>'s command "
-"line options and package states in more detail than that provided by B<dpkg "
-"--help>."
+"While most information about a package can be found in the control file, "
+"some must be filled in by the distribution czars rather than by the "
+"maintainer, because they relate to the arrangement of files for release "
+"rather than the actual dependencies and description of the package.  This "
+"information is found in the override file."
 msgstr ""
-"Denna manual är avsedd för användare som vill få en mer detaljerad "
-"förståelse för B<dpkg>s kommandoradsflaggor och pakettillstånd än vad som "
-"berättas med B<dpkg --help>."
 
 # type: Plain text
-#: dpkg.1:18
+#: deb-override.5:33
 msgid ""
-"It should I<not> be used by package maintainers wishing to understand how "
-"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
-"when installing and removing packages are particularly inadequate."
+"The override file has a simple whitespace-delimited format. Comments are "
+"allowed (denoted with a B<#>)."
 msgstr ""
-"Den bör I<inte> användas av paketansvariga som vill lära sig hur B<dpkg> "
-"kommer att installera deras paket. Beskrivningen över vad B<dpkg> gör när "
-"paket installeras och tas bort är speciellt otillräckliga."
 
 # type: Plain text
-#: dpkg.1:26
-#, fuzzy
-msgid ""
-"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
-"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
-"B<dpkg> itself is controlled entirely via command line parameters, which "
-"consist of exactly one action and zero or more options. The action-parameter "
-"tells B<dpkg> what to do and options control the behavior of the action in "
-"some way."
+#: deb-override.5:39
+msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
 msgstr ""
-"B<dpkg> är ett mellannivåverktyg för att installera, bygga, ta bort och "
-"hantera Debianpaket. Det primära och mer användarvänliga skalet runt B<dpkg> "
-"är B<dselect>(1). B<dpkg> kontrolleras helt och hållet via "
-"kommandoradsflaggor, vilka består av exakt en åtgärd och noll eller fler "
-"tillval. Åtgärdsparametern talar om för dpkg vad som skall göras, och "
-"tillvalen styr på vilket sätt åtgärden skall utföras."
 
 # type: Plain text
-#: dpkg.1:31
-#, fuzzy
+#: deb-override.5:44
 msgid ""
-"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
-"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-"B<dpkg-deb> with the parameters given to it:"
+"I<package> is the name of the package. Entries in the override file for "
+"packages not found in the tree of binary packages are ignored."
 msgstr ""
-"B<dpkg> kan även användas som ett skal runt B<dpkg-deb>. Följande är "
-"åtgärder för B<dpkg-deb>, och om de upptäcks kör B<dpkg> helt enkelt B<dpkg-"
-"deb> med de flaggor som getts:"
 
 # type: Plain text
-#: dpkg.1:40
-#, no-wrap
+#: deb-override.5:53
 msgid ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, and\n"
-"    B<--fsys-tarfile>.\n"
+"I<priority> and I<section> place the package within the release tree; these "
+"ought not to be found in the control file. If the package is found in a "
+"subdirectory of I<binarydir>, that will be checked against I<section>."
 msgstr ""
-"    B<-b>, B<--build>,\n"
-"    B<-c>, B<--contents>,\n"
-"    B<-I>, B<--info>,\n"
-"    B<-f>, B<--field>,\n"
-"    B<-e>, B<--control>,\n"
-"    B<-x>, B<--extract>,\n"
-"    B<-X>, B<--vextract>, och\n"
-"    B<--fsys-tarfile>.\n"
 
 # type: Plain text
-#: dpkg.1:42
-msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-msgstr "Se B<dpkg-deb>(1) för information om dessa åtgärder."
-
-# type: SH
-#: dpkg.1:43
-#, no-wrap
-msgid "INFORMATION ABOUT PACKAGES"
-msgstr "INFORMATION OM PAKET"
+#: deb-override.5:61
+msgid ""
+"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
+"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
+"to perform a substitution."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:48
+#: deb-override.5:66
 msgid ""
-"B<dpkg> maintains some usable information about available packages. The "
-"information is divided in three classes: B<states>, B<selection states> and "
-"B<flags>. These values are intended to be changed mainly with B<dselect>."
+"The override files used to make the official Packages lists may be found in "
+"the I<indices> directory on any Debian mirror."
 msgstr ""
-"B<dpkg> upprätthåller viss användbar information om tillgängliga paket. "
-"Informationen delas in i tre klasser: B<tillstånd>, B<markeringstillstånd> "
-"och B<flaggor>. Dessa värden är avsedda att huvudsakligen ändras via "
-"B<dselect>."
 
-# type: SS
-#: dpkg.1:48
-#, no-wrap
-msgid "PACKAGE STATES"
-msgstr "PAKETTILLSTÅND"
+# type: Plain text
+#: deb-override.5:70
+#, fuzzy
+msgid "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1)."
+msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg.1:49
+# type: TH
+#: deb-shlibs.5:16
 #, no-wrap
-msgid "B<installed>"
-msgstr "B<installerat>"
+msgid "deb-shlibs"
+msgstr ""
+
+# type: TH
+#: deb-shlibs.5:16
+#, fuzzy, no-wrap
+msgid "2007-03-08"
+msgstr "2006-02-28"
 
 # type: Plain text
-#: dpkg.1:52
-msgid "The package is unpacked and configured OK."
-msgstr "Paketet är uppackat och korrekt inställt."
+#: deb-shlibs.5:19
+msgid "deb-shlibs - Debian shared library information file"
+msgstr ""
 
-# type: TP
-#: dpkg.1:52
-#, no-wrap
-msgid "B<half-installed>"
-msgstr "B<halvt installerat>"
+# type: Plain text
+#: deb-shlibs.5:22
+msgid "shlibs"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:56
+#: deb-shlibs.5:26
 msgid ""
-"The installation of the package has been started, but not completed for some "
-"reason."
+"The format for a shared library dependency information entry in these files "
+"is (see the Debian Policy Manual for details):"
 msgstr ""
-"Installationen av paketet har påbörjats, men av någon orsak inte slutförts."
-
-# type: TP
-#: dpkg.1:56
-#, no-wrap
-msgid "B<not-installed>"
-msgstr "B<ej installerat>"
 
 # type: Plain text
-#: dpkg.1:59
-msgid "The package is not installed on your system."
-msgstr "Paketet är inte installerat på ditt system."
+#: deb-shlibs.5:28
+msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+msgstr ""
 
 # type: TP
-#: dpkg.1:59
-#, no-wrap
-msgid "B<unpacked>"
-msgstr "B<uppackat>"
-
-# type: Plain text
-#: dpkg.1:62
-msgid "The package is unpacked, but not configured."
-msgstr "Paketet är uppackat, men inte konfigurerat."
+#: deb-shlibs.5:30
+#, fuzzy
+msgid "B<dpkg-shlibdeps>(1)."
+msgstr "B<dpkg-deb-åtgärder>"
 
 # type: TP
-#: dpkg.1:62
-#, no-wrap
-msgid "B<half-configured>"
-msgstr "B<halvt konfigurerat>"
+#: deb-substvars.5:2
+#, fuzzy, no-wrap
+msgid "deb-substvars"
+msgstr "B<ta bort>"
 
 # type: Plain text
-#: dpkg.1:66
-msgid ""
-"The package is unpacked and configuration has been started, but not yet "
-"completed for some reason."
+#: deb-substvars.5:6
+msgid "deb-substvars - Debian source substitution variables"
 msgstr ""
-"Paketet är uppackat och konfigurationen har påbörjats, men av någon orsak "
-"inte slutförts."
 
 # type: TP
-#: dpkg.1:66
-#, no-wrap
-msgid "B<config-files>"
-msgstr "B<konfigurationsfiler>"
+#: deb-substvars.5:9
+#, fuzzy
+msgid "substvars"
+msgstr "B<ta bort>"
 
 # type: Plain text
-#: dpkg.1:69
-msgid "Only the configuration files of the package exist on the system."
-msgstr "Endast konfigurationsfilerna för paketet finns på systemet."
+#: deb-substvars.5:20
+msgid ""
+"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
+"control information (to the source control file B<.dsc> for B<dpkg-source> "
+"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
+"perform some variable substitutions on the output file."
+msgstr ""
 
-# type: SS
-#: dpkg.1:69
-#, no-wrap
-msgid "PACKAGE SELECTION STATES"
-msgstr "MARKERINGSTILLSTÅND FÖR PAKET"
+# type: Plain text
+#: deb-substvars.5:27
+msgid ""
+"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+"names consist of alphanumerics, hyphens and colons and start with an "
+"alphanumeric. Variable substitutions are performed repeatedly until none are "
+"left; the full text of the field after the substitution is rescanned to look "
+"for more substitutions."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:34
+msgid ""
+"After all the substitutions have been done each occurrence of the string B<"
+"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:47
+msgid ""
+"Variables can be set using the B<-V> common option. They can be also "
+"specified in the file B<debian/substvars> (or whatever other file is "
+"specified using the B<-T> option). This file consists of lines of the form "
+"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
+"lines starting with a B<#> symbol (comments) are ignored."
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:49
+msgid "Additionally, the following standard variables are available:"
+msgstr ""
 
 # type: TP
-#: dpkg.1:70
+#: deb-substvars.5:49
 #, no-wrap
-msgid "B<install>"
-msgstr "B<installera>"
+msgid "B<Arch>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:73
-msgid "The package is selected for installation."
-msgstr "Paketet är markerat för installation."
+#: deb-substvars.5:53
+msgid "The current build architecture (from B<dpkg --print-architecture>)."
+msgstr ""
 
 # type: TP
-#: dpkg.1:73
+#: deb-substvars.5:53
+#, fuzzy, no-wrap
+msgid "B<source:Version>"
+msgstr "B<--version>"
+
+# type: Plain text
+#: deb-substvars.5:56
+#, fuzzy
+msgid "The source package version."
+msgstr "Paketets korta beskrivning."
+
+# type: TP
+#: deb-substvars.5:56
 #, no-wrap
-msgid "B<deinstall>"
-msgstr "B<ta bort>"
+msgid "B<source:Upstream-Version>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:77
+#: deb-substvars.5:60
 msgid ""
-"The package is selected for deinstallation (i.e. we want to remove all "
-"files, except configuration files)."
+"The upstream source package version, including the Debian version epoch if "
+"any."
 msgstr ""
-"Paketet är markerat för avinstallation (dvs. vi vill ta bort alla filer "
-"förutom konfigurationsfilerna)."
 
 # type: TP
-#: dpkg.1:77
-#, no-wrap
-msgid "B<purge>"
-msgstr "B<rensa>"
+#: deb-substvars.5:60
+#, fuzzy, no-wrap
+msgid "B<binary:Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:81
+#: deb-substvars.5:64
 msgid ""
-"The package is selected to be purged (i.e. we want to remove everything, "
-"even configuration files)."
+"The binary package version (which may differ from source:Version in a binNMU "
+"for example)."
 msgstr ""
-"Paketet är markerat för rensning (dvs. vi vill ta bort allting, även "
-"konfigurationsfiler)."
-
-# type: SS
-#: dpkg.1:81
-#, no-wrap
-msgid "PACKAGE FLAGS"
-msgstr "PAKETFLAGGOR"
 
 # type: TP
-#: dpkg.1:82
-#, no-wrap
-msgid "B<hold>"
-msgstr "B<håll>"
+#: deb-substvars.5:64
+#, fuzzy, no-wrap
+msgid "B<Source-Version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg.1:86
+#: deb-substvars.5:69
 msgid ""
-"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
-"to do that with option B<--force-hold>."
+"The source package version (from the changelog file). This variable is now "
+"B<deprecated> as its meaning is different from its function, please use the "
+"B<source:Version> or B<binary:Version> as appropriate."
 msgstr ""
-"Ett paket som är markerat med B<håll> hanteras inte av B<dpkg> såvida inte "
-"detta framtvingas med flaggan B<--force-hold>."
 
 # type: TP
-#: dpkg.1:86
-#, no-wrap
-msgid "B<reinst-required>"
-msgstr "B<ominstallation krävs>"
+#: deb-substvars.5:69
+#, fuzzy, no-wrap
+msgid "B<Installed-Size>"
+msgstr "B<installerat>"
 
 # type: Plain text
-#: dpkg.1:91
+#: deb-substvars.5:78
 msgid ""
-"A package marked B<reinst-required> is broken and requires reinstallation. "
-"These packages cannot be removed, unless forced with option B<--force-remove-"
-"reinstreq>."
+"The total size of the package's installed files. This value is copied into "
+"the corresponding control file field; setting it will modify the value of "
+"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
+"debian/tmp> to find the default value."
 msgstr ""
-"Ett paket markerat B<ominstallation krävs> är trasigt och kräver "
-"ominstallation. Dessa paket kan inte tas bort, såvida inte detta framtvingas "
-"med flaggan B<--force-remove-reinstreq>."
-
-# type: SH
-#: dpkg.1:92 dpkg-architecture.1:42 update-alternatives.8:320
-#, no-wrap
-msgid "ACTIONS"
-msgstr "ÅTGÄRDER"
 
 # type: TP
-#: dpkg.1:93
+#: deb-substvars.5:78
 #, no-wrap
-msgid "B<dpkg -i> | B<--install> I<package_file>..."
-msgstr "B<dpkg -i> | B<--install> I<paketfil>..."
+msgid "B<Extra-Size>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:97
+#: deb-substvars.5:87
 msgid ""
-"Install the package. If B<--recursive> or B<-R> option is specified, "
-"I<package_file> must refer to a directory instead."
+"Additional disk space used when the package is installed. If this variable "
+"is set its value is added to that of the B<Installed-Size> variable (whether "
+"set explicitly or using the default value) before it is copied into the "
+"B<Installed-Size> control file field."
 msgstr ""
-"Installera paketet.  Om flaggan B<--recursive> eller B<-R> anges måste "
-"I<paketfil> istället vara en katalog."
-
-# type: Plain text
-#: dpkg.1:99
-msgid "Installation consists of the following steps:"
-msgstr "Installationen består av följande steg:"
 
-# type: Plain text
-#: dpkg.1:102
-msgid "B<1.> Extract the control files of the new package."
-msgstr "B<1.> Extrahera styrfilerna ur paketet."
+# type: TP
+#: deb-substvars.5:87
+#, fuzzy, no-wrap
+msgid "B<F:>I<fieldname>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg.1:106
+#: deb-substvars.5:94
 msgid ""
-"B<2.> If another version of the same package was installed before the new "
-"installation, execute I<prerm> script of the old package."
+"The value of the output field I<fieldname> (which must be given in the "
+"canonical capitalisation). Setting these variables has no effect other than "
+"on places where they are expanded explicitly."
 msgstr ""
-"B<2.> Om en annan version av samma paket redan fanns installerat vid "
-"nyinstallationen exekveras I<prerm>-skriptet för det gamla paketet."
 
-# type: Plain text
-#: dpkg.1:109
-msgid "B<3.> Run I<preinst> script, if provided by the package."
-msgstr "B<3.> Kör I<preinst>-skriptet, om ett sådant medföljer paketet."
+# type: TP
+#: deb-substvars.5:94
+#, no-wrap
+msgid "B<Format>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:113
+#: deb-substvars.5:104
 msgid ""
-"B<4.> Unpack the new files, and at the same time back up the old files, so "
-"that if something goes wrong, they can be restored."
+"The B<.changes> file format version generated by this version of the source "
+"packaging scripts. If you set this variable the contents of the B<Format> "
+"field in the B<.changes> file will change too."
 msgstr ""
-"B<4.> Packa upp de nya filerna och säkerhetskopiera samtidigt de gamla "
-"filerna så att de kan återställas om någonting går fel."
 
-# type: Plain text
-#: dpkg.1:120
-msgid ""
-"B<5.> If another version of the same package was installed before the new "
-"installation, execute the I<postrm> script of the old package. Note that "
-"this script is executed after the I<preinst> script of the new package, "
-"because new files are written at the same time old files are removed."
+# type: TP
+#: deb-substvars.5:104
+#, no-wrap
+msgid "B<Newline>, B<Space>, B<Tab>"
 msgstr ""
-"B<5.> Om en annan version av samma paket redan fanns installerat vid "
-"nyinstallationen exekveras I<postrm>-skriptet för det gamla paketet. "
-"Observera att skriptet exekveras efter I<preinst> för det nya paketet "
-"eftersom de nya filerna skrivs samtidigt som de gamla tas bort."
 
 # type: Plain text
-#: dpkg.1:124
-msgid ""
-"B<6.> Configure the package. See B<--configure> for detailed information "
-"about how this is done."
+#: deb-substvars.5:107
+msgid "These variables each hold the corresponding character."
 msgstr ""
-"B<6.> Konfigurera paketet. Se B<--configure> för detaljerad information om "
-"hur detta görs."
 
 # type: TP
-#: dpkg.1:124
+#: deb-substvars.5:107
 #, no-wrap
-msgid "B<dpkg --unpack >I<package_file> ..."
-msgstr "B<dpkg --unpack >I<paketfil> ..."
+msgid "B<shlibs:>I<dependencyfield>"
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:129
+#: deb-substvars.5:111
 msgid ""
-"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
-"option is specified, I<package_file> must refer to a directory instead."
+"Variable settings with names of this form are generated by B<dpkg-shlibdeps>."
 msgstr ""
-"Packa upp paketet, men konfigurera det inte. Om flaggan B<--recursive> eller "
-"B<-R> anges måste I<paketfil> istället vara en katalog."
 
 # type: TP
-#: dpkg.1:129
-#, no-wrap
-msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg --configure >I<paket> ... | B<-a> | B<--pending>"
+#: deb-substvars.5:111
+#, fuzzy, no-wrap
+msgid "B<dpkg:Upstream-Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:134
-msgid ""
-"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
-"of I<package>, all unpacked but unconfigured packages are configured."
+#: deb-substvars.5:114
+msgid "The upstream version of dpkg."
 msgstr ""
-"Konfigurera ett uppackat paket. Om B<-a> eller B<--pending> anges istället "
-"för I<paket> konfigureras alla paket som har packats upp men ännu inte "
-"konfigurerats."
+
+# type: TP
+#: deb-substvars.5:114
+#, fuzzy, no-wrap
+msgid "B<dpkg:Version>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg.1:136
-msgid "Configuring consists of the following steps:"
-msgstr "Konfigurering består av följande steg:"
+#: deb-substvars.5:117
+msgid "The full version of dpkg."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:141
+#: deb-substvars.5:120
 msgid ""
-"B<1.> Unpack the configuration files, and at the same time back up the old "
-"configuration files, so that they can be restored if something goes wrong."
+"If a variable is referred to but not defined it generates a warning and an "
+"empty value is assumed."
 msgstr ""
-"B<1.> Packa upp konfigurationsfilerna och säkerhetskopiera samtidigt de "
-"gamla konfigurationsfilerna så att de kan återställas om någonting går fel."
+
+# type: TP
+#: deb-substvars.5:122
+#, fuzzy, no-wrap
+msgid "B<debian/substvars>"
+msgstr "B<ta bort>"
 
 # type: Plain text
-#: dpkg.1:144
-msgid "B<2.> Run I<postinst> script, if provided by the package."
-msgstr "B<2.> Kör I<postinst>-skriptet, om ett sådant finns i paketet."
+#: deb-substvars.5:125
+#, fuzzy
+msgid "List of substitution variables and values."
+msgstr "Lista över tillgängliga paket."
 
-# type: TP
-#: dpkg.1:144
-#, no-wrap
-msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
-msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paket> ... | B<-a> | B<--pending>"
+# type: Plain text
+#: deb-substvars.5:129 dpkg-source.1:267
+msgid ""
+"The point at which field overriding occurs compared to certain standard "
+"output field settings is rather confused."
+msgstr ""
 
 # type: Plain text
-#: dpkg.1:155
+#: deb-substvars.5:136
+#, fuzzy
+msgid ""
+"B<dpkg>(1), B<dpkg-genchanges>(1), B<dpkg-gencontrol>(1), B<dpkg-shlibdeps>"
+"(1), B<dpkg-source>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: Plain text
+#: deb-substvars.5:139
+msgid "The utilities and this manpage were written by Ian Jackson."
+msgstr ""
+
+# type: SH
+#: deb-substvars.5:140 dpkg-name.1:105 install-info.8:281
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:142 dpkg-buildpackage.1:195 dpkg-distaddfile.1:49
+#: dpkg-genchanges.1:158 dpkg-gencontrol.1:121 dpkg-parsechangelog.1:50
+#: dpkg-shlibdeps.1:132 dpkg-source.1:282
+msgid "Copyright (C) 1995-1996 Ian Jackson"
+msgstr ""
+
+# type: Plain text
+#: deb-substvars.5:144 dpkg-buildpackage.1:197 dpkg-distaddfile.1:51
+#: dpkg-genchanges.1:160 dpkg-gencontrol.1:123 dpkg-parsechangelog.1:52
+#: dpkg-shlibdeps.1:134 dpkg-source.1:284
+#, fuzzy
+msgid "Copyright (C) 2000 Wichert Akkerman"
+msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
+
+# type: Plain text
+#: deb-substvars.5:146 dpkg-buildpackage.1:199 dpkg-distaddfile.1:53
+#: dpkg-genchanges.1:162 dpkg-gencontrol.1:125 dpkg-parsechangelog.1:54
+#: dpkg-shlibdeps.1:136 dpkg-source.1:286
+#, fuzzy
+msgid ""
+"This is free software; see the GNU General Public Licence version 2 or later "
+"for copying conditions. There is NO WARRANTY."
+msgstr ""
+"Detta är fri programvara; se GNU General Public License version 2 eller "
+"senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "dpkg"
+msgstr "dpkg"
+
+# type: TH
+#: dpkg.1:1
+#, no-wrap
+msgid "2006-04-09"
+msgstr "2006-04-09"
+
+# type: TH
+#: dpkg.1:1 dpkg.cfg.5:1 dpkg-deb.1:1 dpkg-query.1:1 dselect.cfg.5:1
+#, no-wrap
+msgid "dpkg suite"
+msgstr "Dpkg-sviten"
+
+# type: Plain text
+#: dpkg.1:4
+msgid "dpkg - package manager for Debian"
+msgstr "dpkg - en mellannivåpakethanterare för Debian"
+
+# type: Plain text
+#: dpkg.1:8
+msgid "B<dpkg> [I<options>] I<action>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+
+# type: SH
+#: dpkg.1:9
+#, no-wrap
+msgid "WARNING"
+msgstr "VARNING"
+
+# type: Plain text
+#: dpkg.1:13
+msgid ""
+"This manual is intended for users wishing to understand B<dpkg>'s command "
+"line options and package states in more detail than that provided by B<dpkg "
+"--help>."
+msgstr ""
+"Denna manual är avsedd för användare som vill få en mer detaljerad "
+"förståelse för B<dpkg>s kommandoradsflaggor och pakettillstånd än vad som "
+"berättas med B<dpkg --help>."
+
+# type: Plain text
+#: dpkg.1:18
+msgid ""
+"It should I<not> be used by package maintainers wishing to understand how "
+"B<dpkg> will install their packages. The descriptions of what B<dpkg> does "
+"when installing and removing packages are particularly inadequate."
+msgstr ""
+"Den bör I<inte> användas av paketansvariga som vill lära sig hur B<dpkg> "
+"kommer att installera deras paket. Beskrivningen över vad B<dpkg> gör när "
+"paket installeras och tas bort är speciellt otillräckliga."
+
+# type: Plain text
+#: dpkg.1:26
+#, fuzzy
+msgid ""
+"B<dpkg> is a tool to install, build, remove and manage Debian packages. The "
+"primary and more user-friendly front-end for B<dpkg> is B<dselect>(1). "
+"B<dpkg> itself is controlled entirely via command line parameters, which "
+"consist of exactly one action and zero or more options. The action-parameter "
+"tells B<dpkg> what to do and options control the behavior of the action in "
+"some way."
+msgstr ""
+"B<dpkg> är ett mellannivåverktyg för att installera, bygga, ta bort och "
+"hantera Debianpaket. Det primära och mer användarvänliga skalet runt B<dpkg> "
+"är B<dselect>(1). B<dpkg> kontrolleras helt och hållet via "
+"kommandoradsflaggor, vilka består av exakt en åtgärd och noll eller fler "
+"tillval. Åtgärdsparametern talar om för dpkg vad som skall göras, och "
+"tillvalen styr på vilket sätt åtgärden skall utföras."
+
+# type: Plain text
+#: dpkg.1:31
+#, fuzzy
+msgid ""
+"B<dpkg> can be also be used as a front-end to B<dpkg-deb>(1).  The following "
+"are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
+"B<dpkg-deb> with the parameters given to it:"
+msgstr ""
+"B<dpkg> kan även användas som ett skal runt B<dpkg-deb>. Följande är "
+"åtgärder för B<dpkg-deb>, och om de upptäcks kör B<dpkg> helt enkelt B<dpkg-"
+"deb> med de flaggor som getts:"
+
+# type: Plain text
+#: dpkg.1:40
+#, no-wrap
+msgid ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, and\n"
+"    B<--fsys-tarfile>.\n"
+msgstr ""
+"    B<-b>, B<--build>,\n"
+"    B<-c>, B<--contents>,\n"
+"    B<-I>, B<--info>,\n"
+"    B<-f>, B<--field>,\n"
+"    B<-e>, B<--control>,\n"
+"    B<-x>, B<--extract>,\n"
+"    B<-X>, B<--vextract>, och\n"
+"    B<--fsys-tarfile>.\n"
+
+# type: Plain text
+#: dpkg.1:42
+msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
+msgstr "Se B<dpkg-deb>(1) för information om dessa åtgärder."
+
+# type: SH
+#: dpkg.1:43
+#, no-wrap
+msgid "INFORMATION ABOUT PACKAGES"
+msgstr "INFORMATION OM PAKET"
+
+# type: Plain text
+#: dpkg.1:48
+msgid ""
+"B<dpkg> maintains some usable information about available packages. The "
+"information is divided in three classes: B<states>, B<selection states> and "
+"B<flags>. These values are intended to be changed mainly with B<dselect>."
+msgstr ""
+"B<dpkg> upprätthåller viss användbar information om tillgängliga paket. "
+"Informationen delas in i tre klasser: B<tillstånd>, B<markeringstillstånd> "
+"och B<flaggor>. Dessa värden är avsedda att huvudsakligen ändras via "
+"B<dselect>."
+
+# type: SS
+#: dpkg.1:48
+#, no-wrap
+msgid "PACKAGE STATES"
+msgstr "PAKETTILLSTÅND"
+
+# type: TP
+#: dpkg.1:49
+#, no-wrap
+msgid "B<installed>"
+msgstr "B<installerat>"
+
+# type: Plain text
+#: dpkg.1:52
+msgid "The package is unpacked and configured OK."
+msgstr "Paketet är uppackat och korrekt inställt."
+
+# type: TP
+#: dpkg.1:52
+#, no-wrap
+msgid "B<half-installed>"
+msgstr "B<halvt installerat>"
+
+# type: Plain text
+#: dpkg.1:56
+msgid ""
+"The installation of the package has been started, but not completed for some "
+"reason."
+msgstr ""
+"Installationen av paketet har påbörjats, men av någon orsak inte slutförts."
+
+# type: TP
+#: dpkg.1:56
+#, no-wrap
+msgid "B<not-installed>"
+msgstr "B<ej installerat>"
+
+# type: Plain text
+#: dpkg.1:59
+msgid "The package is not installed on your system."
+msgstr "Paketet är inte installerat på ditt system."
+
+# type: TP
+#: dpkg.1:59
+#, no-wrap
+msgid "B<unpacked>"
+msgstr "B<uppackat>"
+
+# type: Plain text
+#: dpkg.1:62
+msgid "The package is unpacked, but not configured."
+msgstr "Paketet är uppackat, men inte konfigurerat."
+
+# type: TP
+#: dpkg.1:62
+#, no-wrap
+msgid "B<half-configured>"
+msgstr "B<halvt konfigurerat>"
+
+# type: Plain text
+#: dpkg.1:66
+msgid ""
+"The package is unpacked and configuration has been started, but not yet "
+"completed for some reason."
+msgstr ""
+"Paketet är uppackat och konfigurationen har påbörjats, men av någon orsak "
+"inte slutförts."
+
+# type: TP
+#: dpkg.1:66
+#, no-wrap
+msgid "B<config-files>"
+msgstr "B<konfigurationsfiler>"
+
+# type: Plain text
+#: dpkg.1:69
+msgid "Only the configuration files of the package exist on the system."
+msgstr "Endast konfigurationsfilerna för paketet finns på systemet."
+
+# type: SS
+#: dpkg.1:69
+#, no-wrap
+msgid "PACKAGE SELECTION STATES"
+msgstr "MARKERINGSTILLSTÅND FÖR PAKET"
+
+# type: TP
+#: dpkg.1:70
+#, no-wrap
+msgid "B<install>"
+msgstr "B<installera>"
+
+# type: Plain text
+#: dpkg.1:73
+msgid "The package is selected for installation."
+msgstr "Paketet är markerat för installation."
+
+# type: TP
+#: dpkg.1:73
+#, no-wrap
+msgid "B<deinstall>"
+msgstr "B<ta bort>"
+
+# type: Plain text
+#: dpkg.1:77
+msgid ""
+"The package is selected for deinstallation (i.e. we want to remove all "
+"files, except configuration files)."
+msgstr ""
+"Paketet är markerat för avinstallation (dvs. vi vill ta bort alla filer "
+"förutom konfigurationsfilerna)."
+
+# type: TP
+#: dpkg.1:77
+#, no-wrap
+msgid "B<purge>"
+msgstr "B<rensa>"
+
+# type: Plain text
+#: dpkg.1:81
+msgid ""
+"The package is selected to be purged (i.e. we want to remove everything, "
+"even configuration files)."
+msgstr ""
+"Paketet är markerat för rensning (dvs. vi vill ta bort allting, även "
+"konfigurationsfiler)."
+
+# type: SS
+#: dpkg.1:81
+#, no-wrap
+msgid "PACKAGE FLAGS"
+msgstr "PAKETFLAGGOR"
+
+# type: TP
+#: dpkg.1:82
+#, no-wrap
+msgid "B<hold>"
+msgstr "B<håll>"
+
+# type: Plain text
+#: dpkg.1:86
+msgid ""
+"A package marked to be on B<hold> is not handled by B<dpkg>, unless forced "
+"to do that with option B<--force-hold>."
+msgstr ""
+"Ett paket som är markerat med B<håll> hanteras inte av B<dpkg> såvida inte "
+"detta framtvingas med flaggan B<--force-hold>."
+
+# type: TP
+#: dpkg.1:86
+#, no-wrap
+msgid "B<reinst-required>"
+msgstr "B<ominstallation krävs>"
+
+# type: Plain text
+#: dpkg.1:91
+msgid ""
+"A package marked B<reinst-required> is broken and requires reinstallation. "
+"These packages cannot be removed, unless forced with option B<--force-remove-"
+"reinstreq>."
+msgstr ""
+"Ett paket markerat B<ominstallation krävs> är trasigt och kräver "
+"ominstallation. Dessa paket kan inte tas bort, såvida inte detta framtvingas "
+"med flaggan B<--force-remove-reinstreq>."
+
+# type: SH
+#: dpkg.1:92
+#, no-wrap
+msgid "ACTIONS"
+msgstr "ÅTGÄRDER"
+
+# type: TP
+#: dpkg.1:93
+#, no-wrap
+msgid "B<dpkg -i> | B<--install> I<package_file>..."
+msgstr "B<dpkg -i> | B<--install> I<paketfil>..."
+
+# type: Plain text
+#: dpkg.1:97
+msgid ""
+"Install the package. If B<--recursive> or B<-R> option is specified, "
+"I<package_file> must refer to a directory instead."
+msgstr ""
+"Installera paketet.  Om flaggan B<--recursive> eller B<-R> anges måste "
+"I<paketfil> istället vara en katalog."
+
+# type: Plain text
+#: dpkg.1:99
+msgid "Installation consists of the following steps:"
+msgstr "Installationen består av följande steg:"
+
+# type: Plain text
+#: dpkg.1:102
+msgid "B<1.> Extract the control files of the new package."
+msgstr "B<1.> Extrahera styrfilerna ur paketet."
+
+# type: Plain text
+#: dpkg.1:106
+msgid ""
+"B<2.> If another version of the same package was installed before the new "
+"installation, execute I<prerm> script of the old package."
+msgstr ""
+"B<2.> Om en annan version av samma paket redan fanns installerat vid "
+"nyinstallationen exekveras I<prerm>-skriptet för det gamla paketet."
+
+# type: Plain text
+#: dpkg.1:109
+msgid "B<3.> Run I<preinst> script, if provided by the package."
+msgstr "B<3.> Kör I<preinst>-skriptet, om ett sådant medföljer paketet."
+
+# type: Plain text
+#: dpkg.1:113
+msgid ""
+"B<4.> Unpack the new files, and at the same time back up the old files, so "
+"that if something goes wrong, they can be restored."
+msgstr ""
+"B<4.> Packa upp de nya filerna och säkerhetskopiera samtidigt de gamla "
+"filerna så att de kan återställas om någonting går fel."
+
+# type: Plain text
+#: dpkg.1:120
+msgid ""
+"B<5.> If another version of the same package was installed before the new "
+"installation, execute the I<postrm> script of the old package. Note that "
+"this script is executed after the I<preinst> script of the new package, "
+"because new files are written at the same time old files are removed."
+msgstr ""
+"B<5.> Om en annan version av samma paket redan fanns installerat vid "
+"nyinstallationen exekveras I<postrm>-skriptet för det gamla paketet. "
+"Observera att skriptet exekveras efter I<preinst> för det nya paketet "
+"eftersom de nya filerna skrivs samtidigt som de gamla tas bort."
+
+# type: Plain text
+#: dpkg.1:124
+msgid ""
+"B<6.> Configure the package. See B<--configure> for detailed information "
+"about how this is done."
+msgstr ""
+"B<6.> Konfigurera paketet. Se B<--configure> för detaljerad information om "
+"hur detta görs."
+
+# type: TP
+#: dpkg.1:124
+#, no-wrap
+msgid "B<dpkg --unpack >I<package_file> ..."
+msgstr "B<dpkg --unpack >I<paketfil> ..."
+
+# type: Plain text
+#: dpkg.1:129
+msgid ""
+"Unpack the package, but don't configure it. If B<--recursive> or B<-R> "
+"option is specified, I<package_file> must refer to a directory instead."
+msgstr ""
+"Packa upp paketet, men konfigurera det inte. Om flaggan B<--recursive> eller "
+"B<-R> anges måste I<paketfil> istället vara en katalog."
+
+# type: TP
+#: dpkg.1:129
+#, no-wrap
+msgid "B<dpkg --configure >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg --configure >I<paket> ... | B<-a> | B<--pending>"
+
+# type: Plain text
+#: dpkg.1:134
+msgid ""
+"Reconfigure an unpacked package. If B<-a> or B<--pending> is given instead "
+"of I<package>, all unpacked but unconfigured packages are configured."
+msgstr ""
+"Konfigurera ett uppackat paket. Om B<-a> eller B<--pending> anges istället "
+"för I<paket> konfigureras alla paket som har packats upp men ännu inte "
+"konfigurerats."
+
+# type: Plain text
+#: dpkg.1:136
+msgid "Configuring consists of the following steps:"
+msgstr "Konfigurering består av följande steg:"
+
+# type: Plain text
+#: dpkg.1:141
+msgid ""
+"B<1.> Unpack the configuration files, and at the same time back up the old "
+"configuration files, so that they can be restored if something goes wrong."
+msgstr ""
+"B<1.> Packa upp konfigurationsfilerna och säkerhetskopiera samtidigt de "
+"gamla konfigurationsfilerna så att de kan återställas om någonting går fel."
+
+# type: Plain text
+#: dpkg.1:144
+msgid "B<2.> Run I<postinst> script, if provided by the package."
+msgstr "B<2.> Kör I<postinst>-skriptet, om ett sådant finns i paketet."
+
+# type: TP
+#: dpkg.1:144
+#, no-wrap
+msgid "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<package> ... | B<-a> | B<--pending>"
+msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<paket> ... | B<-a> | B<--pending>"
+
+# type: Plain text
+#: dpkg.1:155
 msgid ""
 "Remove an installed package. B<-r> or B<--remove> remove everything except "
 "configuration files. This may avoid having to reconfigure the package if it "
@@ -2176,7 +2637,7 @@ msgstr ""
 "deb>(1)."
 
 # type: TP
-#: dpkg.1:428 dpkg-deb.1:240
+#: dpkg.1:428 dpkg-deb.1:211
 #, no-wrap
 msgid "B<--nocheck>"
 msgstr "B<--nocheck>"
@@ -2515,7 +2976,7 @@ msgid "The program B<dpkg> will execute when starting a new shell."
 msgstr "Programmet B<dpkg> kommer att exekvera när ett nytt skal startas."
 
 # type: TP
-#: dpkg.1:540 dpkg-query.1:168
+#: dpkg.1:540 dpkg-query.1:144
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr "B<COLUMNS>"
@@ -2530,8 +2991,8 @@ msgstr ""
 "Används för närvarande enbart av -l."
 
 # type: SH
-#: dpkg.1:545 dpkg-architecture.1:100 dpkg-divert.8:93 dpkg-name.1:71
-#: update-alternatives.8:246
+#: dpkg.1:545 dpkg-architecture.1:246 dpkg-divert.8:87 dpkg-name.1:66
+#: update-alternatives.8:356
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
@@ -2683,7 +3144,10 @@ msgid "B<--no-act> usually gives less information than might be helpful."
 msgstr "B<--no-act> ger oftast mindre information än vad som vore hjälpsamt."
 
 # type: SH
-#: dpkg.1:612 dselect.1:449 start-stop-daemon.8:257
+#: dpkg.1:612 dpkg-buildpackage.1:193 dpkg-distaddfile.1:47
+#: dpkg-genchanges.1:156 dpkg-gencontrol.1:119 dpkg-parsechangelog.1:48
+#: dpkg-shlibdeps.1:130 dpkg-source.1:280 dselect.1:449
+#: start-stop-daemon.8:242
 #, no-wrap
 msgid "AUTHORS"
 msgstr "FÖRFATTARE"
@@ -2704,12 +3168,6 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "B<dpkg --print-architecture>"
 
-# type: TH
-#: dpkg-architecture.1:1 dpkg-deb.1:1
-#, fuzzy, no-wrap
-msgid "2006-06-17"
-msgstr "2006-05-10"
-
 # type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -2719,7 +3177,7 @@ msgstr ""
 # type: Plain text
 #: dpkg-architecture.1:9
 #, fuzzy
-msgid "B<dpkg-architecture> [I<options>] [I<action>]"
+msgid "B<dpkg-architecture> [I<options>] [I<commands>]"
 msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
@@ -2748,65 +3206,35 @@ msgid ""
 "does not match the default."
 msgstr ""
 
-# type: TP
-#: dpkg-architecture.1:28
-#, fuzzy, no-wrap
-msgid "B<-a>I<debian-architecture>"
-msgstr "B<dpkg --print-architecture>"
-
-# type: Plain text
-#: dpkg-architecture.1:31
-msgid "Set the Debian architecture."
-msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:31
+# type: SH
+#: dpkg-architecture.1:27 dpkg-deb.1:28 dpkg-divert.8:24 dpkg-query.1:13
+#: dpkg-source.1:20 dpkg-split.1:32 dpkg-statoverride.8:24
+#: start-stop-daemon.8:37 update-alternatives.8:203
 #, no-wrap
-msgid "B<-t>I<gnu-system-type>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:34
-msgid "Set the GNU system type."
-msgstr ""
-
-# type: TP
-#: dpkg-architecture.1:34
-#, fuzzy, no-wrap
-msgid "B<-f>"
-msgstr "B<-G>"
-
-# type: Plain text
-#: dpkg-architecture.1:41
-msgid ""
-"Values set by existing environment variables with the same name as used by "
-"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
-"force flag is present. This allows the user to override a value even when "
-"the call to B<dpkg-architecture> is buried in some other script (for example "
-"B<dpkg-buildpackage>(1))."
-msgstr ""
+msgid "COMMANDS"
+msgstr "KOMMANDON"
 
 # type: TP
-#: dpkg-architecture.1:43
+#: dpkg-architecture.1:28
 #, fuzzy, no-wrap
 msgid "B<-l>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:32
 msgid ""
 "Print the environment variables, one each line, in the format "
 "I<VARIABLE=value>. This is the default action."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:47
+#: dpkg-architecture.1:32
 #, fuzzy, no-wrap
 msgid "B<-e>I<debian-architecture>"
 msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-architecture.1:53
+#: dpkg-architecture.1:38
 msgid ""
 "Check for equality of architecture. By default I<debian-architecture> is "
 "compared against the current Debian architecture, being the host.  This "
@@ -2815,13 +3243,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:53
+#: dpkg-architecture.1:38
 #, no-wrap
 msgid "B<-i>I<architecture-wildcard>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:59
+#: dpkg-architecture.1:44
 msgid ""
 "Check for identity of architecture by expanding I<architecture-wildcard> as "
 "an architecture wildcard and comparing against the current Debian "
@@ -2830,72 +3258,100 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:59
+#: dpkg-architecture.1:44
 #, fuzzy, no-wrap
 msgid "B<-q>I<variable-name>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-architecture.1:62
+#: dpkg-architecture.1:47
 msgid "Print the value of a single variable."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:62
+#: dpkg-architecture.1:47
 #, fuzzy, no-wrap
 msgid "B<-s>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:66
+#: dpkg-architecture.1:51
 msgid ""
 "Print an export command. This can be used to set the environment variables "
 "using eval."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:66
+#: dpkg-architecture.1:51
 #, fuzzy, no-wrap
 msgid "B<-u>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:54
 msgid "Print a similar command to B<-s> but to unset all variables."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:69
+#: dpkg-architecture.1:54
 #, no-wrap
 msgid "B<-c>I< command>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:73
+#: dpkg-architecture.1:58
 msgid ""
 "Execute a I<command> in an environment which has all variables set to the "
 "determined value."
 msgstr ""
 
 # type: TP
-#: dpkg-architecture.1:73
+#: dpkg-architecture.1:58
 #, fuzzy, no-wrap
 msgid "B<-L>"
 msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-architecture.1:76
+#: dpkg-architecture.1:61
 msgid "Print a list of valid architecture names."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:69
+#, fuzzy, no-wrap
+msgid "B<-a>I<debian-architecture>"
+msgstr "B<dpkg --print-architecture>"
+
+# type: Plain text
+#: dpkg-architecture.1:72
+msgid "Set the Debian architecture."
+msgstr ""
+
+# type: TP
+#: dpkg-architecture.1:72
+#, no-wrap
+msgid "B<-t>I<gnu-system-type>"
+msgstr ""
+
 # type: Plain text
-#: dpkg-architecture.1:79 dpkg-checkbuilddeps.1:24
-msgid "Print a usage message."
+#: dpkg-architecture.1:75
+msgid "Set the GNU system type."
 msgstr ""
 
+# type: TP
+#: dpkg-architecture.1:75
+#, fuzzy, no-wrap
+msgid "B<-f>"
+msgstr "B<-G>"
+
 # type: Plain text
 #: dpkg-architecture.1:82
-msgid "Print program version."
+msgid ""
+"Values set by existing environment variables with the same name as used by "
+"the scripts are honored (i.e. used by B<dpkg-architecture>), except if this "
+"force flag is present. This allows the user to override a value even when "
+"the call to B<dpkg-architecture> is buried in some other script (for example "
+"B<dpkg-buildpackage>(1))."
 msgstr ""
 
 # type: SH
@@ -2967,3664 +3423,3313 @@ msgid ""
 "x86_64-netbsd."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:103
-msgid ""
-"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
-"architecture>. Other examples:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:105
-msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:107
-msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:110
-msgid ""
-"Check if an architecture is equal to the current architecture or a given one:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:112
-msgid "dpkg-architecture -elinux-alpha"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:114
-msgid "dpkg-architecture -amips -elinux-mips"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:117
-msgid ""
-"Check if the current architecture or an architecture provided with -a are "
-"Linux systems:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:119
-msgid "dpkg-architecture -ilinux-any"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:121
-msgid "dpkg-architecture -ai386 -ilinux-any"
-msgstr ""
-
 # type: SH
-#: dpkg-architecture.1:122
+#: dpkg-architecture.1:100
 #, fuzzy, no-wrap
 msgid "VARIABLES"
 msgstr "MILJÖVARIABLER"
 
 # type: Plain text
-#: dpkg-architecture.1:124
+#: dpkg-architecture.1:102
 msgid "The following variables are set by B<dpkg-architecture>:"
 msgstr ""
 
 # type: IP
-#: dpkg-architecture.1:124
+#: dpkg-architecture.1:102
 #, no-wrap
 msgid "\\s-1DEB_BUILD_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:126
+#: dpkg-architecture.1:104
 msgid "The Debian architecture of the build machine."
 msgstr ""
 
 # type: IP
-#: dpkg-architecture.1:126
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:128
-msgid "The Debian system name of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:128
-#, no-wrap
-msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:130
-msgid "The Debian cpu name of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:130
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:132
-msgid "The \\s-1GNU\\s0 system type of the build machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:132
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:134
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:134
-#, no-wrap
-msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:136
-msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:136
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:138
-msgid "The Debian architecture of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:138
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:140
-msgid "The Debian system name of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:140
-#, no-wrap
-msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:142
-msgid "The Debian cpu name of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:142
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:144
-msgid "The \\s-1GNU\\s0 system type of the host machine."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:144
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:146
-msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
-
-# type: IP
-#: dpkg-architecture.1:146
-#, no-wrap
-msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:148
-msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
-msgstr ""
-
-# type: SH
-#: dpkg-architecture.1:149
-#, no-wrap
-msgid "DEBIAN/RULES"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:157
-msgid ""
-"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
-"rules> as make variables (see make documentation). However, you should not "
-"rely on them, as this breaks manual invocation of the script. Instead, you "
-"should always initialize them using B<dpkg-architecture> with the -q option. "
-"Here are some examples, which also show how you can improve the cross "
-"compilation support in your package:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:160 dpkg-architecture.1:177
-msgid "Instead of:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:164
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:167
-msgid "please use the following:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:171
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:173
-#, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:183
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:186
-msgid "please use:"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:189
-#, no-wrap
-msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:193
+#: dpkg-architecture.1:104
 #, no-wrap
-msgid ""
-"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
-msgstr ""
-
-# type: Plain text
-#: dpkg-architecture.1:197
-msgid ""
-"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
-"or DEB_HOST_ARCH_OS variables."
+msgid "\\s-1DEB_BUILD_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:202
-msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
+#: dpkg-architecture.1:106
+msgid "The Debian system name of the build machine."
 msgstr ""
 
-# type: SH
-#: dpkg-architecture.1:203
+# type: IP
+#: dpkg-architecture.1:106
 #, no-wrap
-msgid "BACKWARD COMPATIBILITY"
+msgid "\\s-1DEB_BUILD_ARCH_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:209
-msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
-"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
-"before this I<debian/rules> files tended to check the values of the "
-"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
-"change."
+#: dpkg-architecture.1:108
+msgid "The Debian cpu name of the build machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:214
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
+# type: IP
+#: dpkg-architecture.1:108
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:218
-#, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+#: dpkg-architecture.1:110
+msgid "The \\s-1GNU\\s0 system type of the build machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:232
+# type: IP
+#: dpkg-architecture.1:110
 #, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+msgid "\\s-1DEB_BUILD_GNU_CPU\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:235
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+#: dpkg-architecture.1:112
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_BUILD_GNU_TYPE\\s0"
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:238
-msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+# type: IP
+#: dpkg-architecture.1:112
+#, no-wrap
+msgid "\\s-1DEB_BUILD_GNU_SYSTEM\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:248
-#, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+#: dpkg-architecture.1:114
+msgid "The System part of \\s-1DEB_BUILD_GNU_TYPE\\s0."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:253
+# type: IP
+#: dpkg-architecture.1:114
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgid "\\s-1DEB_HOST_ARCH\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:257
-msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+#: dpkg-architecture.1:116
+msgid "The Debian architecture of the host machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:264
-msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+# type: IP
+#: dpkg-architecture.1:116
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_OS\\s0"
 msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:267
-msgid ""
-"The B<-e> and B<-i> options were only introduced in relatively recent "
-"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
+#: dpkg-architecture.1:118
+msgid "The Debian system name of the host machine."
 msgstr ""
 
-# type: Plain text
-#: dpkg-architecture.1:271
-#, fuzzy
-msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
+# type: IP
+#: dpkg-architecture.1:118
+#, no-wrap
+msgid "\\s-1DEB_HOST_ARCH_CPU\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg-architecture.1:276
-msgid ""
-"B<dpkg-architecture> and this man page were initially written by Marcus "
-"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
+#: dpkg-architecture.1:120
+msgid "The Debian cpu name of the host machine."
 msgstr ""
 
-# type: TH
-#: dpkg.cfg.5:1
+# type: IP
+#: dpkg-architecture.1:120
 #, no-wrap
-msgid "dpkg.cfg"
-msgstr "dpkg.cfg"
+msgid "\\s-1DEB_HOST_GNU_TYPE\\s0"
+msgstr ""
 
 # type: Plain text
-#: dpkg.cfg.5:4
-msgid "dpkg.cfg - dpkg configuration file"
-msgstr "dpkg.cfg - inställningsfil för dpkg"
+#: dpkg-architecture.1:122
+msgid "The \\s-1GNU\\s0 system type of the host machine."
+msgstr ""
 
-# type: Plain text
-#: dpkg.cfg.5:11
-msgid ""
-"This file contains default options for dpkg. Each line contains a single "
-"option which is exactly the same as a normal command line option for dpkg "
-"except for the leading dashes which are not used here. Comments are allowed "
-"by starting a line with a hash sign (\"B<#>\")."
+# type: IP
+#: dpkg-architecture.1:122
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_CPU\\s0"
 msgstr ""
-"Denna fil innehåller förvalda inställningar för dpkg. Varje rad består av en "
-"ensam flagga som är exakt densamma som en normal kommandoradsflagga för "
-"dpkg, förutom de inledande bindestrecken vilka inte används här. Kommentarer "
-"är tillåtna genom att inleda en rad med nummertecken (\"B<#>\")."
 
 # type: Plain text
-#: dpkg.cfg.5:16
-msgid "I<~/.dpkg.cfg>"
-msgstr "I<~/.dpkg.cfg>"
+#: dpkg-architecture.1:124
+msgid "The \\s-1CPU\\s0 part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
 
-# type: Plain text
-#: dpkg.cfg.5:20
-msgid ""
-"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
-"contributed to B<dpkg>."
+# type: IP
+#: dpkg-architecture.1:124
+#, no-wrap
+msgid "\\s-1DEB_HOST_GNU_SYSTEM\\s0"
 msgstr ""
-"Se B</usr/share/doc/dpkg/THANKS> för listan över personer som har bidragit "
-"till B<dpkg>."
 
 # type: Plain text
-#: dpkg.cfg.5:22 dpkg-divert.8:126 dpkg-query.1:184 dpkg-statoverride.8:87
-msgid "B<dpkg>(1)."
-msgstr "B<dpkg>(1)."
+#: dpkg-architecture.1:126
+msgid "The System part of \\s-1DEB_HOST_GNU_TYPE\\s0."
+msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1
+# type: SH
+#: dpkg-architecture.1:127
 #, no-wrap
-msgid "dpkg-checkbuilddeps"
+msgid "DEBIAN/RULES"
 msgstr ""
 
-# type: TH
-#: dpkg-checkbuilddeps.1:1 dpkg-divert.8:1 dpkg-source.1:2
-#: dpkg-statoverride.8:1
-#, fuzzy, no-wrap
-msgid "2006-05-23"
-msgstr "2006-02-28"
-
 # type: Plain text
-#: dpkg-checkbuilddeps.1:4
-msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
+#: dpkg-architecture.1:135
+msgid ""
+"The environment variables set by B<dpkg-architecture> are passed to I<debian/"
+"rules> as make variables (see make documentation). However, you should not "
+"rely on them, as this breaks manual invocation of the script. Instead, you "
+"should always initialize them using B<dpkg-architecture> with the -q option. "
+"Here are some examples, which also show how you can improve the cross "
+"compilation support in your package:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:7
-#, fuzzy
-msgid "B<dpkg-checkbuilddeps> B<-B> [I<control-file>]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<arkiv> [I<control-filnamn> ..]"
+#: dpkg-architecture.1:138 dpkg-architecture.1:155
+msgid "Instead of:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:12
+#: dpkg-architecture.1:142
+#, no-wrap
 msgid ""
-"This program checks the installed packages in the system against the build "
-"dependencies and build conflicts listed in the control file. If any are not "
-"met, it displays them and exits with a nonzero return code."
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"configure $(\\s-1ARCH\\s0)-linux\n"
 msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:15
-msgid ""
-"By default, I<debian/control> is read, but an alternate control filename may "
-"be specified on the command line."
+#: dpkg-architecture.1:145
+msgid "please use the following:"
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:17
-#, fuzzy, no-wrap
-msgid "B<-B>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-checkbuilddeps.1:21
+#: dpkg-architecture.1:149
+#, no-wrap
 msgid ""
-"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
-"built."
+"\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
 msgstr ""
 
-# type: TP
-#: dpkg-checkbuilddeps.1:21
-#, fuzzy, no-wrap
-msgid "B<-h>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-checkbuilddeps.1:27
-#, fuzzy
-msgid "Copyright 2001 Joey Hess"
-msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
-
-# type: UR
-#: dpkg-checkbuilddeps.1:27
-#, fuzzy, no-wrap
-msgid "mailto:joeyh@debian.org"
-msgstr "mailto:wakkerma@debian.org"
+#: dpkg-architecture.1:151
+#, no-wrap
+msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-checkbuilddeps.1:29
-#, fuzzy
-msgid "E<lt>joeyh@debian.orgE<gt>."
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-deb.1:1
+#: dpkg-architecture.1:161
 #, no-wrap
-msgid "dpkg-deb"
-msgstr "dpkg-deb"
+msgid ""
+"ARCH=\\`dpkg --print-architecture\\`\n"
+"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:4
-msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
-msgstr "dpkg-deb - Debians manipuleringsverktyg för paketarkiv (.deb)"
+#: dpkg-architecture.1:164
+msgid "please use:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:8
-msgid "B<dpkg-deb> B<-b>|B<--build> I<directory> [I<archive>|I<directory>]"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<katalog> [I<arkiv>|I<katalog>]"
+#: dpkg-architecture.1:167
+#, no-wrap
+msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:12
-msgid "B<dpkg-deb> B<-I>|B<--info> I<archive> [I<control-file-name> ..]"
-msgstr "B<dpkg-deb> B<-I>|B<--info> I<arkiv> [I<control-filnamn> ..]"
+#: dpkg-architecture.1:171
+#, no-wrap
+msgid ""
+"ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
+"  ...\n"
+"endif\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:16
-msgid "B<dpkg-deb> B<-f>|B<--field> I<archive> [I<control-field-name> ...]"
-msgstr "B<dpkg-deb> B<-f>|B<--field> I<arkiv> [I<control-fältnamn> ...]"
+#: dpkg-architecture.1:175
+msgid ""
+"or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
+"or DEB_HOST_ARCH_OS variables."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:20
-msgid "B<dpkg-deb> B<-c>|B<--contents> I<archive>"
-msgstr "B<dpkg-deb> B<-c>|B<--contents> I<arkiv>"
+#: dpkg-architecture.1:180
+msgid ""
+"In general, calling dpkg in the rules file to get architecture information "
+"is deprecated (unless you want to provide backward compatibility, see "
+"below).  Especially the --print-architecture option is unreliable since we "
+"have Debian architectures which don't equal a processor name."
+msgstr ""
 
-# type: Plain text
-#: dpkg-deb.1:25
-msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<arkiv>"
+# type: SH
+#: dpkg-architecture.1:181
+#, no-wrap
+msgid "BACKWARD COMPATIBILITY"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:29
-msgid "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
-msgstr "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<arkivkatalog>"
+#: dpkg-architecture.1:187
+msgid ""
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced in "
+"relatively recent versions of B<dpkg-architecture> (since dpkg 1.13.2), "
+"before this I<debian/rules> files tended to check the values of the "
+"DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to "
+"change."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:33
-msgid "B<dpkg-deb> B<-e>|B<--control> I<archive directory>"
-msgstr "B<dpkg-deb> B<-e>|B<--control> I<arkivkatalog>"
+#: dpkg-architecture.1:192
+msgid ""
+"Where I<debian/rules> files check these variables to decide how or what to "
+"compile, this should be updated to use the new variables and values.  You "
+"may wish to retain backwards compatibility with older version of dpkg-dev by "
+"using the following code:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:36
-msgid "B<dpkg-deb --fsys-tarfile> I<archive>"
-msgstr "B<dpkg-deb --fsys-tarfile> I<arkiv>"
+#: dpkg-architecture.1:196
+#, no-wrap
+msgid ""
+"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:39
+#: dpkg-architecture.1:210
+#, no-wrap
 msgid ""
-"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
+"# Take account of old dpkg-architecture output.\n"
+"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+"    DEB_HOST_ARCH_CPU := amd64\n"
+"  endif\n"
+"endif\n"
+"ifeq ($(DEB_HOST_ARCH_OS),)\n"
+"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+"    DEB_HOST_ARCH_OS := hurd\n"
+"  endif\n"
+"endif\n"
 msgstr ""
-"B<dpkg-deb> packar, packar upp och tillhandahåller information om "
-"Debianarkiv."
 
 # type: Plain text
-#: dpkg-deb.1:43
-msgid "Use B<dpkg> to install and remove packages from your system."
-msgstr "Använd B<dpkg> för att installera och ta bort paket från ditt system."
+#: dpkg-architecture.1:213
+msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:53
+#: dpkg-architecture.1:216
 msgid ""
-"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
-"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
-"and run it for you."
+"If you still wish to support versions of dpkg-dev that did not include "
+"B<dpkg-architecture>, the following does the job:"
 msgstr ""
-"Du kan även starta B<dpkg-deb> genom att anropa B<dpkg> med de parametrar du "
-"vill sända till B<dpkg-deb>. B<dpkg> kommer upptäcka att du ville åt B<dpkg-"
-"deb> och kör det åt dig."
 
-# type: SH
-#: dpkg-deb.1:53 dpkg-split.1:48
-#, fuzzy, no-wrap
-msgid "ACTION OPTIONS"
+# type: Plain text
+#: dpkg-architecture.1:226
+#, no-wrap
+msgid ""
+"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+"else\n"
+"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+"endif\n"
+"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
 msgstr ""
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"HANDLINGSFLAGGOR\n"
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"ÅTGÄRDSFLAGGOR"
 
-# type: TP
-#: dpkg-deb.1:54
+# type: Plain text
+#: dpkg-architecture.1:231
 #, no-wrap
-msgid "B<--build>, B<-b>"
-msgstr "B<--build>, B<-b>"
+msgid ""
+"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:66
+#: dpkg-architecture.1:235
 msgid ""
-"Creates a debian archive from the filesystem tree stored in I<directory>. "
-"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
-"information files such as the control file itself. This directory will "
-"I<not> appear in the binary package's filesystem archive, but instead the "
-"files in it will be put in the binary package's control information area."
+"Put a subset of these lines at the top of your debian/rules file; these "
+"default values will be overwritten if dpkg-architecture is used."
 msgstr ""
-"Skapar ett Debianarkiv från filsystemsträdet som lagras i I<katalog>. "
-"I<katalog> måste innehålla underkatalogen B<DEBIAN>, vilken innehåller "
-"styrinformationsfiler såsom själv styrfilen control. Denna katalog kommer "
-"I<inte> att visas i binärpaketets filsystemsarkiv, utan istället kommer "
-"filerna läggas i binärpaketets styrinformationsområde."
 
 # type: Plain text
-#: dpkg-deb.1:72
+#: dpkg-architecture.1:242
 msgid ""
-"You can specify the compression level used by adding a B<-z#> option.  "
-"B<dpkg-deb> will pass that option on to gzip."
+"You don't need the full set. Choose a consistent set which contains the "
+"values you use in the rules file. For example, if you only need the host "
+"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+"sufficient (this is indeed the Debian architecture of the build machine, but "
+"remember that we are only trying to be backward compatible with native "
+"compilation)."
 msgstr ""
-"Du kan ange komprimeringsnivån genom att lägga till flaggan B<-z#>. B<dpkg-"
-"deb> kommer sända vidare den flaggan till gzip."
 
 # type: Plain text
-#: dpkg-deb.1:84
+#: dpkg-architecture.1:245
 msgid ""
-"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
-"parse it. It will check it for syntax errors and other problems, and display "
-"the name of the binary package being built.  B<dpkg-deb> will also check the "
-"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
-"control information directory."
+"The B<-e> and B<-i> options were only introduced in relatively recent "
+"versions of B<dpkg-architecture> (since dpkg 1.13.13)."
 msgstr ""
-"Såvida du inte anger B<--nocheck> kommer dpkg-deb att läsa B<DEBIAN/control> "
-"och tolka den. Den kommer leta efter syntaxfel och andra problem, och visa "
-"namnet på det binärpaket som byggs. B<dpkg-deb> kommer även att kontrollera "
-"behörigheten på paketskripten och andra filer som hittas i "
-"styrinformationskatalogen B<DEBIAN>."
 
 # type: Plain text
-#: dpkg-deb.1:91
+#: dpkg-architecture.1:249
 msgid ""
-"If no I<archive> is specified then B<dpkg-deb> will write the package into "
-"the file I<directory>B<.deb>."
+"B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
+"architecture>. Other examples:"
 msgstr ""
-"Om inget I<arkiv> anges kommer B<dpkg-deb> skriva paketet till filen "
-"I<katalog>B<.deb>."
 
 # type: Plain text
-#: dpkg-deb.1:93
-msgid "If the archive to be created already exists it will be overwritten."
-msgstr "Om arkivet som skall skapas redan finns kommer det skrivas över."
+#: dpkg-architecture.1:251
+msgid "CC=i386-gnu-gcc dpkg-architecture CW<\\*(C`-c\\*(C'> debian/rules build"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:253
+msgid "eval \\`dpkg-architecture CW<\\*(C`-u\\*(C'>\\`"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:109
+#: dpkg-architecture.1:256
 msgid ""
-"If the second argument is a directory then B<dpkg-deb> will write to the "
-"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-"the package control file. When a target directory is specified, rather than "
-"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
-"read and parse the package control file to determine which filename to use)."
+"Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
-"Om den andra parametern är en katalog kommer B<dpkg-deb> skriva till filen "
-"I<paket>B<_>I<version>B<_>I<arkitektur>B<.deb>, eller "
-"I<paket>B<_>I<version>B<.deb> om det inte finns något B<Architecture>-fält i "
-"styrfilen control. När en målkatalog anges, istället för en fil, kan inte "
-"flaggan B<--nocheck> användas (eftersom B<dpkg-deb> måste läsa och tolka "
-"paketets styrfil control för att ta reda på vilket filnamn som skall "
-"användas)."
 
-# type: TP
-#: dpkg-deb.1:109 dpkg-split.1:87
-#, no-wrap
-msgid "B<--info>, B<-I>"
-msgstr "B<--info>, B<-I>"
+# type: Plain text
+#: dpkg-architecture.1:258
+msgid "dpkg-architecture -elinux-alpha"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:112
-msgid "Provides information about a binary package archive."
-msgstr "Tillhandahåller information om ett binärt parketarkiv."
+#: dpkg-architecture.1:260
+msgid "dpkg-architecture -amips -elinux-mips"
+msgstr ""
 
 # type: Plain text
-#: dpkg-deb.1:117
+#: dpkg-architecture.1:263
 msgid ""
-"If no I<control-file-name>s are specified then it will print a summary of "
-"the contents of the package as well as its control file."
+"Check if the current architecture or an architecture provided with -a are "
+"Linux systems:"
 msgstr ""
-"Om inga I<control-filnamn> anges kommer det att visa en sammanfattning av "
-"innehållet i paketet tillsammans med dess styrfil."
 
 # type: Plain text
-#: dpkg-deb.1:125
-msgid ""
-"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
-"in the order they were specified; if any of the components weren't present "
-"it will print an error message to stderr about each one and exit with status "
-"2."
+#: dpkg-architecture.1:265
+msgid "dpkg-architecture -ilinux-any"
 msgstr ""
-"Om ett eller flera I<control-filnamn> anges kommer B<dpkg-deb> att skriva ut "
-"dem i den ordning de anges. Om några av komponenterna inte fanns kommer ett "
-"felmeddelande för vart och ett skrivas ut på standard fel, och programmet "
-"avslutar med felstatus 2."
 
-# type: TP
-#: dpkg-deb.1:125
-#, no-wrap
-msgid "B<--show>, B<-W>"
-msgstr "B<--show>, B<-W>"
+# type: Plain text
+#: dpkg-architecture.1:267
+msgid "dpkg-architecture -ai386 -ilinux-any"
+msgstr ""
+
+# type: Plain text
+#: dpkg-architecture.1:271
+#, fuzzy
+msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:132
+#: dpkg-architecture.1:276
 msgid ""
-"Provides information about a binary package archive in the format specified "
-"by the B<--showformat> argument. The default format displays the package's "
-"name and version on one line, seperated by a tabulator."
+"B<dpkg-architecture> and this man page were initially written by Marcus "
+"Brinkmann E<lt>brinkmd@debian.orgE<gt>."
 msgstr ""
-"Ger information om ett binärt paketarkiv i det format som anges med flaggan "
-"B<--showformat>. Det förvalda formatet visar paketets namn och version på en "
-"rad, avdelade med tabulatortecken."
 
-# type: TP
-#: dpkg-deb.1:132
+# type: TH
+#: dpkg.cfg.5:1
 #, no-wrap
-msgid "B<--field>, B<-f>"
-msgstr "B<--field>, B<-f>"
+msgid "dpkg.cfg"
+msgstr "dpkg.cfg"
 
 # type: Plain text
-#: dpkg-deb.1:135
-msgid "Extracts control file information from a binary package archive."
-msgstr "Extraherar styrfilsinformation från ett binärt paketarkiv."
+#: dpkg.cfg.5:4
+msgid "dpkg.cfg - dpkg configuration file"
+msgstr "dpkg.cfg - inställningsfil för dpkg"
 
 # type: Plain text
-#: dpkg-deb.1:139
+#: dpkg.cfg.5:11
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
-"control file."
-msgstr "Om du inte anger några B<styrfilfält> visas hela styrfilen."
+"This file contains default options for dpkg. Each line contains a single "
+"option which is exactly the same as a normal command line option for dpkg "
+"except for the leading dashes which are not used here. Comments are allowed "
+"by starting a line with a hash sign (\"B<#>\")."
+msgstr ""
+"Denna fil innehåller förvalda inställningar för dpkg. Varje rad består av en "
+"ensam flagga som är exakt densamma som en normal kommandoradsflagga för "
+"dpkg, förutom de inledande bindestrecken vilka inte används här. Kommentarer "
+"är tillåtna genom att inleda en rad med nummertecken (\"B<#>\")."
 
 # type: Plain text
-#: dpkg-deb.1:148
-msgid ""
-"If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
-"name (and a colon and space)."
-msgstr ""
-"Om några anges kommer B<dpkg-deb> att visa deras innehåll, i den ordning de "
-"förekommer i styrfilen. Om mer än ett B<styrfilsfält> anges kommer B<dpkg-"
-"deb> visa varje med ett inledande fältnamn (och ett kolon och mellanrum)."
+#: dpkg.cfg.5:16
+msgid "I<~/.dpkg.cfg>"
+msgstr "I<~/.dpkg.cfg>"
 
 # type: Plain text
-#: dpkg-deb.1:150
-msgid "No errors are reported for fields requested but not found."
+#: dpkg.cfg.5:20
+msgid ""
+"See I</usr/share/doc/dpkg/THANKS> for the list of people who have "
+"contributed to B<dpkg>."
 msgstr ""
-"Inga felmeddelande rapporteras för fält som efterfrågas men inte hittas."
-
-# type: TP
-#: dpkg-deb.1:150
-#, no-wrap
-msgid "B<--contents>, B<-c>"
-msgstr "B<--contents>, B<-c>"
+"Se B</usr/share/doc/dpkg/THANKS> för listan över personer som har bidragit "
+"till B<dpkg>."
 
 # type: Plain text
-#: dpkg-deb.1:156
-msgid ""
-"Lists the contents of the filesystem tree archive portion of the package "
-"archive. It is currently produced in the format generated by B<tar>'s "
-"verbose listing."
-msgstr ""
-"Visar innehåller i filsystemsträdsarkivsdelen av paketarkivet. Det visas för "
-"närvarande i det format som genereras av B<tar>s pratsamma visning."
+#: dpkg.cfg.5:22 dpkg-divert.8:120 dpkg-query.1:160 dpkg-statoverride.8:80
+msgid "B<dpkg>(1)."
+msgstr "B<dpkg>(1)."
 
-# type: TP
-#: dpkg-deb.1:156
-#, no-wrap
-msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+# type: Plain text
+#: dpkg-buildpackage.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-buildpackage"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-deb.1:160
-msgid ""
-"Extracts the filesystem tree from a package archive into the specified "
-"directory."
+#: dpkg-buildpackage.1:4
+msgid "dpkg-buildpackage - build source packages"
 msgstr ""
-"Extraherar filsystemsträdet från ett paketarkiv till den angivna katalogen."
 
 # type: Plain text
-#: dpkg-deb.1:165
-msgid ""
-"B<--vextract> (B<-X>)  prints a listing of the files extracted as it goes, "
-"while B<--extract> (B<-x>)  is silent unless an error occurs."
-msgstr ""
-"B<--vextract> (B<-X>) visar en lista över filer som extraheras under tiden, "
-"medan B<--extract> (B<-x>) är tyst såvida inte ett fel uppstår."
+#: dpkg-buildpackage.1:8
+#, fuzzy
+msgid "B<dpkg-buildpackage> [I<options>]"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-deb.1:171
+#: dpkg-buildpackage.1:13
 msgid ""
-"Note that extracting a package to the root directory will I<not> result in a "
-"correct installation! Use B<dpkg> to install packages."
+"B<dpkg-buildpackage> is a control script which can be used to help automate "
+"the building of a package."
 msgstr ""
-"Observera att en extrahering av ett paket till rotkatalogen I<inte> "
-"resulterar i en korrekt installation! Använd B<dpkg> för att installera "
-"paket."
-
-# type: Plain text
-#: dpkg-deb.1:174
-msgid "I<directory> (but not its parents) will be created if necessary."
-msgstr "I<katalog> (men inte dess föräldrar) kommer skapas om nödvändigt."
 
 # type: TP
-#: dpkg-deb.1:174
-#, no-wrap
-msgid "B<--fsys-tarfile>"
-msgstr "B<--fsys-tarfile>"
+#: dpkg-buildpackage.1:15
+#, fuzzy, no-wrap
+msgid "B<-b>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:182
+#: dpkg-buildpackage.1:19
 msgid ""
-"Extracts the filesystem tree data from a binary package and sends it to "
-"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
-"to extract a particular file from a package archive."
+"Specifies a binary-only build, no source files are to be built and/or "
+"distributed, and"
 msgstr ""
-"Extraherar filsystemsträdsdata från ett binärt paket och sänder det till "
-"standard ut i B<tar>-format. Tillsammans med B<tar>(1) kan detta användas "
-"för att hämta ut en enskild fil från ett paketarkiv."
 
 # type: TP
-#: dpkg-deb.1:182
-#, no-wrap
-msgid "B<--control>, B<-e>"
-msgstr "B<--control>, B<-e>"
+#: dpkg-buildpackage.1:19 dpkg-checkbuilddeps.1:23
+#, fuzzy, no-wrap
+msgid "B<-B>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:186
+#: dpkg-buildpackage.1:23
 msgid ""
-"Extracts the control information files from a package archive into the "
-"specified directory."
+"Specifies a binary-only build, no architecture independent binary package "
+"files are to be distributed either."
 msgstr ""
-"Extraherar styrinformationsfilerna från paketarkivet till den angivna "
-"katalogen."
+
+# type: TP
+#: dpkg-buildpackage.1:23
+#, fuzzy, no-wrap
+msgid "B<-S>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:190
-msgid ""
-"If no directory is specified then a subdirectory B<DEBIAN> in the current "
-"directory is used."
-msgstr ""
-"Om ingen katalog anges kommer en underkatalog vid namn B<DEBIAN> i den "
-"aktuella katalogen att användas."
+#: dpkg-buildpackage.1:26
+#, fuzzy
+msgid "Specifies a source-only build, no binary packages need to be made."
+msgstr "Delar ett ensamt binärt Debianpaket i flera delar."
 
 # type: Plain text
-#: dpkg-deb.1:193
+#: dpkg-buildpackage.1:33 dpkg-source.1:145
 msgid ""
-"The target directory (but not its parents) will be created if necessary."
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-buildpackage> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
-"Målkatalogen (men inte dess föräldrar) kommer att skapas om nödvändigt."
 
 # type: TP
-#: dpkg-deb.1:193 dpkg-split.1:143
-#, no-wrap
-msgid "B<--help>, B<-h>"
-msgstr "B<--help>, B<-h>"
+#: dpkg-buildpackage.1:33
+#, fuzzy, no-wrap
+msgid "B<-si>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:198
+#: dpkg-buildpackage.1:40
 msgid ""
-"Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-"their uses."
+"Include the original source if the version number ends in B<-0> or B<-1>, i."
+"e. if the Debian revision part of the version number is B<0> or B<1>.  "
+"B<This is the default.>"
 msgstr ""
-"Visar B<dpkg-deb>s användningsmeddelande, vilket sammanfattar dess flaggor "
-"och deras användning."
+
+# type: TP
+#: dpkg-buildpackage.1:40
+#, fuzzy, no-wrap
+msgid "B<-sa>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:203
-msgid "Prints B<dpkg-deb>'s version number."
-msgstr "Visar B<dpkg-deb>s versionnummer."
+#: dpkg-buildpackage.1:43
+msgid "Forces the inclusion of the original source."
+msgstr ""
 
 # type: TP
-#: dpkg-deb.1:203 dpkg-split.1:153
-#, no-wrap
-msgid "B<--licence>"
-msgstr "B<--licence>"
+#: dpkg-buildpackage.1:43
+#, fuzzy, no-wrap
+msgid "B<-sd>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:210
-msgid ""
-"Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported)."
+#: dpkg-buildpackage.1:46
+msgid "Forces the exclusion of the original source and includes only the diff."
 msgstr ""
-"Visar information om B<dpkg-deb>s upphovsrätt, licensinformation och "
-"avsaknad av garanti. (Den amerikanskengelska stavningen B<--license> stöds "
-"också.)"
-
-# type: SH
-#: dpkg-deb.1:210 dpkg-split.1:160
-#, no-wrap
-msgid "OTHER OPTIONS"
-msgstr "ANDRA FLAGGOR"
 
 # type: TP
-#: dpkg-deb.1:211
+#: dpkg-buildpackage.1:46
 #, fuzzy, no-wrap
-msgid "B<--showformat=>I<format>"
-msgstr "B<--show-format=>I<format>"
+msgid "B<-a>I<architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-deb.1:216 dpkg-query.1:103
-#, fuzzy
+#: dpkg-buildpackage.1:51
 msgid ""
-"This option is used to specify the format of the output B<--show> will "
-"produce. The format is a string that will be output for each package listed."
+"Specify the Debian architecture we build for. The architecture of the "
+"machine we build on is determined automatically, and is also the default for "
+"the host machine."
 msgstr ""
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"Denna flagga används för att ange formatet på det utdata B<--show> skapar. "
-"Formatet är en sträng som kommer att matas ut för varje paket som listas.\n"
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"Denna flagga används för att ange formatet på utdata som skapas av B<--"
-"show>. Formatet är en sträng som matas ut för varje paket i listan."
+
+# type: TP
+#: dpkg-buildpackage.1:51 dpkg-genchanges.1:18 dpkg-gencontrol.1:17
+#: dpkg-parsechangelog.1:29
+#, fuzzy, no-wrap
+msgid "B<-v>I<version>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg-deb.1:225
+#: dpkg-buildpackage.1:55 dpkg-parsechangelog.1:33
 msgid ""
-"The string may reference any status field using the \"${I<field-name>}\" "
-"form, a list of the valid fields can be easily produced using B<-I> on the "
-"same package. A complete explanation of the formatting options (including "
-"escape sequences and field tabbing) can be found in the explanation of the "
-"B<--showformat> option in B<dpkg-query>(1)."
+"Use changelog information from all versions strictly later than I<version>."
 msgstr ""
-"Strängen kan referera till statusfält på formen \"${I<field-name>}\", en "
-"förteckning över giltiga fält kan enkelt skapas genom att använda B<-I> på "
-"samma paket. En fullständig förklaring av formateringsflaggorna (inklusive "
-"ersättningssekvenser och fälttabulering) finns i förklaringen för flaggan "
-"B<--showformat> i B<dpkg-query>(1)."
 
 # type: Plain text
-#: dpkg-deb.1:227
-msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
-msgstr "Förvalet för detta fält är \"${Package}\\et${Version}\\en\"."
-
-# type: TP
-#: dpkg-deb.1:227
-#, no-wrap
-msgid "B<--new>"
-msgstr "B<--new>"
+#: dpkg-buildpackage.1:55 dpkg-genchanges.1:23
+#, fuzzy, no-wrap
+msgid "B<-C>I<changesdescription>"
+msgstr "B< >E<lt>lång beskrivningE<gt>"
 
 # type: Plain text
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 msgid ""
-"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
+"Read the description of the changes from the file I<changesdescription> "
+"rather than using the information from the source tree's changelog file."
 msgstr ""
-"Försäkrar att B<dpkg-deb> bygger ett arkiv i \"nytt\" format.  Detta är "
-"förval."
 
 # type: TP
-#: dpkg-deb.1:232
+#: dpkg-buildpackage.1:60 dpkg-genchanges.1:29
 #, no-wrap
-msgid "B<--old>"
-msgstr "B<--old>"
-
-# type: Plain text
-#: dpkg-deb.1:240
-msgid ""
-"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
-"is less easily parsed by non-Debian tools and is now obsolete; its only use "
-"is when building packages to be parsed by versions of dpkg older than "
-"0.93.76 (September 1995), which was released as i386 a.out only."
+msgid "B<-m>I<maintaineraddress>"
 msgstr ""
-"Tvingar B<dpkg-deb> att bygga ett arkiv i \"gammalt\" format. Det gamla "
-"arkivformatet är mer svårtolkat av icke-Debianverktyg och är nu utgånget; "
-"dess enda användningsområde är för att bygga paket som skall tolkas av "
-"versioner av dpkg äldre än 0.93.76 (september 1995), vilka endast släpptes "
-"som i386-a.out."
 
 # type: Plain text
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 msgid ""
-"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
-"archive. You can build any archive you want, no matter how broken, this way."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this package, rather than using the information from the source tree's "
+"control file."
 msgstr ""
-"Förhindrar B<dpkg-deb --build s> normala tester på det föreslagna innehållet "
-"i arkivet. Du kan bygga vilket arkiv du än vill, oavsett hur trasigt, på "
-"detta sätt."
 
 # type: TP
-#: dpkg-deb.1:246
+#: dpkg-buildpackage.1:66 dpkg-genchanges.1:35
 #, no-wrap
-msgid "B<--debug>, B<-D>"
-msgstr "B<--debug>, B<-D>"
-
-# type: Plain text
-#: dpkg-deb.1:249
-msgid "Enables debugging output. This is not very interesting."
-msgstr "Aktiverar felsökningsutdata. Denna är inte speciellt intressant."
-
-# type: Plain text
-#: dpkg-deb.1:254
-msgid ""
-"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
-msgstr "B<dpkg-deb -I> I<paket1>B<.deb> I<paket2>B<.deb> gör fel."
-
-# type: Plain text
-#: dpkg-deb.1:258
-msgid ""
-"There is no authentication on B<.deb> files; in fact, there isn't even a "
-"straightforward checksum."
+msgid "B<-e>I<maintaineraddress>"
 msgstr ""
-"Det finns ingen autentisering i B<.deb>-filer; det finns faktiskt inte ens "
-"en vanlig kontrollsumma."
 
 # type: Plain text
-#: dpkg-deb.1:265
+#: dpkg-buildpackage.1:72 dpkg-genchanges.1:41
 msgid ""
-"Do not attempt to use just B<dpkg-deb> to install software! You must use "
-"B<dpkg> proper to ensure that all the files are correctly placed and the "
-"package's scripts run and its status and contents recorded."
+"Use I<maintaineraddress> as the name and email address of the maintainer for "
+"this upload, rather than using the information from the source tree's "
+"changelog."
 msgstr ""
-"Försök inte använda bara B<dpkg-deb> för att installera programvara! Du "
-"måste använda normala B<dpkg> för att se till att alla filer läggs på "
-"korrekt plats och att paketets skript körs och dess status och innehåll "
-"sparas."
 
-# type: Plain text
-#: dpkg-deb.1:270
-msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+# type: TP
+#: dpkg-buildpackage.1:72
+#, fuzzy, no-wrap
+msgid "B<-D>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-deb.1:278
-#, fuzzy
-msgid ""
-"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
-"Copyright (C) 1995-1996 by him and released under the GNU General Public "
-"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
-"copyright> and I</usr/share/common-licenses/GPL> for details."
+#: dpkg-buildpackage.1:75
+msgid "Check build dependencies and conflicts; abort if unsatisfied."
 msgstr ""
-"B<dpkg-deb> och denna manualsida skrevs av Ian Jackson. De är "
-"upphovsrättsskyddade 1995-1996 av honom och släppta under GNU General Public "
-"Licence; det finns INGEN garanti. Se B</usr/share/doc/dpkg/copyright> och B</"
-"usr/share/common-licenses/GPL> för detaljer."
 
-# type: TH
-#: dpkg-divert.8:1
+# type: TP
+#: dpkg-buildpackage.1:75
 #, fuzzy, no-wrap
-msgid "dpkg-divert"
-msgstr "dpkg-deb"
+msgid "B<-d>"
+msgstr "B<-G>"
 
-# type: Plain text
-#: dpkg-divert.8:4
+# type: SS
+#: dpkg-buildpackage.1:78
 #, fuzzy
-msgid "dpkg-divert - override a package's version of a file"
-msgstr "dpkg-split - Verktyg för att dela/slå ihop Debianpaket"
+msgid "Do not check build dependencies and conflicts."
+msgstr "Lösa beroenden och konflikter"
 
-# type: Plain text
-#: dpkg-divert.8:10
-#, fuzzy
-msgid "B<dpkg-divert> [I<options>] [B<--add>] I<E<lt>fileE<gt>>"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+# type: TP
+#: dpkg-buildpackage.1:78 dpkg-source.1:103
+#, fuzzy, no-wrap
+msgid "B<-W>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:15
-msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:84
+msgid ""
+"Turn certain errors into warnings. Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:20
-msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:84 dpkg-source.1:106
+#, fuzzy, no-wrap
+msgid "B<-E>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:25
-msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
+#: dpkg-buildpackage.1:92
+msgid ""
+"Negates a previously set B<-W>.  Only dpkg-source uses this, but B<dpkg-"
+"buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:92
+#, fuzzy, no-wrap
+msgid "B<-nc>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-divert.8:36
-msgid ""
-"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
-"into its location, but to a `diverted' location. Diversions can be used "
-"through the Debian package scripts to move a file away when it causes a "
-"conflict. System administrators can also use it to override some package's "
-"configuration file, or whenever some files (which aren't marked as "
-"'conffiles') need to be preserved by dpkg, when installing a newer version "
-"of a package which contains those files."
+#: dpkg-buildpackage.1:95
+msgid "Do not clean the source tree (implies B<-b>)."
 msgstr ""
 
+# type: TP
+#: dpkg-buildpackage.1:95
+#, fuzzy, no-wrap
+msgid "B<-tc>"
+msgstr "B<-G>"
+
 # type: Plain text
-#: dpkg-divert.8:44
+#: dpkg-buildpackage.1:101
 msgid ""
-"B<dpkg-divert> is the utility used to set up and update the list of "
-"diversions. It functions in three basic modes - adding, removing, and "
-"listing diversions.  The options are B<--add>, B<--remove>, and B<--list>, "
-"respectively. Additionally, it can print out the real name for a diverted "
-"file with B<--truename>. Other options (listed below) may also be specified."
+"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
+"after the package has been built."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:45 dselect.1:52
+#: dpkg-buildpackage.1:101
 #, no-wrap
-msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+msgid "B<-r>I<gain-root-command>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:48
+#.  what happens, if it contains spaces? (hs)
+#: dpkg-buildpackage.1:127
 msgid ""
-"Set the dpkg data directory to I<E<lt>directoryE<gt>> (default: I</var/lib/"
-"dpkg>)."
+"When B<dpkg-buildpackage> needs to execute part of the build process as "
+"root, it prefixes the command it executes with I<gain-root-command> if one "
+"has been specified.  I<gain-root-command> should be the name of a program on "
+"the B<PATH> and will get as arguments the name of the real command to run "
+"and the arguments it should take.  I<gain-root-command> should not contain "
+"spaces or any other shell metacharacters.  I<gain-root-command> might "
+"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
+"suitable, since it requires a B<-c> option to run a command and even then it "
+"can only invoke the user's shell with B<-c> instead of passing arguments "
+"individually to the command to be run."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:48
-#, fuzzy, no-wrap
-msgid "B<--divert>I< E<lt>divert-toE<gt>>"
-msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+#: dpkg-buildpackage.1:127
+#, no-wrap
+msgid "B<-p>I<sign-command>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:52
+#: dpkg-buildpackage.1:152
 msgid ""
-"I<E<lt>divert-toE<gt>> is the location where the versions of "
-"I<E<lt>fileE<gt>>, as provided by other packages, will be diverted."
+"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
+"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
+"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
+"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
+"takes its arguments in GPG rather than PGP style, you should give the B<-"
+"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
+"metacharacters."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:52
-#, fuzzy, no-wrap
-msgid "B<--local>"
-msgstr "B<--old>"
+#: dpkg-buildpackage.1:152
+#, no-wrap
+msgid "B<-k>I<key-id>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:58
-msgid ""
-"Specifies that all packages' versions of this file are diverted.  This "
-"means, that there are no exceptions, and whatever package is installed, the "
-"file is diverted. This can be used by an admin to install a locally modified "
-"version."
-msgstr ""
+#: dpkg-buildpackage.1:155
+#, fuzzy
+msgid "Specify a key-ID to use when signing packages."
+msgstr "Den sista raden på skärmen när paket väljs."
 
 # type: TP
-#: dpkg-divert.8:58
+#: dpkg-buildpackage.1:155
 #, fuzzy, no-wrap
-msgid "B<--package>I< E<lt>packageE<gt>>"
-msgstr "B<Package:> E<lt>paketnamnE<gt>"
+msgid "B<-us>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:63
-msgid ""
-"I<E<lt>packageE<gt>> is the name of a package whose copy of "
-"I<E<lt>fileE<gt>> will not be diverted. i.e. I<E<lt>fileE<gt>> will be "
-"diverted for all packages except I<E<lt>packageE<gt>>."
-msgstr ""
+#: dpkg-buildpackage.1:158
+#, fuzzy
+msgid "Do not sign the source package."
+msgstr "Paketets korta beskrivning."
 
 # type: TP
-#: dpkg-divert.8:63 dpkg-statoverride.8:61 install-info.8:190
-#: update-alternatives.8:296
+#: dpkg-buildpackage.1:158
 #, fuzzy, no-wrap
-msgid "B<--quiet>"
-msgstr "B<-q>|B<--quiet>"
+msgid "B<-uc>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:66
-msgid "Quiet mode, i.e. no verbose output."
+#: dpkg-buildpackage.1:161
+msgid "Do not sign the .changes file."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:66
-#, fuzzy, no-wrap
-msgid "B<--rename>"
-msgstr "B<--new>"
+#: dpkg-buildpackage.1:161 dpkg-source.1:110
+#, no-wrap
+msgid "B<-i>[I<regexp>]"
+msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:70
-msgid ""
-"Actually move the file aside (or back). dpkg-divert will abort operation in "
-"case the destination file already exists."
+#: dpkg-buildpackage.1:165
+msgid "Passed unchanged to B<dpkg-source>."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:70 install-info.8:269 update-alternatives.8:300
+#: dpkg-buildpackage.1:165 dpkg-source.1:130
 #, fuzzy, no-wrap
-msgid "B<--test>"
-msgstr "B<-t>|B<--test>"
+msgid "B<-I>I<filename>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-divert.8:73
-msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
+#: dpkg-buildpackage.1:170
+msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
 msgstr ""
 
-# type: Plain text
-#: dpkg-divert.8:76
-#, fuzzy
-msgid "Output short usage instructions, and exit successfully."
-msgstr "Visar versionsinformation och ger lyckat avslut."
-
-# type: Plain text
-#: dpkg-divert.8:79
-#, fuzzy
-msgid "Output program name and version and exit successfully."
-msgstr "Visar versionsinformation och ger lyckat avslut."
-
-# type: SH
-#: dpkg-divert.8:80
+# type: TP
+#: dpkg-buildpackage.1:170 dpkg-checkbuilddeps.1:19 dpkg-query.1:70
+#: dpkg-shlibdeps.1:105
 #, no-wrap
-msgid "NOTES"
-msgstr ""
+msgid "B<--admindir=>I<dir>"
+msgstr "B<--admindir=>I<kat>"
 
 # type: Plain text
-#: dpkg-divert.8:84
+#: dpkg-buildpackage.1:174 dpkg-checkbuilddeps.1:23 dpkg-query.1:74
+#: dpkg-shlibdeps.1:109
 msgid ""
-"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
-"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
-"match if specified."
-msgstr ""
+"Change the location of the B<dpkg> database. The default location is I</var/"
+"lib/dpkg>."
+msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
 
-# type: Plain text
-#: dpkg-divert.8:86
-msgid "Directories can't be diverted with B<dpkg-divert>."
-msgstr ""
+# type: TP
+#: dpkg-buildpackage.1:174 dpkg-distaddfile.1:32 dpkg-deb.1:162
+#: dpkg-genchanges.1:139 dpkg-gencontrol.1:98 dpkg-name.1:56
+#: dpkg-parsechangelog.1:33 dpkg-query.1:59 dpkg-scanpackages.1:81
+#: dpkg-shlibdeps.1:109 dpkg-source.1:60 dpkg-split.1:127
+#, fuzzy, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: dpkg-divert.8:92
+#: dpkg-buildpackage.1:185
 msgid ""
-"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
-"creates a symbolic link based on the DT_SONAME field embedded in the "
-"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
-"symlink may end up pointing at the diverted library, if a diverted library "
-"has the same SONAME as the undiverted one."
+"It should be possible to specify spaces and shell metacharacters in and "
+"initial arguments for I<gain-root-command> and I<sign-command>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:97
+#: dpkg-buildpackage.1:192
+#, fuzzy
 msgid ""
-"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
-"e. directs all packages providing I</usr/bin/example> to install it as I</"
-"usr/bin/example.foo>, performing the rename if required:"
-msgstr ""
+"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-genchanges>(1), B<gpg>"
+"(1), B<pgp>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#: dpkg-divert.8:99
-msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+# type: TH
+#: dpkg-checkbuilddeps.1:1
+#, no-wrap
+msgid "dpkg-checkbuilddeps"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:101 dpkg-divert.8:111
-msgid "To remove that diversion:"
+#: dpkg-checkbuilddeps.1:4
+msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:103
-msgid "dpkg-divert --rename --remove /usr/bin/example"
-msgstr ""
+#: dpkg-checkbuilddeps.1:9
+#, fuzzy
+msgid "B<dpkg-checkbuilddeps> [I<options>] [I<control-file>]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<arkiv> [I<control-filnamn> ..]"
 
 # type: Plain text
-#: dpkg-divert.8:107
+#: dpkg-checkbuilddeps.1:14
 msgid ""
-"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
-"example.foo>, except your own I<wibble> package:"
+"This program checks the installed packages in the system against the build "
+"dependencies and build conflicts listed in the control file. If any are not "
+"met, it displays them and exits with a nonzero return code."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:109
+#: dpkg-checkbuilddeps.1:17
 msgid ""
-"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
-"example"
+"By default, I<debian/control> is read, but an alternate control filename may "
+"be specified on the command line."
 msgstr ""
 
 # type: Plain text
-#: dpkg-divert.8:113
-msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
+#: dpkg-checkbuilddeps.1:27
+msgid ""
+"Ignore I<Build-Depends-Indep> lines. Use when no arch-indep packages will be "
+"built."
 msgstr ""
 
 # type: TP
-#: dpkg-divert.8:115
+#: dpkg-checkbuilddeps.1:27
 #, fuzzy, no-wrap
-msgid "I</var/lib/dpkg/diversions>"
-msgstr "B</var/lib/dpkg/parts>"
+msgid "B<-h>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-divert.8:120
-msgid ""
-"File which contains the current list of diversions of the system. It is "
-"located in the dpkg administration directory, along with other files "
-"important to dpkg, such as `status' or `available'."
-msgstr ""
+#: dpkg-checkbuilddeps.1:33
+#, fuzzy
+msgid "Copyright 2001 Joey Hess"
+msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
 
-# type: Plain text
-#: dpkg-divert.8:123
-msgid ""
-"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
-"old\", before replacing it with the new one."
-msgstr ""
+# type: UR
+#: dpkg-checkbuilddeps.1:33
+#, fuzzy, no-wrap
+msgid "mailto:joeyh@debian.org"
+msgstr "mailto:wakkerma@debian.org"
 
 # type: Plain text
-#: dpkg-divert.8:128
-msgid "Copyright (C) 1995 Ian Jackson."
-msgstr ""
+#: dpkg-checkbuilddeps.1:35
+#, fuzzy
+msgid "E<lt>joeyh@debian.orgE<gt>."
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
 # type: TH
-#: dpkg-name.1:6
-#, fuzzy, no-wrap
-msgid "dpkg-name"
-msgstr "dpkg-deb"
+#: dpkg-distaddfile.1:1
+#, no-wrap
+msgid "dpkg-distaddfile"
+msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:9
-msgid "dpkg-name - rename Debian packages to full package names"
+#: dpkg-distaddfile.1:4
+msgid "dpkg-distaddfile - add entries to debian/files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-name.1:22
-msgid ""
-"B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|B<--"
-"subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|B<--"
-"version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
-msgstr ""
+#: dpkg-distaddfile.1:8
+#, fuzzy
+msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-name.1:33
-msgid ""
-"This manual page documents the B<dpkg-name> sh script which provides an easy "
-"way to rename B<Debian> packages into their full package names. A full "
-"package name consists of "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
-"in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the upstream version information optionally followed by "
-"a hyphen and the revision information."
+#: dpkg-distaddfile.1:13
+msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:34
-#, fuzzy, no-wrap
-msgid "B<-a, --no-architecture>"
-msgstr "B<dpkg --print-architecture>"
-
 # type: Plain text
-#: dpkg-name.1:37
-msgid "The destination filename will not have the architecture information."
+#: dpkg-distaddfile.1:18
+msgid ""
+"It takes three non-option arguments, the filename and the section and "
+"priority for the B<.changes> file."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:37
-#, fuzzy, no-wrap
-msgid "B<-k, --symlink>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
-#: dpkg-name.1:40
-msgid "Create a symlink, instead of moving."
+#: dpkg-distaddfile.1:26
+msgid ""
+"The filename should be specified relative to the directory where B<dpkg-"
+"genchanges> will expect to find the files, usually B<..>, rather than being "
+"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:40
+#: dpkg-distaddfile.1:28 dpkg-genchanges.1:111 dpkg-gencontrol.1:46
 #, fuzzy, no-wrap
-msgid "B<-o, --overwrite>"
-msgstr "B<--version>"
+msgid "B<-f>I<fileslistfile>"
+msgstr "B<--fsys-tarfile>"
 
 # type: Plain text
-#: dpkg-name.1:44
+#: dpkg-distaddfile.1:32 dpkg-gencontrol.1:50
 msgid ""
-"Existing files will be overwritten if they have the same name as the "
-"destination filename."
+"Read or write the list of files to be uploaded here, rather than using "
+"B<debian/files>."
 msgstr ""
 
 # type: TP
-#: dpkg-name.1:44
+#: dpkg-distaddfile.1:40 dpkg-genchanges.1:147 dpkg-gencontrol.1:111
 #, fuzzy, no-wrap
-msgid "B<-s, --subdir> [I<dir>]"
-msgstr "B<--admindir=>I<kat>"
+msgid "B<debian/files>"
+msgstr "B<infodesc>"
 
 # type: Plain text
-#: dpkg-name.1:56
+#: dpkg-distaddfile.1:46
 msgid ""
-"Files will be moved into a subdirectory. If the directory given as argument "
-"exists the files will be moved into that directory otherwise the name of the "
-"target directory is extracted from the section field in the control part of "
-"the package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
-"the control, then `no-section' is assumed, and in this case, as well as for "
-"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
-"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
-"packages will find their way to the `no-section' area. Use this option with "
-"care, it's messy."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-distaddfile> can be used to add additional files."
 msgstr ""
 
-# type: TP
-#: dpkg-name.1:56
+# type: TH
+#: dpkg-deb.1:1
 #, no-wrap
-msgid "B<-c, --create-dir>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-name.1:61
-msgid ""
-"This option can used together with the -s option. If a target directory "
-"isn't found it will be created automatically.  B<Use this option with care.>"
-msgstr ""
+msgid "dpkg-deb"
+msgstr "dpkg-deb"
 
-# type: TP
-#: dpkg-name.1:61
+# type: TH
+#: dpkg-deb.1:1
 #, fuzzy, no-wrap
-msgid "B<-h, --help>"
-msgstr "B<--help>"
+msgid "2007-03-13"
+msgstr "2006-05-10"
 
 # type: Plain text
-#: dpkg-name.1:64
-#, fuzzy
-msgid "Print a usage message and exit successfully."
-msgstr "Visar en kort hjälptext och ger lyckat avslut."
-
-# type: TP
-#: dpkg-name.1:64
-#, fuzzy, no-wrap
-msgid "B<-v, --version>"
-msgstr "B<--version>"
+#: dpkg-deb.1:4
+msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
+msgstr "dpkg-deb - Debians manipuleringsverktyg för paketarkiv (.deb)"
 
 # type: Plain text
-#: dpkg-name.1:67 dselect.1:131
-msgid "Print version information and exit successfully."
-msgstr "Visar versionsinformation och ger lyckat avslut."
-
-# type: TP
-#: dpkg-name.1:67
-#, fuzzy, no-wrap
-msgid "B<-l, --license>"
-msgstr "B<--licence>"
+#: dpkg-deb.1:9
+#, fuzzy
+msgid "B<dpkg-deb> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-name.1:71
-#, fuzzy
+#: dpkg-deb.1:13
 msgid ""
-"Print copyright information and (a reference to GNU) license information and "
-"exit successfully."
+"B<dpkg-deb> packs, unpacks and provides information about Debian archives."
 msgstr ""
-"Visar upphovsrättslig och licensinformation om B<dselect>, och ger lyckat "
-"avslut."
+"B<dpkg-deb> packar, packar upp och tillhandahåller information om "
+"Debianarkiv."
 
-# type: TP
-#: dpkg-name.1:72
-#, no-wrap
-msgid "B<dpkg-name bar-foo.deb>"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:17
+msgid "Use B<dpkg> to install and remove packages from your system."
+msgstr "Använd B<dpkg> för att installera och ta bort paket från ditt system."
 
 # type: Plain text
-#: dpkg-name.1:77
+#: dpkg-deb.1:27
 msgid ""
-"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-"something similar (depending on whatever information is in the control part "
-"of `bar-foo.deb')."
+"You can also invoke B<dpkg-deb> by calling B<dpkg> with whatever options you "
+"want to pass to B<dpkg-deb>. B<dpkg> will spot that you wanted B<dpkg-deb> "
+"and run it for you."
 msgstr ""
+"Du kan även starta B<dpkg-deb> genom att anropa B<dpkg> med de parametrar du "
+"vill sända till B<dpkg-deb>. B<dpkg> kommer upptäcka att du ville åt B<dpkg-"
+"deb> och kör det åt dig."
 
-# type: TP
-#: dpkg-name.1:77
-#, no-wrap
-msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:29
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<katalog> [I<arkiv>|I<katalog>]"
 
 # type: Plain text
-#: dpkg-name.1:82
+#: dpkg-deb.1:41
 msgid ""
-"All files with the extension `deb' in the directory /root/debian and its "
-"subdirectory's will be renamed by dpkg-name if required into names with no "
-"architecture information."
-msgstr ""
-
-# type: TP
-#: dpkg-name.1:82
-#, no-wrap
-msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+"Creates a debian archive from the filesystem tree stored in I<directory>. "
+"I<directory> must have a B<DEBIAN> subdirectory, which contains the control "
+"information files such as the control file itself. This directory will "
+"I<not> appear in the binary package's filesystem archive, but instead the "
+"files in it will be put in the binary package's control information area."
 msgstr ""
+"Skapar ett Debianarkiv från filsystemsträdet som lagras i I<katalog>. "
+"I<katalog> måste innehålla underkatalogen B<DEBIAN>, vilken innehåller "
+"styrinformationsfiler såsom själv styrfilen control. Denna katalog kommer "
+"I<inte> att visas i binärpaketets filsystemsarkiv, utan istället kommer "
+"filerna läggas i binärpaketets styrinformationsområde."
 
 # type: Plain text
-#: dpkg-name.1:88
+#: dpkg-deb.1:53
 msgid ""
-"B<Don't do this.> Your archive will be messed up completely because a lot of "
-"packages don't come with section information.  B<Don't do this.>"
+"Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
+"parse it. It will check it for syntax errors and other problems, and display "
+"the name of the binary package being built.  B<dpkg-deb> will also check the "
+"permissions of the maintainer scripts and other files found in the B<DEBIAN> "
+"control information directory."
 msgstr ""
+"Såvida du inte anger B<--nocheck> kommer dpkg-deb att läsa B<DEBIAN/control> "
+"och tolka den. Den kommer leta efter syntaxfel och andra problem, och visa "
+"namnet på det binärpaket som byggs. B<dpkg-deb> kommer även att kontrollera "
+"behörigheten på paketskripten och andra filer som hittas i "
+"styrinformationskatalogen B<DEBIAN>."
 
-# type: TP
-#: dpkg-name.1:88
-#, no-wrap
-msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
+# type: Plain text
+#: dpkg-deb.1:60
+msgid ""
+"If no I<archive> is specified then B<dpkg-deb> will write the package into "
+"the file I<directory>B<.deb>."
 msgstr ""
+"Om inget I<arkiv> anges kommer B<dpkg-deb> skriva paketet till filen "
+"I<katalog>B<.deb>."
 
 # type: Plain text
-#: dpkg-name.1:91
-#, fuzzy
-msgid "This can be used when building new packages."
-msgstr "Den sista raden på skärmen när paket väljs."
+#: dpkg-deb.1:62
+msgid "If the archive to be created already exists it will be overwritten."
+msgstr "Om arkivet som skall skapas redan finns kommer det skrivas över."
 
 # type: Plain text
-#: dpkg-name.1:100
+#: dpkg-deb.1:78
 msgid ""
-"Some packages don't follow the name structure "
-"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
-"renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
-"installation tools might depend on this naming structure."
+"If the second argument is a directory then B<dpkg-deb> will write to the "
+"file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
+"I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
+"the package control file. When a target directory is specified, rather than "
+"a file, the B<--nocheck> option may not be used (since B<dpkg-deb> needs to "
+"read and parse the package control file to determine which filename to use)."
 msgstr ""
+"Om den andra parametern är en katalog kommer B<dpkg-deb> skriva till filen "
+"I<paket>B<_>I<version>B<_>I<arkitektur>B<.deb>, eller "
+"I<paket>B<_>I<version>B<.deb> om det inte finns något B<Architecture>-fält i "
+"styrfilen control. När en målkatalog anges, istället för en fil, kan inte "
+"flaggan B<--nocheck> användas (eftersom B<dpkg-deb> måste läsa och tolka "
+"paketets styrfil control för att ta reda på vilket filnamn som skall "
+"användas)."
 
 # type: Plain text
-#: dpkg-name.1:107
-#, fuzzy
-msgid ""
-"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
-"B<xargs>(1)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+#: dpkg-deb.1:78
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<archive> [I<control-file-name> ...]"
+msgstr "B<dpkg-deb> B<-I>|B<--info> I<arkiv> [I<control-filnamn> ..]"
 
-# type: SH
-#: dpkg-name.1:107 dpkg-source.1:847 install-info.8:281
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:81
+msgid "Provides information about a binary package archive."
+msgstr "Tillhandahåller information om ett binärt parketarkiv."
 
 # type: Plain text
-#: dpkg-name.1:113
-#, fuzzy
+#: dpkg-deb.1:86
 msgid ""
-"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
-"the GNU General Public Licence version 2 or later for copying conditions. "
-"There is B<no> warranty."
+"If no I<control-file-name>s are specified then it will print a summary of "
+"the contents of the package as well as its control file."
 msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
-
-# type: Plain text
-#: dpkg-query.1:1
-#, no-wrap
-msgid "dpkg-query"
-msgstr "dpkg-query"
+"Om inga I<control-filnamn> anges kommer det att visa en sammanfattning av "
+"innehållet i paketet tillsammans med dess styrfil."
 
 # type: Plain text
-#: dpkg-query.1:4
-msgid "dpkg-query - a tool to query the dpkg database"
-msgstr "dpkg-query - ett verktyg för att fråga dpkg-databasen"
-
-# type: TP
-#: dpkg-query.1:9
-msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-l>|B<--list> I<paketnamnsmönster> ..."
-
-# type: TP
-#: dpkg-query.1:13
-msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-msgstr "B<dpkg-query> B<-W>|B<--show> I<paketnamnsmönster> ..."
-
-# type: TP
-#: dpkg-query.1:17
-msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-msgstr "B<dpkg-query> B<-s>|B<--status> I<paketnamn> ..."
-
-# type: TP
-#: dpkg-query.1:21
-msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<paketnamn> ..."
-
-# type: TP
-#: dpkg-query.1:25
-msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
-msgstr "B<dpkg-query> B<-S>|B<--search> I<filnamnssökmönster> ..."
-
-# type: TP
-#: dpkg-query.1:29
-msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<paketnamn> ..."
-
-# type: TP
-#: dpkg-query.1:32
-msgid "B<dpkg-query> B<--licence>|B<--license>"
-msgstr "B<dpkg-query> B<--licence>|B<--license>"
+#: dpkg-deb.1:94
+msgid ""
+"If any I<control-file-name>s are specified then B<dpkg-deb> will print them "
+"in the order they were specified; if any of the components weren't present "
+"it will print an error message to stderr about each one and exit with status "
+"2."
+msgstr ""
+"Om ett eller flera I<control-filnamn> anges kommer B<dpkg-deb> att skriva ut "
+"dem i den ordning de anges. Om några av komponenterna inte fanns kommer ett "
+"felmeddelande för vart och ett skrivas ut på standard fel, och programmet "
+"avslutar med felstatus 2."
 
 # type: Plain text
-#: dpkg-query.1:35
-msgid "B<dpkg-query> B<--version>"
-msgstr "B<dpkg-query> B<--version>"
+#: dpkg-deb.1:94
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<arkiv>"
 
 # type: Plain text
-#: dpkg-query.1:39
+#: dpkg-deb.1:101
 msgid ""
-"B<dpkg-query> is a tool to show information about packages listed in the "
-"B<dpkg> database."
+"Provides information about a binary package archive in the format specified "
+"by the B<--showformat> argument. The default format displays the package's "
+"name and version on one line, seperated by a tabulator."
 msgstr ""
-"B<dpkg-query> är ett verktyg för att visa information om paket i B<dpkg>-"
-"databasen."
-
-# type: SH
-#: dpkg-query.1:40
-#, no-wrap
-msgid "COMMANDS"
-msgstr "KOMMANDON"
+"Ger information om ett binärt paketarkiv i det format som anges med flaggan "
+"B<--showformat>. Det förvalda formatet visar paketets namn och version på en "
+"rad, avdelade med tabulatortecken."
 
-# type: TP
-#: dpkg-query.1:41
-#, no-wrap
-msgid "B<-l> | B<--list> I<package-name-pattern> ..."
-msgstr "B<-l> | B<--list> I<paketnamnsmönster> ..."
+# type: Plain text
+#: dpkg-deb.1:101
+#, fuzzy, no-wrap
+msgid "B<-f>, B<--field> I<archive> [I<control-field-name> ...]"
+msgstr "B<dpkg-deb> B<-f>|B<--field> I<arkiv> [I<control-fältnamn> ...]"
 
 # type: Plain text
-#: dpkg-query.1:50
-msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
-"marked with state purge. Normal shell wildchars are allowed in I<package-"
-"name-pattern>. Please note you will probably have to quote I<package-name-"
-"pattern> to prevent the shell from performing filename expansion. For "
-"example this will list all package names starting with ``libc6'':"
-msgstr ""
-"Lista paket som matchar det givna mönstret. Om inget I<paketnamnsmönster> "
-"anges listas alla paket i I</var/lib/dpkg/status>. Skalets normala "
-"jokertecken tillåts i I<paketnamnsmönster>. Observera att du sannolikt måste "
-"skriva I<paketnamnsmönster> inom citationstecken för att förhindra att "
-"skalet expanderar filnamnet. Till exempel kommer följande lista alla paket "
-"vars namn börjar på \"libc6\":"
+#: dpkg-deb.1:104
+msgid "Extracts control file information from a binary package archive."
+msgstr "Extraherar styrfilsinformation från ett binärt paketarkiv."
 
 # type: Plain text
-#: dpkg-query.1:54
-#, no-wrap
-msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
-msgstr "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+#: dpkg-deb.1:108
+msgid ""
+"If no B<control-file-field>s are specified then it will print the whole "
+"control file."
+msgstr "Om du inte anger några B<styrfilfält> visas hela styrfilen."
 
 # type: Plain text
-#: dpkg-query.1:60
+#: dpkg-deb.1:117
 msgid ""
-"The output format of this option is not configurable, but varies "
-"automatically to fit the terminal width. It is intended for human readers, "
-"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
-"showformat> for a way to configure the output format."
+"If any are specified then B<dpkg-deb> will print their contents, in the "
+"order in which they appear in the control file. If more than one B<control-"
+"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"name (and a colon and space)."
 msgstr ""
-"Utdataformatet för detta alternativ kan inte justeras, men varieras "
-"automatiskt för att passa terminalbredden. Det är avsett för mänskliga "
-"läsare, och är inte enkelt maskinläsbart. Se B<-W> (B<--show>) och B<--"
-"showformat> för hur du konfigurerar utdataformatet."
-
-# type: TP
-#: dpkg-query.1:60
-#, no-wrap
-msgid "B<-W> | B<--show> I<package-name-pattern> ..."
-msgstr "B<-W> | B<--show> I<paketnamnsmönster> ..."
+"Om några anges kommer B<dpkg-deb> att visa deras innehåll, i den ordning de "
+"förekommer i styrfilen. Om mer än ett B<styrfilsfält> anges kommer B<dpkg-"
+"deb> visa varje med ett inledande fältnamn (och ett kolon och mellanrum)."
 
 # type: Plain text
-#: dpkg-query.1:67
-msgid ""
-"Just like the B<--list> option this will list all packages matching the "
-"given pattern. However the output can be customized using the B<--"
-"showformat> option.  The default output format gives one line per matching "
-"package, each line having the name and installed version of the package, "
-"separated by a tab."
+#: dpkg-deb.1:119
+msgid "No errors are reported for fields requested but not found."
 msgstr ""
-"Precis som flaggan B<--list> kommer detta att visa alla paket som matchar "
-"det givna mönstret. Utdatat kan dock skräddarsys med flaggan B<--"
-"showformat>. Standardutdataformatet är en rad per paket som träffas, där "
-"varje rad innehåller namn och installerad version av paketet, avdelat med "
-"ett tabulatortecken."
+"Inga felmeddelande rapporteras för fält som efterfrågas men inte hittas."
 
-# type: TP
-#: dpkg-query.1:67
-#, no-wrap
-msgid "B<-s> | B<--status> I<package-name> ..."
-msgstr "B<-s> | B<--status> I<paketnamn> ..."
+# type: Plain text
+#: dpkg-deb.1:119
+#, fuzzy, no-wrap
+msgid "B<-c>, B<--contents> I<archive>"
+msgstr "B<dpkg-deb> B<-c>|B<--contents> I<arkiv>"
 
 # type: Plain text
-#: dpkg-query.1:71
+#: dpkg-deb.1:125
 msgid ""
-"Report status of specified package. This just displays the entry in the "
-"installed package status database."
+"Lists the contents of the filesystem tree archive portion of the package "
+"archive. It is currently produced in the format generated by B<tar>'s "
+"verbose listing."
 msgstr ""
-"Rapportera status om det angivna paketet.  Detta alternativ visar helt "
-"enkelt posten i statusdatabasen för installerade paket."
+"Visar innehåller i filsystemsträdsarkivsdelen av paketarkivet. Det visas för "
+"närvarande i det format som genereras av B<tar>s pratsamma visning."
 
-# type: TP
-#: dpkg-query.1:71
-#, no-wrap
-msgid "B<-L> | B<--listfiles> I<package-name> ..."
-msgstr "B<-L> | B<--listfiles> I<paketnamn> ..."
+# type: Plain text
+#: dpkg-deb.1:125
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--extract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<arkivkatalog>"
 
 # type: Plain text
-#: dpkg-query.1:76
+#: dpkg-deb.1:129
 msgid ""
-"List files installed to your system from B<package-name>.  However, note "
-"that files created by package-specific installation-scripts are not listed."
+"Extracts the filesystem tree from a package archive into the specified "
+"directory."
 msgstr ""
-"Listar filer som installerats på ditt system från B<paketnamn>. Observera "
-"dock att filer som skapats av paketspecifika installationsskript inte listas."
-
-# type: TP
-#: dpkg-query.1:76
-#, no-wrap
-msgid "B<-S> | B<--search> I<filename-search-pattern> ..."
-msgstr "B<-S> | B<--search> I<filnamnssökmönster> ..."
+"Extraherar filsystemsträdet från ett paketarkiv till den angivna katalogen."
 
 # type: Plain text
-#: dpkg-query.1:82
+#: dpkg-deb.1:135
 msgid ""
-"Search for a filename from installed packages. All standard shell wildchars "
-"can be used in the pattern. This command will not list extra files created "
-"by maintainer scripts, nor will it list alternatives."
+"Note that extracting a package to the root directory will I<not> result in a "
+"correct installation! Use B<dpkg> to install packages."
 msgstr ""
-"Sök efter filnamnet bland de installerade paketen. Alla skalets vanliga "
-"jokertecken kan användas i mönstret. Kommandot kommer inte att visa "
-"extrafiler som skapas av paketskript, ej heller kommer det att visa "
-"alternativ."
-
-# type: TP
-#: dpkg-query.1:82
-#, no-wrap
-msgid "B<-p> |B<--print-avail> I<package-name>"
-msgstr "B<-p> |B<--print-avail> I<paketnamn>"
+"Observera att en extrahering av ett paket till rotkatalogen I<inte> "
+"resulterar i en korrekt installation! Använd B<dpkg> för att installera "
+"paket."
 
 # type: Plain text
-#: dpkg-query.1:86
-msgid ""
-"Display details about I<package-name>, as found in I</var/lib/dpkg/"
-"available>."
-msgstr "Visar detaljer om I<paketnamn> från I</var/lib/dpkg/available>."
-
-# type: TP
-#: dpkg-query.1:86
-#, no-wrap
-msgid "B<--licence> | B<--license>"
-msgstr "B<--licence> | B<--license>"
+#: dpkg-deb.1:138
+msgid "I<directory> (but not its parents) will be created if necessary."
+msgstr "I<katalog> (men inte dess föräldrar) kommer skapas om nödvändigt."
 
 # type: Plain text
-#: dpkg-query.1:89
-msgid "Display licence and copyright information."
-msgstr "Visar licensvillkor och upphovsrättsinformation."
+#: dpkg-deb.1:138
+#, fuzzy, no-wrap
+msgid "B<-X>, B<--vextract> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<arkivkatalog>"
 
 # type: Plain text
-#: dpkg-query.1:92
-msgid "Display version information."
-msgstr "Visar versionsinformation."
+#: dpkg-deb.1:143
+#, fuzzy
+msgid ""
+"Is like B<--extract> (B<-x>)  but prints a listing of the files extracted as "
+"it goes."
+msgstr ""
+"B<--vextract> (B<-X>) visar en lista över filer som extraheras under tiden, "
+"medan B<--extract> (B<-x>) är tyst såvida inte ett fel uppstår."
 
-# type: TP
-#: dpkg-query.1:94
-#, no-wrap
-msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir=>I<kat>"
+# type: Plain text
+#: dpkg-deb.1:143
+#, fuzzy, no-wrap
+msgid "B<--fsys-tarfile> I<archive>"
+msgstr "B<dpkg-deb --fsys-tarfile> I<arkiv>"
 
 # type: Plain text
-#: dpkg-query.1:98
+#: dpkg-deb.1:151
 msgid ""
-"Change the location of the B<dpkg> database. The default location is I</var/"
-"lib/dpkg>."
-msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
-
-# type: TP
-#: dpkg-query.1:98
-#, no-wrap
-msgid "B<-f> | B<--showformat=>I<format>"
-msgstr "B<-f> | B<--showformat=>I<format>"
+"Extracts the filesystem tree data from a binary package and sends it to "
+"standard output in B<tar> format. Together with B<tar>(1)  this can be used "
+"to extract a particular file from a package archive."
+msgstr ""
+"Extraherar filsystemsträdsdata från ett binärt paket och sänder det till "
+"standard ut i B<tar>-format. Tillsammans med B<tar>(1) kan detta användas "
+"för att hämta ut en enskild fil från ett paketarkiv."
 
 # type: Plain text
-#: dpkg-query.1:105
-msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
-msgstr "I formatsträgnen inleds följande styrsekvenser med \\(lqB<\\e>\\(rq:"
+#: dpkg-deb.1:151
+#, fuzzy, no-wrap
+msgid "B<-e>, B<--control> I<archive directory>"
+msgstr "B<dpkg-deb> B<-e>|B<--control> I<arkivkatalog>"
 
 # type: Plain text
-#: dpkg-query.1:111
-#, no-wrap
+#: dpkg-deb.1:155
 msgid ""
-"    B<\\en>  newline\n"
-"    B<\\er>  carriage return\n"
-"    B<\\et>  tab\n"
+"Extracts the control information files from a package archive into the "
+"specified directory."
 msgstr ""
-"    B<\\en>  radmatning\n"
-"    B<\\er>  vagnreteur\n"
-"    B<\\et>  tabulator\n"
+"Extraherar styrinformationsfilerna från paketarkivet till den angivna "
+"katalogen."
 
 # type: Plain text
-#: dpkg-query.1:116
+#: dpkg-deb.1:159
 msgid ""
-"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
-"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
-"$>\\(rq."
+"If no directory is specified then a subdirectory B<DEBIAN> in the current "
+"directory is used."
 msgstr ""
-"\\(lqB<\\e>\\(rq före ett annat tecken undertrycken en speciell betydelse "
-"för det efterföljande tecknet, vilket är kan användas för \\(lqB<\\e>\\(rq "
-"och \\(lqB<$>\\(rq."
+"Om ingen katalog anges kommer en underkatalog vid namn B<DEBIAN> i den "
+"aktuella katalogen att användas."
 
 # type: Plain text
-#: dpkg-query.1:122
+#: dpkg-deb.1:162
 msgid ""
-"Package information can be included by inserting variable references to "
-"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
-"Fields are printed right-aligned unless the width is negative in which case "
-"left alignment will be used. The following I<field>s are recognised:"
+"The target directory (but not its parents) will be created if necessary."
 msgstr ""
-"Paketinformation kan läggas in genom att sätta in variabelreferenser till "
-"paketfält, på syntaxen \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. Fält "
-"skrivs högerjusterade såvida inte bredden är negativ i vilket fall "
-"vänsterjustering kommer att användas. Följande I<fält> stöds:"
+"Målkatalogen (men inte dess föräldrar) kommer att skapas om nödvändigt."
+
+# type: TP
+#: dpkg-deb.1:168 dpkg-query.1:65 dpkg-split.1:133
+#, fuzzy, no-wrap
+msgid "B<--license>, B<--licence>"
+msgstr "B<--licence> | B<--license>"
 
 # type: Plain text
-#: dpkg-query.1:153
-#, no-wrap
-msgid ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+#: dpkg-deb.1:171 dpkg-name.1:65 dpkg-query.1:68 dpkg-split.1:136
+msgid "Show the copyright licensing terms and exit."
 msgstr ""
-"    B<Architecture>\n"
-"    B<Bugs>\n"
-"    B<Conffiles>\n"
-"    B<Config-Version>\n"
-"    B<Conflicts>\n"
-"    B<Depends>\n"
-"    B<Description>\n"
-"    B<Enhances>\n"
-"    B<Essential>\n"
-"    B<Filename>\n"
-"    B<Installed-Size>\n"
-"    B<MD5sum>\n"
-"    B<MSDOS-Filename>\n"
-"    B<Maintainer>\n"
-"    B<Origin>\n"
-"    B<Package>\n"
-"    B<Pre-Depends>\n"
-"    B<Priority>\n"
-"    B<Provides>\n"
-"    B<Recommends>\n"
-"    B<Replaces>\n"
-"    B<Revision>\n"
-"    B<Section>\n"
-"    B<Size>\n"
-"    B<Source>\n"
-"    B<Status>\n"
-"    B<Suggests>\n"
-"    B<Version>\n"
+
+# type: TP
+#: dpkg-deb.1:173
+#, fuzzy, no-wrap
+msgid "B<--showformat=>I<format>"
+msgstr "B<--show-format=>I<format>"
 
 # type: Plain text
-#: dpkg-query.1:161
+#: dpkg-deb.1:178 dpkg-query.1:79
 #, fuzzy
 msgid ""
-"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
-"Actually, all other fields found in the status file (i.e. user defined "
-"fields) can be requested, too. They will be printed as-is, though, no "
-"conversion nor error checking is done on them.  To get the name of the dpkg "
-"maintainer and the installed version, you could run:"
+"This option is used to specify the format of the output B<--show> will "
+"produce. The format is a string that will be output for each package listed."
 msgstr ""
-"Standardformatet är \\(lqB<${Package}\\et${Version}\\en>\\(rq. För att hämta "
-"namnet på paketansvarig och installerad version för dpkg och kan du köra:"
-
-# type: Plain text
-#: dpkg-query.1:165
-#, no-wrap
-msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
-msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
-
-# type: SH
-#: dpkg-query.1:167
-#, no-wrap
-msgid "ENVIRONMENT"
-msgstr "MILJÖVARIABLER"
+"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+"Denna flagga används för att ange formatet på det utdata B<--show> skapar. "
+"Formatet är en sträng som kommer att matas ut för varje paket som listas.\n"
+"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+"Denna flagga används för att ange formatet på utdata som skapas av B<--"
+"show>. Formatet är en sträng som matas ut för varje paket i listan."
 
 # type: Plain text
-#: dpkg-query.1:172
+#: dpkg-deb.1:187
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"The string may reference any status field using the \"${I<field-name>}\" "
+"form, a list of the valid fields can be easily produced using B<-I> on the "
+"same package. A complete explanation of the formatting options (including "
+"escape sequences and field tabbing) can be found in the explanation of the "
+"B<--showformat> option in B<dpkg-query>(1)."
 msgstr ""
-"Denna inställningar påverkar utdata från kommandot B<--list> genom att ändra "
-"bredden på dess utdata."
+"Strängen kan referera till statusfält på formen \"${I<field-name>}\", en "
+"förteckning över giltiga fält kan enkelt skapas genom att använda B<-I> på "
+"samma paket. En fullständig förklaring av formateringsflaggorna (inklusive "
+"ersättningssekvenser och fälttabulering) finns i förklaringen för flaggan "
+"B<--showformat> i B<dpkg-query>(1)."
 
 # type: Plain text
-#: dpkg-query.1:175
-msgid "Copyright 2001 Wichert Akkerman"
-msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
+#: dpkg-deb.1:189
+msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
+msgstr "Förvalet för detta fält är \"${Package}\\et${Version}\\en\"."
 
-# type: UR
-#: dpkg-query.1:175 dpkg-statoverride.8:90
+# type: TP
+#: dpkg-deb.1:189
 #, no-wrap
-msgid "mailto:wakkerma@debian.org"
-msgstr "mailto:wakkerma@debian.org"
+msgid "B<-z>I<compress_level>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-query.1:177 dpkg-statoverride.8:92
-msgid "E<lt>wakkerma@debian.orgE<gt>"
-msgstr "E<lt>wakkerma@debian.orgE<gt>"
-
-# type: TH
-#: dpkg-scanpackages.1:16
-#, no-wrap
-msgid "dpkg-scanpackages"
+#: dpkg-deb.1:193
+msgid ""
+"Specify which compression level to pass to the compressor backend program, "
+"when building a package."
 msgstr ""
 
-# type: TH
-#: dpkg-scanpackages.1:16 dpkg-scansources.1:1
+# type: TP
+#: dpkg-deb.1:193
 #, fuzzy, no-wrap
-msgid "2006-05-10"
-msgstr "2006-04-09"
-
-# type: Plain text
-#: dpkg-scanpackages.1:19
-msgid "dpkg-scanpackages - create Packages files"
-msgstr ""
+msgid "B<-Z>I<compress_type>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:30
+#: dpkg-deb.1:198
 msgid ""
-"B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] I<binarydir> "
-"I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
+"Specify which compression type to use when building a package. Allowed "
+"values are I<gzip>, I<bzip2>, I<lzma>, and I<none> (default is I<gzip>)."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:43
-msgid ""
-"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
-"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
-"user what packages are available for installation. These Packages files are "
-"the same as those found on Debian archive sites and CD-ROMs. You might use "
-"B<dpkg-scanpackages> yourself if making a directory of local packages to "
-"install on a cluster of machines."
-msgstr ""
+# type: TP
+#: dpkg-deb.1:198
+#, no-wrap
+msgid "B<--new>"
+msgstr "B<--new>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:53
+#: dpkg-deb.1:203
 msgid ""
-"B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<gzip>(1)  (generating a "
-"Packages.gz file). apt ignores uncompressed Packages files except on local "
-"access (i.e.  B<file://> sources)."
+"Ensures that B<dpkg-deb> builds a `new' format archive. This is the default."
 msgstr ""
+"Försäkrar att B<dpkg-deb> bygger ett arkiv i \"nytt\" format.  Detta är "
+"förval."
+
+# type: TP
+#: dpkg-deb.1:203
+#, no-wrap
+msgid "B<--old>"
+msgstr "B<--old>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:60
+#: dpkg-deb.1:211
 msgid ""
-"I<binarydir> is the name of the tree of the binary packages to process (for "
-"example, B<contrib/binary-i386>).  It is best to make this relative to the "
-"root of the Debian archive, because every Filename field in the new Packages "
-"file will start with this string."
+"Forces B<dpkg-deb> to build an `old' format archive. This old archive format "
+"is less easily parsed by non-Debian tools and is now obsolete; its only use "
+"is when building packages to be parsed by versions of dpkg older than "
+"0.93.76 (September 1995), which was released as i386 a.out only."
 msgstr ""
+"Tvingar B<dpkg-deb> att bygga ett arkiv i \"gammalt\" format. Det gamla "
+"arkivformatet är mer svårtolkat av icke-Debianverktyg och är nu utgånget; "
+"dess enda användningsområde är för att bygga paket som skall tolkas av "
+"versioner av dpkg äldre än 0.93.76 (september 1995), vilka endast släpptes "
+"som i386-a.out."
 
 # type: Plain text
-#: dpkg-scanpackages.1:64
+#: dpkg-deb.1:217
 msgid ""
-"I<overridefile> is the name of a file to read which contains information "
-"about how the package fits into the distribution; see below."
+"Inhibits B<dpkg-deb --build>'s usual checks on the proposed contents of an "
+"archive. You can build any archive you want, no matter how broken, this way."
 msgstr ""
+"Förhindrar B<dpkg-deb --build s> normala tester på det föreslagna innehållet "
+"i arkivet. Du kan bygga vilket arkiv du än vill, oavsett hur trasigt, på "
+"detta sätt."
+
+# type: TP
+#: dpkg-deb.1:217
+#, fuzzy, no-wrap
+msgid "B<-D>, B<--debug>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:67
-msgid ""
-"I<pathprefix> is an optional string to be prepended to the Filename fields."
-msgstr ""
+#: dpkg-deb.1:220
+msgid "Enables debugging output. This is not very interesting."
+msgstr "Aktiverar felsökningsutdata. Denna är inte speciellt intressant."
 
 # type: Plain text
-#: dpkg-scanpackages.1:71
-msgid "If B<-u> is specified, then scan for *.udeb, instead of *.deb."
-msgstr ""
+#: dpkg-deb.1:226
+msgid ""
+"B<dpkg-deb -I> I<package1>B<.deb> I<package2>B<.deb> does the wrong thing."
+msgstr "B<dpkg-deb -I> I<paket1>B<.deb> I<paket2>B<.deb> gör fel."
 
 # type: Plain text
-#: dpkg-scanpackages.1:74
+#: dpkg-deb.1:230
 msgid ""
-"When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for all "
-"debs, a pattern consisting of *_all.deb and *_arch.deb is used."
+"There is no authentication on B<.deb> files; in fact, there isn't even a "
+"straightforward checksum."
 msgstr ""
+"Det finns ingen autentisering i B<.deb>-filer; det finns faktiskt inte ens "
+"en vanlig kontrollsumma."
 
 # type: Plain text
-#: dpkg-scanpackages.1:80
+#: dpkg-deb.1:237
 msgid ""
-"If more than one version of a package is found only the newest one is "
-"included in the output. If they have the same version and only differ in "
-"architecture only the first one found is used. You can override this "
-"behaviour with the B<-m> switch. If given, all found packages are included "
-"in the output."
+"Do not attempt to use just B<dpkg-deb> to install software! You must use "
+"B<dpkg> proper to ensure that all the files are correctly placed and the "
+"package's scripts run and its status and contents recorded."
 msgstr ""
+"Försök inte använda bara B<dpkg-deb> för att installera programvara! Du "
+"måste använda normala B<dpkg> för att se till att alla filer läggs på "
+"korrekt plats och att paketets skript körs och dess status och innehåll "
+"sparas."
 
-# type: SH
-#: dpkg-scanpackages.1:81
-#, no-wrap
-msgid "THE OVERRIDE FILE"
-msgstr ""
+# type: Plain text
+#: dpkg-deb.1:243
+msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 
 # type: Plain text
-#: dpkg-scanpackages.1:87
+#: dpkg-deb.1:252
+#, fuzzy
 msgid ""
-"While most information about a package can be found in the control file, "
-"some must be filled in by the distribution czars rather than by the "
-"maintainer, because they relate to the arrangement of files for release "
-"rather than the actual dependencies and description of the package.  This "
-"information is found in the override file."
+"B<dpkg-deb> and this manpage were written by Ian Jackson.  They are "
+"Copyright (C) 1995-1996 by him and released under the GNU General Public "
+"Licence version 2 or later; there is NO WARRANTY. See I</usr/share/doc/dpkg/"
+"copyright> and I</usr/share/common-licenses/GPL> for details."
 msgstr ""
+"B<dpkg-deb> och denna manualsida skrevs av Ian Jackson. De är "
+"upphovsrättsskyddade 1995-1996 av honom och släppta under GNU General Public "
+"Licence; det finns INGEN garanti. Se B</usr/share/doc/dpkg/copyright> och B</"
+"usr/share/common-licenses/GPL> för detaljer."
+
+# type: TH
+#: dpkg-divert.8:1
+#, fuzzy, no-wrap
+msgid "dpkg-divert"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-scanpackages.1:91
-msgid ""
-"The override file has a simple whitespace-delimited format. Comments are "
-"allowed (denoted with a B<#>)."
-msgstr ""
+#: dpkg-divert.8:4
+#, fuzzy
+msgid "dpkg-divert - override a package's version of a file"
+msgstr "dpkg-split - Verktyg för att dela/slå ihop Debianpaket"
 
 # type: Plain text
-#: dpkg-scanpackages.1:97
-msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
-msgstr ""
+#: dpkg-divert.8:9
+#, fuzzy
+msgid "B<dpkg-divert> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:102
+#: dpkg-divert.8:13
 msgid ""
-"I<package> is the name of the package. Entries in the override file for "
-"packages not found in the tree of binary packages are ignored."
+"B<dpkg-divert> is the utility used to set up and update the list of "
+"diversions."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scanpackages.1:111
+#: dpkg-divert.8:23
 msgid ""
-"I<priority> and I<section> place the package within the release tree; these "
-"ought not to be found in the control file. If the package is found in a "
-"subdirectory of I<binarydir>, that will be checked against I<section>."
+"File `diversions' are a way of forcing B<dpkg>(1)  not to install a file "
+"into its location, but to a `diverted' location. Diversions can be used "
+"through the Debian package scripts to move a file away when it causes a "
+"conflict. System administrators can also use it to override some package's "
+"configuration file, or whenever some files (which aren't marked as "
+"'conffiles') need to be preserved by dpkg, when installing a newer version "
+"of a package which contains those files."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:25
+#, fuzzy, no-wrap
+msgid "[B<--add>] I<file>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:119
-msgid ""
-"I<maintainerinfo>, if present, can be either the name of a maintainer for an "
-"unconditional override, or else I<oldmaintainer> B<=E<gt>> I<newmaintainer> "
-"to perform a substitution."
+#: dpkg-divert.8:28
+msgid "Add a diversion for I<file>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:28 dpkg-statoverride.8:35
+#, fuzzy, no-wrap
+msgid "B<--remove>I< file>"
+msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+
 # type: Plain text
-#: dpkg-scanpackages.1:124
-msgid ""
-"The override files used to make the official Packages lists may be found in "
-"the I<indices> directory on any Debian mirror."
+#: dpkg-divert.8:31
+msgid "Remove a diversion for I<file>."
 msgstr ""
 
-# type: SH
-#: dpkg-scanpackages.1:125 update-alternatives.8:436
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
+# type: TP
+#: dpkg-divert.8:31
+#, fuzzy, no-wrap
+msgid "B<--list>I< glob-pattern>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-scanpackages.1:131
-msgid ""
-"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
-"warns about packages that are in the wrong subdirectory, are duplicated, "
-"have a Filename field in their control file, are missing from the override "
-"file, or have maintainer substitutions which do not take effect."
+#: dpkg-divert.8:34
+msgid "List diversions matching I<glob-pattern>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scanpackages.1:135
-#, fuzzy
-msgid "B<dpkg>(1), B<dselect>(1), B<dpkg-scansources>(1)."
-msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
+# type: TP
+#: dpkg-divert.8:34
+#, fuzzy, no-wrap
+msgid "B<--truename>I< file>"
+msgstr "B<--new>"
 
-# type: TH
-#: dpkg-scansources.1:1
-#, no-wrap
-msgid "dpkg-scansources"
+# type: Plain text
+#: dpkg-divert.8:37
+msgid "Print the real name for a diverted file."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:39 dpkg-statoverride.8:52 update-alternatives.8:307
+#, fuzzy, no-wrap
+msgid "B<--admindir>I< directory>"
+msgstr "B<--admindir=>I<kat>"
+
 # type: Plain text
-#: dpkg-scansources.1:4
+#: dpkg-divert.8:42
 msgid ""
-"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
+"Set the dpkg data directory to I<directory> (default: I</var/lib/dpkg>)."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:42
+#, fuzzy, no-wrap
+msgid "B<--divert>I< divert-to>"
+msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+
 # type: Plain text
-#: dpkg-scansources.1:13
+#: dpkg-divert.8:46
 msgid ""
-"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
-"prefix>]] B<E<gt>> I<Sources>"
+"I<divert-to> is the location where the versions of I<file>, as provided by "
+"other packages, will be diverted."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:46
+#, fuzzy, no-wrap
+msgid "B<--local>"
+msgstr "B<--old>"
+
 # type: Plain text
-#: dpkg-scansources.1:18
+#: dpkg-divert.8:52
 msgid ""
-"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
-"are used to create a Debian source index, which is output to stdout."
+"Specifies that all packages' versions of this file are diverted.  This "
+"means, that there are no exceptions, and whatever package is installed, the "
+"file is diverted. This can be used by an admin to install a locally modified "
+"version."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:52
+#, fuzzy, no-wrap
+msgid "B<--package>I< package>"
+msgstr "B<Package:> E<lt>paketnamnE<gt>"
+
 # type: Plain text
-#: dpkg-scansources.1:29
+#: dpkg-divert.8:57
 msgid ""
-"The I<override-file>, if given, is used to set priorities in the resulting "
-"index records and to override the maintainer field given in the I<.dsc> "
-"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
-"\\s0 Since the override file is indexed by binary, not source, packages, "
-"there's a bit of a problem here. The current implementation uses the highest "
-"priority of all the binary packages produced by a I<.dsc> file for the "
-"priority of the source package, and the override entry for the first binary "
-"package listed in the I<.dsc> file to modify maintainer information. This "
-"might change."
+"I<package> is the name of a package whose copy of I<file> will not be "
+"diverted. i.e. I<file> will be diverted for all packages except I<package>."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:57 dpkg-statoverride.8:64 install-info.8:190
+#: update-alternatives.8:316
+#, fuzzy, no-wrap
+msgid "B<--quiet>"
+msgstr "B<-q>|B<--quiet>"
+
 # type: Plain text
-#: dpkg-scansources.1:33
-msgid ""
-"The I<path-prefix>, if given, is prepended to the directory field in the "
-"generated source index. You generally use this to make the directory fields "
-"contain the path from the top of the Debian archive hierarchy."
+#: dpkg-divert.8:60
+msgid "Quiet mode, i.e. no verbose output."
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:60
+#, fuzzy, no-wrap
+msgid "B<--rename>"
+msgstr "B<--new>"
+
 # type: Plain text
-#: dpkg-scansources.1:44
+#: dpkg-divert.8:64
 msgid ""
-"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
-"you will probably need to compress the file with B<gzip>(1)  (generating a "
-"Sources.gz file). apt ignores uncompressed Sources files except on local "
-"access (i.e.  B<file://> sources)."
+"Actually move the file aside (or back). dpkg-divert will abort operation in "
+"case the destination file already exists."
 msgstr ""
 
 # type: TP
-#: dpkg-scansources.1:45 install-info.8:272
+#: dpkg-divert.8:64 install-info.8:269 update-alternatives.8:320
 #, fuzzy, no-wrap
-msgid "B<--debug>"
-msgstr "B<--no-debsig>"
+msgid "B<--test>"
+msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: dpkg-scansources.1:47
-msgid "Turn debugging on."
+#: dpkg-divert.8:67
+msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
-# type: Plain text
-#: dpkg-scansources.1:49
-msgid "Show the usage message and die."
+# type: SH
+#: dpkg-divert.8:74
+#, no-wrap
+msgid "NOTES"
 msgstr ""
 
-# type: TP
-#: dpkg-scansources.1:49
-#, fuzzy, no-wrap
-msgid "B<-n>, B<--no-sort>"
-msgstr "B<-o>|B<--oknodo>"
-
 # type: Plain text
-#: dpkg-scansources.1:52
+#: dpkg-divert.8:78
 msgid ""
-"Don't sort the index records. Normally they are sorted by source package "
-"name."
+"When adding, default is B<--local> and B<--divert> I<E<lt>originalE<gt>."
+"distrib>. When removing, B<--package> or B<--local> and B<--divert> must "
+"match if specified."
 msgstr ""
 
-# type: TP
-#: dpkg-scansources.1:52
-#, fuzzy, no-wrap
-msgid "B<-s>, B<--source-override> I<file>"
-msgstr "B<-p>|B<--pidfile> I<pidfil>"
+# type: Plain text
+#: dpkg-divert.8:80
+msgid "Directories can't be diverted with B<dpkg-divert>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:55
+#: dpkg-divert.8:86
 msgid ""
-"Use I<file> as the source override file. The default is the name of the "
-"override file you specified with I<.src> appended."
+"Care should be taken when diverting shared libraries, B<ldconfig>(8)  "
+"creates a symbolic link based on the DT_SONAME field embedded in the "
+"library.  Because ldconfig doesn't honour diverts (only dpkg does), the "
+"symlink may end up pointing at the diverted library, if a diverted library "
+"has the same SONAME as the undiverted one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:61
+#: dpkg-divert.8:91
 msgid ""
-"The source override file is in a different format from the binary override "
-"file. It contains only two whitespace separated fields, the first is the "
-"source package name and the second is the section. Blank lines and comment "
-"lines are ignored in the normal manner. If a package appears in both files "
-"the source override takes precedence for setting the section."
+"To divert all copies of a I</usr/bin/example> to I</usr/bin/example.foo>, i."
+"e. directs all packages providing I</usr/bin/example> to install it as I</"
+"usr/bin/example.foo>, performing the rename if required:"
 msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:63
-#, fuzzy
-msgid "Print the version number and exit."
-msgstr "Skriv ut versionsinformation och avsluta sedan."
+#: dpkg-divert.8:93
+msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:66
-#, fuzzy
-msgid "B<dpkg-scanpackages>(1)."
-msgstr "B<dpkg>(1)."
+#: dpkg-divert.8:95 dpkg-divert.8:105
+msgid "To remove that diversion:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-scansources.1:68
-msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
+#: dpkg-divert.8:97
+msgid "dpkg-divert --rename --remove /usr/bin/example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:2
-#, fuzzy, no-wrap
-msgid "dpkg-source"
-msgstr "dpkg-query"
+#: dpkg-divert.8:101
+msgid ""
+"To divert any package trying to install I</usr/bin/example> to I</usr/bin/"
+"example.foo>, except your own I<wibble> package:"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:7
+#: dpkg-divert.8:103
 msgid ""
-"dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-"buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source package "
-"tools"
+"dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/"
+"example"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:12
-msgid "B<dpkg-source> B<-x >I<filename>B<.dsc> [I<output-directory>]"
+#: dpkg-divert.8:107
+msgid "dpkg-divert --package wibble --rename --remove /usr/bin/example"
 msgstr ""
 
+# type: TP
+#: dpkg-divert.8:109
+#, fuzzy, no-wrap
+msgid "I</var/lib/dpkg/diversions>"
+msgstr "B</var/lib/dpkg/parts>"
+
 # type: Plain text
-#: dpkg-source.1:15
-#, fuzzy
+#: dpkg-divert.8:114
 msgid ""
-"B<dpkg-source -b> [I<options>] I<directory> [I<orig-directory>|I<orig-"
-"targz>|'']"
-msgstr "B<dpkg-deb> B<-b>|B<--build> I<katalog> [I<arkiv>|I<katalog>]"
+"File which contains the current list of diversions of the system. It is "
+"located in the dpkg administration directory, along with other files "
+"important to dpkg, such as `status' or `available'."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:18
-#, fuzzy
-msgid "B<dpkg-gencontrol> [I<options>]"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
-
-# type: TP
-#: dpkg-source.1:21
-#, fuzzy
-msgid "B<dpkg-shlibdeps> I<options>"
-msgstr "B<dpkg-deb-åtgärder>"
+#: dpkg-divert.8:117
+msgid ""
+"Note: B<dpkg-divert> preserves the old copy of this file, with extension \"-"
+"old\", before replacing it with the new one."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:24
-#, fuzzy
-msgid "B<dpkg-genchanges> [I<options>]"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+#: dpkg-divert.8:123
+msgid "Copyright (C) 1995 Ian Jackson."
+msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:27
-#, fuzzy
-msgid "B<dpkg-buildpackage> [I<options>]"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+# type: TH
+#: dpkg-genchanges.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-genchanges"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-source.1:30
-#, fuzzy
-msgid "B<dpkg-distaddfile> [I<options>]I< filename section priority>"
-msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+#: dpkg-genchanges.1:4
+msgid "dpkg-genchanges - generate Debian .changes files"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:33
+#: dpkg-genchanges.1:8
 #, fuzzy
-msgid "B<dpkg-parsechangelog> [I<options>]"
+msgid "B<dpkg-genchanges> [I<options>]"
 msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:36
-#, fuzzy
-msgid "B<dpkg-source> packs and unpacks Debian source archives."
-msgstr ""
-"B<dpkg-deb> packar, packar upp och tillhandahåller information om "
-"Debianarkiv."
-
-# type: Plain text
-#: dpkg-source.1:42
+#: dpkg-genchanges.1:16
 msgid ""
-"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
-"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
-"control); it also adds an entry for the binary package to B<debian/files>."
+"B<dpkg-genchanges> reads information from an unpacked and built Debian "
+"source tree and from the files it has generated and generates a Debian "
+"upload control file (B<.changes> file)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:68
+#: dpkg-genchanges.1:23
 msgid ""
-"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
-"named in its arguments. The dependencies are added to the substitution "
-"variables file B<debian/substvars> as variable names B<shlibs:"
-">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
-"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
-"shlibdeps> will read shared library dependency information from B<debian/"
-"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
-"of the package containing the file which B<objdump> reports as satisfying "
-"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
-"will be used.  The format for a shared library dependency information entry "
-"in these files is (see the Debian Policy Manual for details):"
+"Causes changelog information from all versions strictly later than "
+"I<version> to be used."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:41 dpkg-source.1:137
+#, fuzzy, no-wrap
+msgid "B<-si>, B<-sa>, B<-sd>"
+msgstr "B<--discard>, B<-d>"
+
 # type: Plain text
-#: dpkg-source.1:70
-msgid "E<lt>library nameE<gt> E<lt>version/sonameE<gt> E<lt>dependenciesE<gt>"
+#: dpkg-genchanges.1:49
+msgid ""
+"These options control whether the original source archive is included in the "
+"upload generated by B<dpkg-genchanges> if any source is being generated (i."
+"e., B<-b> or B<-B> haven't been used)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:76
+#: dpkg-genchanges.1:57 dpkg-source.1:153
 msgid ""
-"B<dpkg-genchanges> reads information from an unpacked and built Debian "
-"source tree and from the files it has generated and generates a Debian "
-"upload control file (B<.changes> file)."
+"By default, or if B<-si> is specified, the original source will be included "
+"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
+"part of the version number is B<0> or B<1>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:80
+#: dpkg-genchanges.1:62 dpkg-source.1:158
 msgid ""
-"B<dpkg-buildpackage> is a control script which can be used to help automate "
-"the building of a package."
+"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
+"exclusion and includes only the diff."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:84
-msgid "B<dpkg-distaddfile> adds an entry for a named file to B<debian/files>."
+# type: TP
+#: dpkg-genchanges.1:62 dpkg-gencontrol.1:20 dpkg-source.1:87
+#, no-wrap
+msgid "B<-V>I<name>B<=>I<value>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:89
+#: dpkg-genchanges.1:66 dpkg-source.1:91
 msgid ""
-"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
-"source tree and outputs the information in it to standard output in a "
-"machine-readable form."
+"Set an output substitution variable.  See B<dpkg-substvars>(5) for a "
+"discussion of output substitution."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:66 dpkg-gencontrol.1:24 dpkg-shlibdeps.1:99
+#: dpkg-source.1:91
+#, fuzzy, no-wrap
+msgid "B<-T>I<substvarsfile>"
+msgstr "B<--fsys-tarfile>"
+
 # type: Plain text
-#: dpkg-source.1:93
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 msgid ""
-"None of these commands allow multiple options to be combined into one, and "
-"they do not allow the value for an option to be specified in a separate "
-"argument."
+"Read substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:93 update-alternatives.8:290
+# type: TP
+#: dpkg-genchanges.1:72 dpkg-gencontrol.1:30 dpkg-source.1:97
 #, fuzzy, no-wrap
-msgid "COMMON OPTIONS"
-msgstr ""
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"HANDLINGSFLAGGOR\n"
-"#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
-"ÅTGÄRDSFLAGGOR"
+msgid "B<-D>I<field>B<=>I<value>"
+msgstr "B<-D>I<oktalvärde>B< | --debug=>I<oktalvärde>"
 
 # type: Plain text
-#: dpkg-source.1:96
-msgid ""
-"Many of these programs share options; these are described here, together "
-"with the programs that accept them."
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
+msgid "Override or add an output control file field."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:96
+#: dpkg-genchanges.1:75 dpkg-gencontrol.1:33 dpkg-source.1:100
 #, fuzzy, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-H>|B<--help>"
+msgid "B<-U>I<field>"
+msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: dpkg-source.1:101
-msgid ""
-"Display the particular program's usage message, including a synopsis of the "
-"options it understands.  This option is understood by all the source package "
-"tools."
+#: dpkg-genchanges.1:78 dpkg-gencontrol.1:36 dpkg-source.1:103
+msgid "Remove an output control file field."
 msgstr ""
 
+# type: TP
+#: dpkg-genchanges.1:78
+#, fuzzy, no-wrap
+msgid "B<-b>, B<-B>, B<-S>"
+msgstr "B<-t>|B<--test>"
+
 # type: Plain text
-#: dpkg-source.1:106
+#: dpkg-genchanges.1:101
 msgid ""
-"Display the particular program's version, including copyright and license "
-"information.  This option is understood by all the source package tools."
+"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
+"a binary-only build is taking place.  B<-b> indicates that no source files "
+"are to be built and/or distributed, and B<-B> that no architecture-"
+"independent binary package files are to be distributed either.  B<-S> "
+"specifies that only the source should be uploaded and no binary packages "
+"need to be made. The distinction between B<-b> and B<-B> is only used by "
+"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
+"for whatever files were produced by the B<binary-*> target(s) of the package "
+"being built."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:106
+#: dpkg-genchanges.1:101 dpkg-gencontrol.1:36 dpkg-source.1:68
 #, fuzzy, no-wrap
-msgid "B<-v>I<version>"
-msgstr "B<--version>"
+msgid "B<-c>I<controlfile>"
+msgstr "I<control>"
 
 # type: Plain text
-#: dpkg-source.1:114
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41
 msgid ""
-"In B<dpkg-buildpackage>, B<dpkg-genchanges> and B<dpkg-parsechangelog> this "
-"causes changelog information from all versions strictly later than "
-"I<version> to be used."
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>."
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:119
-msgid ""
-"In B<dpkg-gencontrol> it sets the version number of the binary package which "
-"will be generated."
+# type: TP
+#: dpkg-genchanges.1:106 dpkg-gencontrol.1:41 dpkg-parsechangelog.1:16
+#: dpkg-source.1:75
+#, no-wrap
+msgid "B<-l>I<changelogfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:119
-#, fuzzy, no-wrap
-msgid "B<-C>I<changesdescription>"
-msgstr "B< >E<lt>lång beskrivningE<gt>"
+#: dpkg-genchanges.1:111 dpkg-gencontrol.1:46 dpkg-parsechangelog.1:21
+msgid ""
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:126
+#: dpkg-genchanges.1:115
 msgid ""
-"Read the description of the changes from the file I<changesdescription> "
-"rather than using the information from the source tree's changelog file. "
-"This is understood by B<dpkg-buildpackage> and B<dpkg-genchanges>."
+"Read the list of files to be uploaded here, rather than using B<debian/"
+"files>."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:126
+#: dpkg-genchanges.1:115 dpkg-gencontrol.1:50 dpkg-parsechangelog.1:21
+#: dpkg-source.1:82
 #, no-wrap
-msgid "B<-m>I<maintaineraddress>"
+msgid "B<-F>I<changelogformat>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:134
+#: dpkg-genchanges.1:120 dpkg-gencontrol.1:55 dpkg-parsechangelog.1:26
+#: dpkg-source.1:87
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this package, rather than using the information from the source tree's "
-"control file.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Specifies the format of the changelog. By default the format is read from a "
+"special line near the bottom of the changelog or failing that defaults to "
+"the debian standard format."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:134
+#: dpkg-genchanges.1:120
 #, no-wrap
-msgid "B<-e>I<maintaineraddress>"
+msgid "B<-u>I<uploadfilesdir>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:131
 msgid ""
-"Use I<maintaineraddress> as the name and email address of the maintainer for "
-"this upload, rather than using the information from the source tree's "
-"changelog.  This is understood by B<dpkg-buildpackage> and B<dpkg-"
-"genchanges>."
+"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
+"(B<dpkg-genchanges> needs to find these files so that it can include their "
+"sizes and checksums in the B<.changes> file)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:142
+#: dpkg-genchanges.1:131
 #, fuzzy, no-wrap
-msgid "B<-si>, B<-sa>, B<-sd>"
-msgstr "B<--discard>, B<-d>"
+msgid "B<-q>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-source.1:150
+#: dpkg-genchanges.1:139
 msgid ""
-"These options control whether the original source archive is included in the "
-"upload generated by B<dpkg-buildpackage> or B<dpkg-genchanges> if any source "
-"is being generated (i.e., B<-b> or B<-B> haven't been used)."
+"Usually B<dpkg-genchanges> will produce informative messages on standard "
+"error, for example about how many of the package's source files are being "
+"uploaded.  B<-q> suppresses these messages."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:158
+#: dpkg-genchanges.1:155
 msgid ""
-"By default, or if B<-si> is specified, the original source will be included "
-"if the version number ends in B<-0> or B<-1>, i.e. if the Debian revision "
-"part of the version number is B<0> or B<1>."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:1
+#, fuzzy, no-wrap
+msgid "dpkg-gencontrol"
+msgstr "deb-control"
+
+# type: Plain text
+#: dpkg-gencontrol.1:4
+msgid "dpkg-gencontrol - generate Debian control files"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:163
+#: dpkg-gencontrol.1:8
+#, fuzzy
+msgid "B<dpkg-gencontrol> [I<options>]"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
+
+# type: Plain text
+#: dpkg-gencontrol.1:15
 msgid ""
-"B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-"exclusion and includes only the diff."
+"B<dpkg-gencontrol> reads information from an unpacked Debian source tree and "
+"generates a binary package control file (which defaults to debian/tmp/DEBIAN/"
+"control); it also adds an entry for the binary package to B<debian/files>."
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:20
+msgid "Sets the version number of the binary package which will be generated."
+msgstr ""
+
+# type: Plain text
+#: dpkg-gencontrol.1:24
+msgid ""
+"Set an output substitution variable. See B<dpkg-substvars>(5) for discussion "
+"of output substitution."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:163
-#, no-wrap
-msgid "B<-V>I<name>B<=>I<value>"
+#: dpkg-gencontrol.1:55
+#, fuzzy, no-wrap
+msgid "B<-p>I<package>"
+msgstr "B<uppackat>"
+
+# type: Plain text
+#: dpkg-gencontrol.1:62
+msgid ""
+"Generate information for the binary package I<package>.  If the source "
+"control file lists only one binary package then this option may be omitted; "
+"otherwise it is essential to select which binary package's information to "
+"generate."
 msgstr ""
 
+# type: TP
+#: dpkg-gencontrol.1:62
+#, fuzzy, no-wrap
+msgid "B<-n>I<filename>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-source.1:169
+#: dpkg-gencontrol.1:67
 msgid ""
-"Set an output substitution variable.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>.  See below for a "
-"discussion of output substitution."
+"Assume the filename of the package will be I<filename> instead of the normal "
+"package_version_arch.deb filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:169
+#: dpkg-gencontrol.1:67
 #, fuzzy, no-wrap
-msgid "B<-T>I<substvarsfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "B<-is>, B<-ip>, B<-isp>"
+msgstr "B<--split>, B<-s>"
 
 # type: Plain text
-#: dpkg-source.1:179
+#: dpkg-gencontrol.1:76
 msgid ""
-"Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-"I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-"understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-"B<dpkg-genchanges>."
+"These options are ignored for compatibility with older versions of dpkg-dev "
+"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
+"include the Section and Priority fields in the control file. This is now the "
+"default behaviour. If you want to get the old behaviour you can use the B<-"
+"U> option to delete the fields from the control file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:179
-#, fuzzy, no-wrap
-msgid "B<-D>I<field>B<=>I<value>"
-msgstr "B<-D>I<oktalvärde>B< | --debug=>I<oktalvärde>"
+#: dpkg-gencontrol.1:76
+#, no-wrap
+msgid "B<-P>I<packagebuilddir>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:184
+#: dpkg-gencontrol.1:89
 msgid ""
-"Override or add an output control file field.  This option is understood by "
-"B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
+"instead of B<debian/tmp>.  This value is used to find the default value of "
+"the B<Installed-Size> substitution variable and control file field (using "
+"B<du>), and for the default location of the output file."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:184
+#: dpkg-gencontrol.1:89 dpkg-shlibdeps.1:80
 #, fuzzy, no-wrap
-msgid "B<-U>I<field>"
-msgstr "B<--log=>I<filename>"
+msgid "B<-O>"
+msgstr "B<-G>"
 
 # type: Plain text
-#: dpkg-source.1:189
+#: dpkg-gencontrol.1:98
 msgid ""
-"Remove an output control file field.  This option is understood by B<dpkg-"
-"source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
+"Print the control file to standard output, rather than to B<debian/tmp/"
+"DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:189
+# type: Plain text
+#: dpkg-gencontrol.1:106
 #, fuzzy, no-wrap
-msgid "B<-b>|B<-B>|B<-S>"
-msgstr "B<-t>|B<--test>"
+msgid "B<debian/control>"
+msgstr "deb-control"
 
 # type: Plain text
-#: dpkg-source.1:212
+#: dpkg-gencontrol.1:111
 msgid ""
-"For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify that "
-"a binary-only build is taking place.  B<-b> indicates that no source files "
-"are to be built and/or distributed, and B<-B> that no architecture-"
-"independent binary package files are to be distributed either.  B<-S> "
-"specifies that only the source should be uploaded and no binary packages "
-"need to be made. The distinction between B<-b> and B<-B> is only used by "
-"B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-"for whatever files were produced by the B<binary-*> target(s) of the package "
-"being built."
+"The main source control information file, giving version-independent "
+"information about the source package and the binary packages it can produce."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:217
+#: dpkg-gencontrol.1:118
 msgid ""
-"B<-b> tells B<dpkg-source> to build a source package (rather than to extract "
-"one) - see below."
+"The list of generated files which are part of the upload being prepared.  "
+"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
+"control files it generates here;"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:217
+# type: TH
+#: dpkg-name.1:6
 #, fuzzy, no-wrap
-msgid "B<-c>I<controlfile>"
-msgstr "I<control>"
+msgid "dpkg-name"
+msgstr "dpkg-deb"
 
 # type: Plain text
-#: dpkg-source.1:224
-msgid ""
-"Specifies the main source control file to read information from. The default "
-"is B<debian/control>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+#: dpkg-name.1:9
+msgid "dpkg-name - rename Debian packages to full package names"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:224
-#, no-wrap
-msgid "B<-l>I<changelogfile>"
-msgstr ""
+# type: Plain text
+#: dpkg-name.1:15
+#, fuzzy
+msgid "B<dpkg-name> [I<options>] [B<-->] I<files>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:231
+#: dpkg-name.1:27
 msgid ""
-"Specifies the change log file to read information from. The default is "
-"B<debian/changelog>.  This option is understood by B<dpkg-source>, B<dpkg-"
-"gencontrol> and B<dpkg-genchanges>."
+"This manual page documents the B<dpkg-name> program which provides an easy "
+"way to rename B<Debian> packages into their full package names. A full "
+"package name consists of "
+"I<E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb> as "
+"specified in the control file of the package. The I<E<lt>versionE<gt>> part "
+"of the filename consists of the upstream version information optionally "
+"followed by a hyphen and the revision information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:231
+#: dpkg-name.1:29
 #, fuzzy, no-wrap
-msgid "B<-f>I<fileslistfile>"
-msgstr "B<--fsys-tarfile>"
+msgid "B<-a>, B<--no-architecture>"
+msgstr "B<dpkg --print-architecture>"
 
 # type: Plain text
-#: dpkg-source.1:237
-msgid ""
-"Read or write the list of files to be uploaded here, rather than using "
-"B<debian/files>.  This option is understood by B<dpkg-gencontrol>, B<dpkg-"
-"genchanges> and B<dpkg-distaddfile>."
+#: dpkg-name.1:32
+msgid "The destination filename will not have the architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:237
-#, no-wrap
-msgid "B<-F>I<changelogformat>"
-msgstr ""
+#: dpkg-name.1:32
+#, fuzzy, no-wrap
+msgid "B<-k>, B<--symlink>"
+msgstr "B<dpkg --version>"
 
 # type: Plain text
-#: dpkg-source.1:244
-msgid ""
-"Specifies the format of the changelog. By default the format is read from a "
-"special line near the bottom of the changelog or failing that defaults to "
-"the debian standard format.  This option is understood by B<dpkg-source>, "
-"B<dpkg-gencontrol> and B<dpkg-genchanges>."
+#: dpkg-name.1:35
+msgid "Create a symlink, instead of moving."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:244
+#: dpkg-name.1:35
 #, fuzzy, no-wrap
-msgid "B<-W>"
-msgstr "B<-G>"
+msgid "B<-o>, B<--overwrite>"
+msgstr "B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:251
+#: dpkg-name.1:39
 msgid ""
-"This option turns certain errors into warnings. Only dpkg-source uses this, "
-"but B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
+"Existing files will be overwritten if they have the same name as the "
+"destination filename."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:251
+#: dpkg-name.1:39
 #, fuzzy, no-wrap
-msgid "B<-E>"
-msgstr "B<-G>"
+msgid "B<-s>, B<--subdir> [I<dir>]"
+msgstr "B<--admindir=>I<kat>"
 
 # type: Plain text
-#: dpkg-source.1:257
+#: dpkg-name.1:51
 msgid ""
-"This option negates a previously set B<-W>.  It is currently only understood "
-"by B<dpkg-buildpackage> and B<dpkg-source>."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:257
+# type: TP
+#: dpkg-name.1:51
 #, fuzzy, no-wrap
-msgid "dpkg-SOURCE OPTIONS"
-msgstr "ANDRA FLAGGOR"
+msgid "B<-c>, B<--create-dir>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:262
+#: dpkg-name.1:56
 msgid ""
-"When the common options B<-c> and B<-l> are given with relative pathnames "
-"these are interpreted starting at the source tree's top level directory."
+"This option can used together with the -s option. If a target directory "
+"isn't found it will be created automatically.  B<Use this option with care.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:262
+#: dpkg-name.1:59
 #, fuzzy, no-wrap
-msgid "B<-x>"
-msgstr "B<-G>"
+msgid "B<-v>, B<--version>"
+msgstr "B<--version>"
 
-# type: Plain text
-#: dpkg-source.1:272
-msgid ""
-"Extract a source package. One non-option argument must be supplied, the name "
-"of the Debian source control file (B<.dsc>).  An optional second non-option "
-"argument may be supplied to specify the directory to extract the source "
-"package to, this must not exist. If no output directory is specified, the "
-"source package is extracted into a directory named I<source>-I<version-> "
-"under the current working directory."
+# type: TP
+#: dpkg-name.1:62
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--license>"
+msgstr "B<--licence>"
+
+# type: TP
+#: dpkg-name.1:67
+#, no-wrap
+msgid "B<dpkg-name bar-foo.deb>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:280
+#: dpkg-name.1:72
 msgid ""
-"No options are useful with B<dpkg-source -x>.  B<dpkg-source> will read the "
-"names of the other file(s) making up the source package from the control "
-"file; they are assumed to be in the same directory as the B<.dsc>."
+"The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
+"something similar (depending on whatever information is in the control part "
+"of `bar-foo.deb')."
+msgstr ""
+
+# type: TP
+#: dpkg-name.1:72
+#, no-wrap
+msgid "B<find /root/debian/ -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:288
+#: dpkg-name.1:77
 msgid ""
-"The files in the extracted package will have their permissions and "
-"ownerships set to those which would have been expected if the files and "
-"directories had simply been created - directories and executable files will "
-"be 0777 and plain files will be 0666, both modified by the extractors' "
-"umask; if the parent directory is setgid then the extracted directories will "
-"be too, and all the files and directories will inherit its group ownership."
+"All files with the extension `deb' in the directory /root/debian and its "
+"subdirectory's will be renamed by dpkg-name if required into names with no "
+"architecture information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:288
-#, fuzzy, no-wrap
-msgid "B<-b>"
-msgstr "B<-G>"
+#: dpkg-name.1:77
+#, no-wrap
+msgid "B<find -name \\(aq*.deb\\(aq | xargs -n 1 dpkg-name -a -o -s -c>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:303
+#: dpkg-name.1:83
 msgid ""
-"Build: pack up a source tree. One or two non-option arguments should be "
-"supplied. The first is taken as the name of the directory containing the "
-"unpacked source tree. If a second argument is supplied it should be the name "
-"of the original source directory or tarfile or the empty string if the "
-"package is a Debian-specific one and so has no Debianisation diffs. If no "
-"second argument is supplied then B<dpkg-source> will look for the original "
-"source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-"original source directory I<directory>B<.orig> or the empty string (no "
-"original source, and so no diff) depending on the arguments."
+"B<Don't do this.> Your archive will be messed up completely because a lot of "
+"packages don't come with section information.  B<Don't do this.>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:303 dpkg-source.1:642
+#: dpkg-name.1:83
 #, no-wrap
-msgid "B<-i[E<lt>regexpE<gt>]>"
+msgid "B<dpkg --build debian-tmp && dpkg-name -o -s .. debian-tmp.deb>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:311
+#: dpkg-name.1:86
+#, fuzzy
+msgid "This can be used when building new packages."
+msgstr "Den sista raden på skärmen när paket väljs."
+
+# type: Plain text
+#: dpkg-name.1:96
 msgid ""
-"You may specify a perl regular expression to match files you want filtered "
-"out of the list of files for the diff. (This list is generated by a find "
-"command.) B<-i> by itself enables the option, with a default that will "
-"filter out control files and directories of the most common revision control "
-"systems, backup and swap files and Libtool build output directories."
+"Some packages don't follow the name structure "
+"E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
+"renamed by dpkg-name will follow this structure. Generally this will have no "
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:323
+#: dpkg-name.1:104
+#, fuzzy
 msgid ""
-"This is very helpful in cutting out extraneous files that get included in "
-"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-"instance, if you maintain a package that you track via remote CVS, where you "
-"don't have access permissions for committing the debian control files and "
-"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
-"checkout/update into a directory you keep pristine, to generate the .orig."
-"tar.gz from. That directory will have CVS/Entries files in it that will "
-"contain timestamps that differ from the ones in your working directory, thus "
-"causing them to be unnecessarily included in every .diff.gz, unless you use "
-"the B<-i> switch."
+"B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
+"B<xargs>(1)."
+msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
+
+# type: Plain text
+#: dpkg-name.1:111
+#, fuzzy
+msgid ""
+"Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
+"the GNU General Public Licence version 2 or later for copying conditions. "
+"There is B<no> warranty."
 msgstr ""
+"Detta är fri programvara; se GNU General Public License version 2 eller "
+"senare för kopieringsvillkor. Det finns INGEN garanti."
 
-# type: TP
-#: dpkg-source.1:323 dpkg-source.1:646
+# type: Plain text
+#: dpkg-parsechangelog.1:1
 #, fuzzy, no-wrap
-msgid "B<-IE<lt>filenameE<gt>>"
-msgstr "B<--log=>I<filename>"
+msgid "dpkg-parsechangelog"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:330
-msgid ""
-"If this option is specified, the filename will be passed to tar's --exclude "
-"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
-"example, -ICVS will make tar skip over CVS directories when generating a ."
-"tar.gz file. The option may be repeated multiple times to list multiple "
-"filenames to exclude."
+#: dpkg-parsechangelog.1:4
+msgid "dpkg-parsechangelog - parse Debian changelog files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:330
-#, no-wrap
-msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-msgstr ""
+# type: Plain text
+#: dpkg-parsechangelog.1:8
+#, fuzzy
+msgid "B<dpkg-parsechangelog> [I<options>]"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:345
+#: dpkg-parsechangelog.1:14
 msgid ""
-"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
-"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
-"It will leave this original source in place as a tarfile, or copy it to the "
-"current directory if it isn't already there If B<-sp> is used rather than B<-"
-"sk> it will remove it again afterwards."
+"B<dpkg-parsechangelog> reads and parses the changelog of an unpacked Debian "
+"source tree and outputs the information in it to standard output in a "
+"machine-readable form."
 msgstr ""
 
+# type: TP
+#: dpkg-parsechangelog.1:26
+#, fuzzy, no-wrap
+msgid "B<-L>I<libdir>"
+msgstr "B<--log=>I<filename>"
+
 # type: Plain text
-#: dpkg-source.1:357
-msgid ""
-"If B<-su> or B<-sr> is specified the original source is expected as a "
-"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
-"source> will create a new original source archive from it. If B<-sr> is used "
-"B<dpkg-source will remove that directory after it has been used.>"
+#: dpkg-parsechangelog.1:29
+msgid "FIXME not used in the source!?"
 msgstr ""
 
-# type: Plain text
-#: dpkg-source.1:368
-msgid ""
-"If B<-ss> is specified B<dpkg-source> will expect that the original source "
-"is available both as a directory and as a tarfile. If will use the directory "
-"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
-"be used with care - if the directory and tarfile do not match a bad source "
-"archive will be generated."
+# type: TP
+#: dpkg-parsechangelog.1:41
+#, no-wrap
+msgid "B<debian/changelog>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:377
+#: dpkg-parsechangelog.1:47
 msgid ""
-"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
-"and will not generate a diff.  The second argument, if supplied, must be the "
-"empty string. This is used for Debian-specific packages which do not have a "
-"separate upstream source and therefore have no debianisation diffs."
+"The changelog file, used to obtain version-dependent information about the "
+"source package, such as the urgency and distribution of an upload, the "
+"changes made since a particular release, and the source version number "
+"itself."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:406
-msgid ""
-"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
-"source archive as a tarfile or as a directory - the second argument, if any, "
-"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
-"a tarfile is found it will unpack it to create the diff and remove it "
-"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
-"pack it to create the original source and remove it afterwards (this is "
-"equivalent to B<-sr>); if neither is found it will assume that the package "
-"has no debianisation diffs, only a straightforward source archive (this is "
-"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
-"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
-"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
-msgstr ""
+#: dpkg-query.1:1
+#, no-wrap
+msgid "dpkg-query"
+msgstr "dpkg-query"
+
+# type: Plain text
+#: dpkg-query.1:4
+msgid "dpkg-query - a tool to query the dpkg database"
+msgstr "dpkg-query - ett verktyg för att fråga dpkg-databasen"
+
+# type: Plain text
+#: dpkg-query.1:8
+#, fuzzy
+msgid "B<dpkg-query> [I<option>...] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:412
+#: dpkg-query.1:12
 msgid ""
-"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
-"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
-"sU> and B<-sR> should be used instead."
+"B<dpkg-query> is a tool to show information about packages listed in the "
+"B<dpkg> database."
 msgstr ""
+"B<dpkg-query> är ett verktyg för att visa information om paket i B<dpkg>-"
+"databasen."
 
 # type: TP
-#: dpkg-source.1:412
-#, no-wrap
-msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-msgstr ""
+#: dpkg-query.1:14
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--list> I<package-name-pattern> ..."
+msgstr "B<-l> | B<--list> I<paketnamnsmönster> ..."
 
 # type: Plain text
-#: dpkg-source.1:415
-msgid "In all cases any existing original source tree will be removed."
+#: dpkg-query.1:23
+msgid ""
+"List packages matching given pattern. If no I<package-name-pattern> is "
+"given, list all packages in I</var/lib/dpkg/status>, excluding the ones "
+"marked with state purge. Normal shell wildchars are allowed in I<package-"
+"name-pattern>. Please note you will probably have to quote I<package-name-"
+"pattern> to prevent the shell from performing filename expansion. For "
+"example this will list all package names starting with ``libc6'':"
 msgstr ""
+"Lista paket som matchar det givna mönstret. Om inget I<paketnamnsmönster> "
+"anges listas alla paket i I</var/lib/dpkg/status>. Skalets normala "
+"jokertecken tillåts i I<paketnamnsmönster>. Observera att du sannolikt måste "
+"skriva I<paketnamnsmönster> inom citationstecken för att förhindra att "
+"skalet expanderar filnamnet. Till exempel kommer följande lista alla paket "
+"vars namn börjar på \"libc6\":"
 
 # type: Plain text
-#: dpkg-source.1:422
-msgid ""
-"If B<-sp> is used when extracting then the original source (if any) will be "
-"left as a tarfile. If it is not already located in the current directory or "
-"if an existing but different file is there it will be copied there.  This is "
-"the default."
-msgstr ""
+#: dpkg-query.1:27
+#, no-wrap
+msgid "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
+msgstr "  B<dpkg-query -l \\(aqlibc6*\\(aq>\n"
 
 # type: Plain text
-#: dpkg-source.1:425
-msgid "B<-su> unpacks the original source tree."
+#: dpkg-query.1:33
+msgid ""
+"The output format of this option is not configurable, but varies "
+"automatically to fit the terminal width. It is intended for human readers, "
+"and is not easily machine-readable. See B<-W> (B<--show>)  and B<--"
+"showformat> for a way to configure the output format."
 msgstr ""
+"Utdataformatet för detta alternativ kan inte justeras, men varieras "
+"automatiskt för att passa terminalbredden. Det är avsett för mänskliga "
+"läsare, och är inte enkelt maskinläsbart. Se B<-W> (B<--show>) och B<--"
+"showformat> för hur du konfigurerar utdataformatet."
+
+# type: TP
+#: dpkg-query.1:33
+#, fuzzy, no-wrap
+msgid "B<-W>, B<--show> I<package-name-pattern> ..."
+msgstr "B<-W> | B<--show> I<paketnamnsmönster> ..."
 
 # type: Plain text
-#: dpkg-source.1:430
+#: dpkg-query.1:40
 msgid ""
-"B<-sn> ensures that the original source is neither copied to the current "
-"directory nor unpacked. Any original source tree that was in the current "
-"directory is still removed."
+"Just like the B<--list> option this will list all packages matching the "
+"given pattern. However the output can be customized using the B<--"
+"showformat> option.  The default output format gives one line per matching "
+"package, each line having the name and installed version of the package, "
+"separated by a tab."
 msgstr ""
+"Precis som flaggan B<--list> kommer detta att visa alla paket som matchar "
+"det givna mönstret. Utdatat kan dock skräddarsys med flaggan B<--"
+"showformat>. Standardutdataformatet är en rad per paket som träffas, där "
+"varje rad innehåller namn och installerad version av paketet, avdelat med "
+"ett tabulatortecken."
+
+# type: TP
+#: dpkg-query.1:40
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--status> I<package-name> ..."
+msgstr "B<-s> | B<--status> I<paketnamn> ..."
 
 # type: Plain text
-#: dpkg-source.1:435
+#: dpkg-query.1:44
 msgid ""
-"All the B<-sX> options are mutually exclusive. If you specify more than one "
-"only the last one will be used."
+"Report status of specified package. This just displays the entry in the "
+"installed package status database."
 msgstr ""
+"Rapportera status om det angivna paketet.  Detta alternativ visar helt "
+"enkelt posten i statusdatabasen för installerade paket."
 
-# type: SH
-#: dpkg-source.1:435
+# type: TP
+#: dpkg-query.1:44
 #, fuzzy, no-wrap
-msgid "dpkg-GENCONTROL OPTIONS"
-msgstr "ANDRA FLAGGOR"
+msgid "B<-L>, B<--listfiles> I<package-name> ..."
+msgstr "B<-L> | B<--listfiles> I<paketnamn> ..."
 
 # type: Plain text
-#: dpkg-source.1:438
-#, fuzzy
-msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-msgstr "B<822-date> tar inga flaggor eller parametrar."
+#: dpkg-query.1:49
+msgid ""
+"List files installed to your system from B<package-name>.  However, note "
+"that files created by package-specific installation-scripts are not listed."
+msgstr ""
+"Listar filer som installerats på ditt system från B<paketnamn>. Observera "
+"dock att filer som skapats av paketspecifika installationsskript inte listas."
 
 # type: TP
-#: dpkg-source.1:438
+#: dpkg-query.1:49
 #, fuzzy, no-wrap
-msgid "B<-p>I<package>"
-msgstr "B<uppackat>"
+msgid "B<-S>, B<--search> I<filename-search-pattern> ..."
+msgstr "B<-S> | B<--search> I<filnamnssökmönster> ..."
 
 # type: Plain text
-#: dpkg-source.1:445
+#: dpkg-query.1:55
 msgid ""
-"Generate information for the binary package I<package>.  If the source "
-"control file lists only one binary package then this option may be omitted; "
-"otherwise it is essential to select which binary package's information to "
-"generate."
+"Search for a filename from installed packages. All standard shell wildchars "
+"can be used in the pattern. This command will not list extra files created "
+"by maintainer scripts, nor will it list alternatives."
 msgstr ""
+"Sök efter filnamnet bland de installerade paketen. Alla skalets vanliga "
+"jokertecken kan användas i mönstret. Kommandot kommer inte att visa "
+"extrafiler som skapas av paketskript, ej heller kommer det att visa "
+"alternativ."
 
 # type: TP
-#: dpkg-source.1:445
+#: dpkg-query.1:55
 #, fuzzy, no-wrap
-msgid "B<-n>I<filename>"
-msgstr "B<--log=>I<filename>"
+msgid "B<-p>, B<--print-avail> I<package-name>"
+msgstr "B<-p> |B<--print-avail> I<paketnamn>"
 
 # type: Plain text
-#: dpkg-source.1:450
+#: dpkg-query.1:59
 msgid ""
-"Assume the filename of the package will be I<filename> instead of the normal "
-"package_version_arch.deb filename."
-msgstr ""
+"Display details about I<package-name>, as found in I</var/lib/dpkg/"
+"available>."
+msgstr "Visar detaljer om I<paketnamn> från I</var/lib/dpkg/available>."
 
 # type: TP
-#: dpkg-source.1:450
+#: dpkg-query.1:74
 #, fuzzy, no-wrap
-msgid "B<-is>, B<-ip>, B<-isp>"
-msgstr "B<--split>, B<-s>"
+msgid "B<-f>, B<--showformat=>I<format>"
+msgstr "B<-f> | B<--showformat=>I<format>"
+
+# type: Plain text
+#: dpkg-query.1:81
+msgid "In the format string, \\(lqB<\\e>\\(rq introduces escapes:"
+msgstr "I formatsträgnen inleds följande styrsekvenser med \\(lqB<\\e>\\(rq:"
 
 # type: Plain text
-#: dpkg-source.1:459
+#: dpkg-query.1:87
+#, no-wrap
 msgid ""
-"These options are ignored for compatibility with older versions of dpkg-dev "
-"but are now deprecated. Previously they were used to tell dpkg-gencontrol to "
-"include the Section and Priority fields in the control file. This is now the "
-"default behaviour. If you want to get the old behaviour you can use the B<-"
-"U> option to delete the fields from the control file."
+"    B<\\en>  newline\n"
+"    B<\\er>  carriage return\n"
+"    B<\\et>  tab\n"
 msgstr ""
+"    B<\\en>  radmatning\n"
+"    B<\\er>  vagnreteur\n"
+"    B<\\et>  tabulator\n"
 
-# type: TP
-#: dpkg-source.1:459
+# type: Plain text
+#: dpkg-query.1:92
+msgid ""
+"\\(lqB<\\e>\\(rq before any other character suppresses any special meaning "
+"of the following character, which is useful for \\(lqB<\\e>\\(rq and \\(lqB<"
+"$>\\(rq."
+msgstr ""
+"\\(lqB<\\e>\\(rq före ett annat tecken undertrycken en speciell betydelse "
+"för det efterföljande tecknet, vilket är kan användas för \\(lqB<\\e>\\(rq "
+"och \\(lqB<$>\\(rq."
+
+# type: Plain text
+#: dpkg-query.1:98
+msgid ""
+"Package information can be included by inserting variable references to "
+"package fields using the syntax \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. "
+"Fields are printed right-aligned unless the width is negative in which case "
+"left alignment will be used. The following I<field>s are recognised:"
+msgstr ""
+"Paketinformation kan läggas in genom att sätta in variabelreferenser till "
+"paketfält, på syntaxen \\(lqB<${>I<field>[B<;>I<width>]B<}>\\(rq. Fält "
+"skrivs högerjusterade såvida inte bredden är negativ i vilket fall "
+"vänsterjustering kommer att användas. Följande I<fält> stöds:"
+
+# type: Plain text
+#: dpkg-query.1:129
 #, no-wrap
-msgid "B<-P>I<packagebuilddir>"
+msgid ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 msgstr ""
+"    B<Architecture>\n"
+"    B<Bugs>\n"
+"    B<Conffiles>\n"
+"    B<Config-Version>\n"
+"    B<Conflicts>\n"
+"    B<Depends>\n"
+"    B<Description>\n"
+"    B<Enhances>\n"
+"    B<Essential>\n"
+"    B<Filename>\n"
+"    B<Installed-Size>\n"
+"    B<MD5sum>\n"
+"    B<MSDOS-Filename>\n"
+"    B<Maintainer>\n"
+"    B<Origin>\n"
+"    B<Package>\n"
+"    B<Pre-Depends>\n"
+"    B<Priority>\n"
+"    B<Provides>\n"
+"    B<Recommends>\n"
+"    B<Replaces>\n"
+"    B<Revision>\n"
+"    B<Section>\n"
+"    B<Size>\n"
+"    B<Source>\n"
+"    B<Status>\n"
+"    B<Suggests>\n"
+"    B<Version>\n"
 
 # type: Plain text
-#: dpkg-source.1:472
+#: dpkg-query.1:137
+#, fuzzy
 msgid ""
-"Tells B<dpkg-source> that the package is being built in I<packagebuilddir> "
-"instead of B<debian/tmp>.  This value is used to find the default value of "
-"the B<Installed-Size> substitution variable and control file field (using "
-"B<du>), and for the default location of the output file."
+"The default format string is \\(lqB<${Package}\\et${Version}\\en>\\(rq.  "
+"Actually, all other fields found in the status file (i.e. user defined "
+"fields) can be requested, too. They will be printed as-is, though, no "
+"conversion nor error checking is done on them.  To get the name of the dpkg "
+"maintainer and the installed version, you could run:"
 msgstr ""
+"Standardformatet är \\(lqB<${Package}\\et${Version}\\en>\\(rq. För att hämta "
+"namnet på paketansvarig och installerad version för dpkg och kan du köra:"
 
-# type: TP
-#: dpkg-source.1:472 dpkg-source.1:534
-#, fuzzy, no-wrap
-msgid "B<-O>"
-msgstr "B<-G>"
+# type: Plain text
+#: dpkg-query.1:141
+#, no-wrap
+msgid "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+msgstr "  B<dpkg-query -W -f='${Package} ${Version}\\et${Maintainer}\\en' dpkg>\n"
+
+# type: SH
+#: dpkg-query.1:143
+#, no-wrap
+msgid "ENVIRONMENT"
+msgstr "MILJÖVARIABLER"
 
 # type: Plain text
-#: dpkg-source.1:482
+#: dpkg-query.1:148
 msgid ""
-"Causes the control file to be printed to standard output, rather than to "
-"B<debian/tmp/DEBIAN/control> (or I<packagebuilddir>B</DEBIAN/control> if B<-"
-"P> was used)."
+"This setting influences the output of the B<--list> option by changing the "
+"width of its output."
 msgstr ""
+"Denna inställningar påverkar utdata från kommandot B<--list> genom att ändra "
+"bredden på dess utdata."
+
+# type: Plain text
+#: dpkg-query.1:151
+msgid "Copyright 2001 Wichert Akkerman"
+msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
+
+# type: UR
+#: dpkg-query.1:151 dpkg-statoverride.8:83
+#, no-wrap
+msgid "mailto:wakkerma@debian.org"
+msgstr "mailto:wakkerma@debian.org"
+
+# type: Plain text
+#: dpkg-query.1:153 dpkg-statoverride.8:85
+msgid "E<lt>wakkerma@debian.orgE<gt>"
+msgstr "E<lt>wakkerma@debian.orgE<gt>"
 
-# type: SH
-#: dpkg-source.1:482
+# type: TH
+#: dpkg-scanpackages.1:16
 #, no-wrap
-msgid "dpkg-SHLIBDEPS OPTIONS"
+msgid "dpkg-scanpackages"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:487
-msgid ""
-"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
-"as if they'd been supplied as B<-e>I<executable>."
+#: dpkg-scanpackages.1:19
+msgid "dpkg-scanpackages - create Packages files"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:487
-#, fuzzy, no-wrap
-msgid "B<-e>I<executable>"
-msgstr "B<-x>|B<--exec> I<programfil>"
-
 # type: Plain text
-#: dpkg-source.1:491
+#: dpkg-scanpackages.1:28
 msgid ""
-"Include dependencies appropriate for the shared libraries required by "
-"I<executable>."
+"B<dpkg-scanpackages> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:491
-#, no-wrap
-msgid "B<-d>I<dependencyfield>"
+# type: Plain text
+#: dpkg-scanpackages.1:41
+msgid ""
+"B<dpkg-scanpackages> sorts through a tree of Debian binary packages and "
+"creates a Packages file, used by B<apt>(8), B<dselect>(1), etc, to tell the "
+"user what packages are available for installation. These Packages files are "
+"the same as those found on Debian archive sites and CD-ROMs. You might use "
+"B<dpkg-scanpackages> yourself if making a directory of local packages to "
+"install on a cluster of machines."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:497
+#: dpkg-scanpackages.1:51
 msgid ""
-"Add dependencies to be added to the control file dependency field "
-"I<dependencyfield>.  (The dependencies for this field are placed in the "
-"variable B<shlibs:>I<dependencyfield>.)"
+"B<Note:> If you want to access the generated Packages file with B<apt> you "
+"will probably need to compress the file with B<gzip>(1)  (generating a "
+"Packages.gz file). apt ignores uncompressed Packages files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:507
+#: dpkg-scanpackages.1:58
 msgid ""
-"The B<-d>I<dependencyfield> option takes effect for all executables after "
-"the option, until the next B<-d>I<dependencyfield>.  The default "
-"I<dependencyfield> is B<Depends>."
+"I<binarydir> is the name of the tree of the binary packages to process (for "
+"example, B<contrib/binary-i386>).  It is best to make this relative to the "
+"root of the Debian archive, because every Filename field in the new Packages "
+"file will start with this string."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:515
+#: dpkg-scanpackages.1:62
 msgid ""
-"If the same dependency entry (or set of alternatives) appears in more than "
-"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
-"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
-"automatically remove the dependency from all fields except the one "
-"representing the most important dependencies."
+"I<overridefile> is the name of a file to read which contains information "
+"about how the package fits into the distribution; see below."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:515
-#, no-wrap
-msgid "B<-p>I<varnameprefix>"
+# type: Plain text
+#: dpkg-scanpackages.1:65
+msgid ""
+"I<pathprefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:526
+#: dpkg-scanpackages.1:69
 msgid ""
-"Causes substitution variables to start with I<varnameprefix>B<:> instead of "
-"B<shlibs:>.  Likewise, any existing substitution variables starting with "
-"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
-"substitution variables file."
+"If more than one version of a package is found only the newest one is "
+"included in the output. If they have the same version and only differ in "
+"architecture only the first one found is used."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:526
-#, no-wrap
-msgid "B<-L>I<localshlibsfile>"
-msgstr ""
+#: dpkg-scanpackages.1:71
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--udeb>"
+msgstr "B<--auto>, B<-a>"
 
 # type: Plain text
-#: dpkg-source.1:534
-msgid ""
-"Causes B<dpkg-shlibdeps> to read overriding shared library dependency "
-"information from I<localshlibsfile> instead of B<debian/shlibs.local>."
+#: dpkg-scanpackages.1:74
+msgid "Scan for I<*.udeb>, instead of I<*.deb>."
 msgstr ""
 
+# type: TP
+#: dpkg-scanpackages.1:74
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--arch> I<arch>"
+msgstr "B<-d>|B<--chdir> I<sökväg>"
+
 # type: Plain text
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:78
 msgid ""
-"Causes the substitution variable settings to be printed to standard output, "
-"rather than being added to the substitution variables file (B<debian/"
-"substvars> by default)."
+"Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
+"scanning for all debs,"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:540
+#: dpkg-scanpackages.1:78
 #, fuzzy, no-wrap
-msgid "B<-t>I<type>"
-msgstr "B<-t>|B<--test>"
+msgid "B<-m>, B<--multiversion>"
+msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: dpkg-source.1:549
-msgid ""
-"Causes B<dpkg-shlibdeps> to prefer shared library dependency information "
-"tagged for the given package type. If no tagged information is available, "
-"falls back to untagged information. The default package type is \"deb\". "
-"Shared library dependency information is tagged for a given type by "
-"prefixing it with the name of the type, a colon, and whitespace."
+#: dpkg-scanpackages.1:81
+msgid "Include all found packages in the output."
 msgstr ""
 
 # type: SH
-#: dpkg-source.1:549
+#: dpkg-scanpackages.1:88 update-alternatives.8:346
 #, no-wrap
-msgid "dpkg-GENCHANGES OPTIONS"
+msgid "DIAGNOSTICS"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:552
+#: dpkg-scanpackages.1:94
+msgid ""
+"B<dpkg-scanpackages> outputs the usual self-explanatory errors. It also "
+"warns about packages that are in the wrong subdirectory, are duplicated, "
+"have a Filename field in their control file, are missing from the override "
+"file, or have maintainer substitutions which do not take effect."
+msgstr ""
+
+# type: Plain text
+#: dpkg-scanpackages.1:99
 #, fuzzy
-msgid "B<dpkg-genchanges> does not take any non-option arguments."
-msgstr "B<822-date> tar inga flaggor eller parametrar."
+msgid "B<dpkg>(1), B<dselect>(1), B<deb-override>(5), B<dpkg-scansources>(1)."
+msgstr "B<deb>(5), B<dpkg>(8), B<dpkg-deb>(1)."
 
-# type: TP
-#: dpkg-source.1:552
+# type: TH
+#: dpkg-scansources.1:1
 #, no-wrap
-msgid "B<-u>I<uploadfilesdir>"
+msgid "dpkg-scansources"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:563
+#: dpkg-scansources.1:4
 msgid ""
-"Look for the files to be uploaded in I<uploadfilesdir> rather than B<..> "
-"(B<dpkg-genchanges> needs to find these files so that it can include their "
-"sizes and checksums in the B<.changes> file)."
+"dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:563
-#, fuzzy, no-wrap
-msgid "B<-q>"
-msgstr "B<-G>"
-
 # type: Plain text
-#: dpkg-source.1:571
+#: dpkg-scansources.1:13
 msgid ""
-"Usually B<dpkg-genchanges> will produce informative messages on standard "
-"error, for example about how many of the package's source files are being "
-"uploaded.  B<-q> suppresses these messages."
+"B<dpkg-scansources> [I<options>] I<binary-dir> [I<override-file> [I<path-"
+"prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:571
-#, no-wrap
-msgid "dpkg-BUILDPACKAGE OPTIONS"
+# type: Plain text
+#: dpkg-scansources.1:18
+msgid ""
+"B<dpkg-scansources> scans the given I<binary-dir> for I<.dsc> files.  These "
+"are used to create a Debian source index, which is output to stdout."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:574
-#, fuzzy
-msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-msgstr "B<822-date> tar inga flaggor eller parametrar."
-
-# type: TP
-#: dpkg-source.1:574
-#, no-wrap
-msgid "B<-k>I<key-id>"
+#: dpkg-scansources.1:29
+msgid ""
+"The I<override-file>, if given, is used to set priorities in the resulting "
+"index records and to override the maintainer field given in the I<.dsc> "
+"files. See B<dpkg-scanpackages>(1)  for the format of this file. \\s-1NB:"
+"\\s0 Since the override file is indexed by binary, not source, packages, "
+"there's a bit of a problem here. The current implementation uses the highest "
+"priority of all the binary packages produced by a I<.dsc> file for the "
+"priority of the source package, and the override entry for the first binary "
+"package listed in the I<.dsc> file to modify maintainer information. This "
+"might change."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:577
-#, fuzzy
-msgid "Specify a key-ID to use when signing packages."
-msgstr "Den sista raden på skärmen när paket väljs."
-
-# type: TP
-#: dpkg-source.1:577
-#, no-wrap
-msgid "B<-r>I<gain-root-command>"
+#: dpkg-scansources.1:33
+msgid ""
+"The I<path-prefix>, if given, is prepended to the directory field in the "
+"generated source index. You generally use this to make the directory fields "
+"contain the path from the top of the Debian archive hierarchy."
 msgstr ""
 
 # type: Plain text
-#.  what happens, if it contains spaces? (hs)
-#: dpkg-source.1:603
+#: dpkg-scansources.1:44
 msgid ""
-"When B<dpkg-buildpackage> needs to execute part of the build process as "
-"root, it prefixes the command it executes with I<gain-root-command> if one "
-"has been specified.  I<gain-root-command> should be the name of a program on "
-"the B<PATH> and will get as arguments the name of the real command to run "
-"and the arguments it should take.  I<gain-root-command> should not contain "
-"spaces or any other shell metacharacters.  I<gain-root-command> might "
-"typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  B<su> is not "
-"suitable, since it requires a B<-c> option to run a command and even then it "
-"can only invoke the user's shell with B<-c> instead of passing arguments "
-"individually to the command to be run."
+"B<Note:> If you want to access the generated Sources file with B<apt>(8)  "
+"you will probably need to compress the file with B<gzip>(1)  (generating a "
+"Sources.gz file). apt ignores uncompressed Sources files except on local "
+"access (i.e.  B<file://> sources)."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:603
-#, no-wrap
-msgid "B<-p>I<sign-command>"
-msgstr ""
+#: dpkg-scansources.1:46
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--no-sort>"
+msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: dpkg-source.1:628
+#: dpkg-scansources.1:49
 msgid ""
-"When B<dpkg-buildpackage> needs to execute GPG or PGP to sign a source "
-"control (B<.dsc>)  file or a B<.changes> file it will run I<sign-command> "
-"(searching the B<PATH> if necessary) instead of B<pgp>.  I<sign-command> "
-"will get all the arguments that B<pgp> would have gotten. If I<sign-command> "
-"takes its arguments in GPG rather than PGP style, you should give the B<-"
-"sgpg> option.  I<sign-command> should not contain spaces or any other shell "
-"metacharacters."
+"Don't sort the index records. Normally they are sorted by source package "
+"name."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:628
+#: dpkg-scansources.1:49
 #, fuzzy, no-wrap
-msgid "B<-tc>"
-msgstr "B<-G>"
+msgid "B<-s>, B<--source-override> I<file>"
+msgstr "B<-p>|B<--pidfile> I<pidfil>"
 
 # type: Plain text
-#: dpkg-source.1:634
+#: dpkg-scansources.1:52
 msgid ""
-"Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-"after the package has been built."
+"Use I<file> as the source override file. The default is the name of the "
+"override file you specified with I<.src> appended."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:634
-#, fuzzy, no-wrap
-msgid "B<-us>, B<-uc>"
-msgstr "B<--auto>, B<-a>"
-
 # type: Plain text
-#: dpkg-source.1:637
-msgid "Do not sign the source package or the .changes file, respectively."
+#: dpkg-scansources.1:58
+msgid ""
+"The source override file is in a different format from the binary override "
+"file. It contains only two whitespace separated fields, the first is the "
+"source package name and the second is the section. Blank lines and comment "
+"lines are ignored in the normal manner. If a package appears in both files "
+"the source override takes precedence for setting the section."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:637
+#: dpkg-scansources.1:58 install-info.8:272
 #, fuzzy, no-wrap
-msgid "B<-a>I<architecture>"
-msgstr "B<dpkg --print-architecture>"
+msgid "B<--debug>"
+msgstr "B<--no-debsig>"
 
 # type: Plain text
-#: dpkg-source.1:642
-msgid ""
-"Specify the Debian architecture we build for. The architecture of the "
-"machine we build on is determined automatically, and is also the default for "
-"the host machine."
+#: dpkg-scansources.1:60
+msgid "Turn debugging on."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:646
-msgid "Passed unchanged to B<dpkg-source>."
-msgstr ""
+#: dpkg-scansources.1:68
+#, fuzzy
+msgid "B<deb-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<dpkg>(1)."
 
 # type: Plain text
-#: dpkg-source.1:651
-msgid "Passed unchanged to B<dpkg-source>.  May be repeated multiple times."
+#: dpkg-scansources.1:70
+msgid "Roderick Schertler E<lt>roderick@argon.orgE<gt>"
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:651
+#: dpkg-shlibdeps.1:1 dpkg-shlibdeps.1:4
 #, fuzzy, no-wrap
-msgid "B<-D>"
-msgstr "B<-G>"
+msgid "dpkg-shlibdeps"
+msgstr "B<dpkg-deb-åtgärder>"
 
 # type: Plain text
-#: dpkg-source.1:654
-msgid "Check build dependencies and conflicts; abort if unsatisfied."
+#: dpkg-shlibdeps.1:10
+msgid ""
+"B<dpkg-shlibdeps> [I<options>] I<executable>|B<-e>I<executable> [I<options>]"
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:654
-#, fuzzy, no-wrap
-msgid "B<-d>"
-msgstr "B<-G>"
+# type: Plain text
+#: dpkg-shlibdeps.1:35
+msgid ""
+"B<dpkg-shlibdeps> calculates shared library dependencies for executables "
+"named in its arguments. The dependencies are added to the substitution "
+"variables file B<debian/substvars> as variable names B<shlibs:"
+">I<dependencyfield> where I<dependencyfield> is a dependency field name. Any "
+"other variables starting I<shlibs:> are removed from the file.  B<dpkg-"
+"shlibdeps> will read shared library dependency information from B<debian/"
+"shlibs.local>, B</etc/dpkg/shlibs.override>, the B<shlibs> control area file "
+"of the package containing the file which B<objdump> reports as satisfying "
+"the library dependency, or B</etc/dpkg/shlibs.default>.  The first match "
+"will be used."
+msgstr ""
 
-# type: SS
-#: dpkg-source.1:657
-#, fuzzy
-msgid "Do not check build dependencies and conflicts."
-msgstr "Lösa beroenden och konflikter"
+# type: Plain text
+#: dpkg-shlibdeps.1:41
+msgid ""
+"B<dpkg-shlibdeps> interprets non-option arguments as executable names, just "
+"as if they'd been supplied as B<-e>I<executable>."
+msgstr ""
 
 # type: TP
-#: dpkg-source.1:657
+#: dpkg-shlibdeps.1:41
 #, fuzzy, no-wrap
-msgid "B<-nc>"
-msgstr "B<-G>"
+msgid "B<-e>I<executable>"
+msgstr "B<-x>|B<--exec> I<programfil>"
 
 # type: Plain text
-#: dpkg-source.1:660
-msgid "Do not clean the source tree(implies -b)."
+#: dpkg-shlibdeps.1:45
+msgid ""
+"Include dependencies appropriate for the shared libraries required by "
+"I<executable>."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:45
+#, no-wrap
+msgid "B<-d>I<dependencyfield>"
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:660
-#, no-wrap
-msgid "dpkg-DISTADDFILE ARGUMENTS"
+# type: Plain text
+#: dpkg-shlibdeps.1:51
+msgid ""
+"Add dependencies to be added to the control file dependency field "
+"I<dependencyfield>.  (The dependencies for this field are placed in the "
+"variable B<shlibs:>I<dependencyfield>.)"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:666
+#: dpkg-shlibdeps.1:61
 msgid ""
-"B<dpkg-distaddfile> does not take any non-common options. It takes three non-"
-"option arguments, the filename and the section and priority for the B<."
-"changes> file."
+"The B<-d>I<dependencyfield> option takes effect for all executables after "
+"the option, until the next B<-d>I<dependencyfield>.  The default "
+"I<dependencyfield> is B<Depends>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:674
+#: dpkg-shlibdeps.1:69
 msgid ""
-"The filename should be specified relative to the directory where B<dpkg-"
-"genchanges> will expect to find the files, usually B<..>, rather than being "
-"a pathname relative to the current directory when B<dpkg-distaddfile> is run."
+"If the same dependency entry (or set of alternatives) appears in more than "
+"one of the recognised dependency field names B<Pre-Depends>, B<Depends>, "
+"B<Recommends>, B<Enhances> or B<Suggests> then B<dpkg-shlibdeps> will "
+"automatically remove the dependency from all fields except the one "
+"representing the most important dependencies."
 msgstr ""
 
-# type: SH
-#: dpkg-source.1:674
+# type: TP
+#: dpkg-shlibdeps.1:69
 #, no-wrap
-msgid "dpkg-PARSECHANGELOG ARGUMENTS"
+msgid "B<-p>I<varnameprefix>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:677
-#, fuzzy
+#: dpkg-shlibdeps.1:80
 msgid ""
-"B<dpkg-parsechangelog> does not take any non-common options or non-option "
-"arguments."
-msgstr "B<822-date> tar inga flaggor eller parametrar."
-
-# type: SH
-#: dpkg-source.1:677
-#, no-wrap
-msgid "VARIABLE SUBSTITUTION"
+"Start substitution variables with I<varnameprefix>B<:> instead of B<shlibs:"
+">.  Likewise, any existing substitution variables starting with "
+"I<varnameprefix>B<:> (rather than B<shlibs:>)  are removed from the the "
+"substitution variables file."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:687
+#: dpkg-shlibdeps.1:86
 msgid ""
-"Before B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges> write their "
-"control information (to the source control file B<.dsc> for B<dpkg-source> "
-"and to standard output for B<dpkg-gencontrol> and B<dpkg-genchanges>)  they "
-"perform some variable substitutions on the output file."
+"Print substitution variable settings to standard output, rather than being "
+"added to the substitution variables file (B<debian/substvars> by default)."
 msgstr ""
 
+# type: TP
+#: dpkg-shlibdeps.1:86
+#, fuzzy, no-wrap
+msgid "B<-t>I<type>"
+msgstr "B<-t>|B<--test>"
+
 # type: Plain text
-#: dpkg-source.1:694
+#: dpkg-shlibdeps.1:93
 msgid ""
-"A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"Prefer shared library dependency information tagged for the given package "
+"type. If no tagged information is available, falls back to untagged "
+"information. The default package type is \"deb\". Shared library dependency "
+"information is tagged for a given type by prefixing it with the name of the "
+"type, a colon, and whitespace."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:93
+#, no-wrap
+msgid "B<-L>I<localshlibsfile>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:701
+#: dpkg-shlibdeps.1:99
 msgid ""
-"After all the substitutions have been done each occurrence of the string B<"
-"${}> (which is not a legal substitution) is replaced with a B<$> sign."
+"Read overriding shared library dependency information from "
+"I<localshlibsfile> instead of B<debian/shlibs.local>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:714
+#: dpkg-shlibdeps.1:105
 msgid ""
-"Variables can be set using the B<-V> common option. They can be also "
-"specified in the file B<debian/substvars> (or whatever other file is "
-"specified using the B<-T> option). This file consists of lines of the form "
-"I<name>B<=>I<value>.  Trailing whitespace on each line, blank lines, and "
-"lines starting with a B<#> symbol (comments) are ignored."
+"Write substitution variables in I<substvarsfile>; the default is B<debian/"
+"substvars>."
+msgstr ""
+
+# type: TP
+#: dpkg-shlibdeps.1:117
+#, no-wrap
+msgid "B<debian/shlibs.local>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:716
-msgid "Additionally, the following standard variables are available:"
+#: dpkg-shlibdeps.1:120
+msgid "Package-local overriding shared library dependency information."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:716
+#: dpkg-shlibdeps.1:120
 #, no-wrap
-msgid "B<Arch>"
+msgid "B</etc/dpkg/shlibs.override>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:720
-msgid "The current build architecture (from B<dpkg --print-architecture>)."
+#: dpkg-shlibdeps.1:123
+msgid "Per-system overriding shared library dependency information."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:720
+# type: Plain text
+#: dpkg-shlibdeps.1:123
 #, fuzzy, no-wrap
-msgid "B<source:Version>"
-msgstr "B<--version>"
+msgid "B</etc/dpkg/shlibs.default>"
+msgstr "I</etc/dpkg/dselect.cfg>"
 
 # type: Plain text
-#: dpkg-source.1:723
-#, fuzzy
-msgid "The source package version."
-msgstr "Paketets korta beskrivning."
-
-# type: TP
-#: dpkg-source.1:723
-#, no-wrap
-msgid "B<source:Upstream-Version>"
+#: dpkg-shlibdeps.1:126
+msgid "Per-system default shared library dependency information."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:727
-msgid ""
-"The upstream source package version, including the Debian version epoch if "
-"any."
+#: dpkg-shlibdeps.1:129
+msgid "B<deb-shlibs>(5)."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:727
+# type: Plain text
+#: dpkg-source.1:2
 #, fuzzy, no-wrap
-msgid "B<binary:Version>"
-msgstr "B<--version>"
+msgid "dpkg-source"
+msgstr "dpkg-query"
 
 # type: Plain text
-#: dpkg-source.1:731
-msgid ""
-"The binary package version (which may differ from source:Version in a binNMU "
-"for example)."
+#: dpkg-source.1:6
+#, fuzzy
+msgid "dpkg-source, - Debian source package tools"
 msgstr ""
+"B<dpkg-deb> packar, packar upp och tillhandahåller information om "
+"Debianarkiv."
 
-# type: TP
-#: dpkg-source.1:731
-#, fuzzy, no-wrap
-msgid "B<Source-Version>"
-msgstr "B<--version>"
+# type: Plain text
+#: dpkg-source.1:11
+#, fuzzy
+msgid "B<dpkg-source> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-source.1:736
-msgid ""
-"The source package version (from the changelog file). This variable is now "
-"B<deprecated> as its meaning is different from its function, please use the "
-"B<source:Version> or B<binary:Version> as appropriate."
+#: dpkg-source.1:15
+#, fuzzy
+msgid "B<dpkg-source> packs and unpacks Debian source archives."
 msgstr ""
-
-# type: TP
-#: dpkg-source.1:736
-#, fuzzy, no-wrap
-msgid "B<Installed-Size>"
-msgstr "B<installerat>"
+"B<dpkg-deb> packar, packar upp och tillhandahåller information om "
+"Debianarkiv."
 
 # type: Plain text
-#: dpkg-source.1:745
+#: dpkg-source.1:19
 msgid ""
-"The total size of the package's installed files. This value is copied into "
-"the corresponding control file field; setting it will modify the value of "
-"that field. If this variable isn't set B<dpkg-gencontrol> will use B<du -k "
-"debian/tmp> to find the default value."
+"None of these commands allow multiple options to be combined into one, and "
+"they do not allow the value for an option to be specified in a separate "
+"argument."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:745
+#: dpkg-source.1:21
 #, no-wrap
-msgid "B<Extra-Size>"
+msgid "B<-x >I<filename>B<.dsc >[I<output-directory>]"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:754
+#: dpkg-source.1:31
 msgid ""
-"Additional disk space used when the package is installed. If this variable "
-"is set its value is added to that of the B<Installed-Size> variable (whether "
-"set explicitly or using the default value) before it is copied into the "
-"B<Installed-Size> control file field."
+"Extract a source package. One non-option argument must be supplied, the name "
+"of the Debian source control file (B<.dsc>).  An optional second non-option "
+"argument may be supplied to specify the directory to extract the source "
+"package to, this must not exist. If no output directory is specified, the "
+"source package is extracted into a directory named I<source>-I<version> "
+"under the current working directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:754
-#, fuzzy, no-wrap
-msgid "B<F:>I<fieldname>"
-msgstr "B<--log=>I<filename>"
-
 # type: Plain text
-#: dpkg-source.1:761
+#: dpkg-source.1:37
 msgid ""
-"The value of the output field I<fieldname> (which must be given in the "
-"canonical capitalisation). Setting these variables has no effect other than "
-"on places where they are expanded explicitly."
-msgstr ""
-
-# type: TP
-#: dpkg-source.1:761
-#, no-wrap
-msgid "B<Format>"
+"B<dpkg-source> will read the names of the other file(s) making up the source "
+"package from the control file; they are assumed to be in the same directory "
+"as the B<.dsc>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:771
+#: dpkg-source.1:45
 msgid ""
-"The B<.changes> file format version generated by this version of the source "
-"packaging scripts. If you set this variable the contents of the B<Format> "
-"field in the B<.changes> file will change too."
+"The files in the extracted package will have their permissions and "
+"ownerships set to those which would have been expected if the files and "
+"directories had simply been created - directories and executable files will "
+"be 0777 and plain files will be 0666, both modified by the extractors' "
+"umask; if the parent directory is setgid then the extracted directories will "
+"be too, and all the files and directories will inherit its group ownership."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:771
-#, no-wrap
-msgid "B<Newline>, B<Space>, B<Tab>"
-msgstr ""
+# type: Plain text
+#: dpkg-source.1:45
+#, fuzzy, no-wrap
+msgid "B<-b> [I<options>] I<directory> [I<orig-directory>|I<orig-targz>|'']"
+msgstr "B<dpkg-deb> B<-b>|B<--build> I<katalog> [I<arkiv>|I<katalog>]"
 
 # type: Plain text
-#: dpkg-source.1:774
-msgid "These variables each hold the corresponding character."
+#: dpkg-source.1:60
+msgid ""
+"Build a source package. One or two non-option arguments should be supplied. "
+"The first is taken as the name of the directory containing the unpacked "
+"source tree. If a second argument is supplied it should be the name of the "
+"original source directory or tarfile or the empty string if the package is a "
+"Debian-specific one and so has no Debianisation diffs. If no second argument "
+"is supplied then B<dpkg-source> will look for the original source tarfile "
+"I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the original source "
+"directory I<directory>B<.orig> or the empty string (no original source, and "
+"so no diff) depending on the arguments."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:774
-#, no-wrap
-msgid "B<shlibs:>I<dependencyfield>"
+# type: Plain text
+#: dpkg-source.1:75
+msgid ""
+"Specifies the main source control file to read information from. The default "
+"is B<debian/control>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:779
+#: dpkg-source.1:82
 msgid ""
-"Variable settings with names of this form are generated by B<dpkg-shlibdeps> "
-"- see above."
+"Specifies the change log file to read information from. The default is "
+"B<debian/changelog>.  If given with relative pathname this is interpreted "
+"starting at the source tree's top level directory."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:779
-#, fuzzy, no-wrap
-msgid "B<dpkg:Upstream-Version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
-#: dpkg-source.1:782
-msgid "The upstream version of dpkg."
+#: dpkg-source.1:106
+msgid "This option turns certain errors into warnings."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:782
-#, fuzzy, no-wrap
-msgid "B<dpkg:Version>"
-msgstr "B<dpkg --version>"
-
 # type: Plain text
-#: dpkg-source.1:785
-msgid "The full version of dpkg."
+#: dpkg-source.1:110
+msgid "This option negates a previously set B<-W>."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:788
+#: dpkg-source.1:118
 msgid ""
-"If a variable is referred to but not defined it generates a warning and an "
-"empty value is assumed."
+"You may specify a perl regular expression to match files you want filtered "
+"out of the list of files for the diff. (This list is generated by a find "
+"command.) B<-i> by itself enables the option, with a default that will "
+"filter out control files and directories of the most common revision control "
+"systems, backup and swap files and Libtool build output directories."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:789
-#, fuzzy, no-wrap
-msgid "B<debian/control>"
-msgstr "deb-control"
+#: dpkg-source.1:130
+msgid ""
+"This is very helpful in cutting out extraneous files that get included in "
+"the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
+"instance, if you maintain a package that you track via remote CVS, where you "
+"don't have access permissions for committing the debian control files and "
+"making tags for I<cvs-buildpackage(1)>, it is necessary to perform an extra "
+"checkout/update into a directory you keep pristine, to generate the .orig."
+"tar.gz from. That directory will have CVS/Entries files in it that will "
+"contain timestamps that differ from the ones in your working directory, thus "
+"causing them to be unnecessarily included in every .diff.gz, unless you use "
+"the B<-i> switch."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:794
+#: dpkg-source.1:137
 msgid ""
-"The main source control information file, giving version-independent "
-"information about the source package and the binary packages it can produce."
+"If this option is specified, the filename will be passed to tar's --exclude "
+"option when it is called to generate a .orig.tar.gz or .tar.gz file. For "
+"example, -ICVS will make tar skip over CVS directories when generating a ."
+"tar.gz file. The option may be repeated multiple times to list multiple "
+"filenames to exclude."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:794
+#: dpkg-source.1:158
 #, no-wrap
-msgid "B<debian/changelog>"
+msgid "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:800
+#: dpkg-source.1:173
 msgid ""
-"The changelog file, used to obtain version-dependent information about the "
-"source package, such as the urgency and distribution of an upload, the "
-"changes made since a particular release, and the source version number "
-"itself."
+"If B<-sk> or B<-sp> is specified B<dpkg-source> expects the original source "
+"as a tarfile, by default I<package>B<_>I<upstream-version>B<.orig.tar.gz>.  "
+"It will leave this original source in place as a tarfile, or copy it to the "
+"current directory if it isn't already there If B<-sp> is used rather than B<-"
+"sk> it will remove it again afterwards."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:800
-#, fuzzy, no-wrap
-msgid "B<debian/files>"
-msgstr "B<infodesc>"
+# type: Plain text
+#: dpkg-source.1:185
+msgid ""
+"If B<-su> or B<-sr> is specified the original source is expected as a "
+"directory, by default I<package>B<->I<upstream-version>B<.orig> and B<dpkg-"
+"source> will create a new original source archive from it. If B<-sr> is used "
+"B<dpkg-source will remove that directory after it has been used.>"
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:813
+#: dpkg-source.1:196
 msgid ""
-"The list of generated files which are part of the upload being prepared.  "
-"B<dpkg-gencontrol> adds the presumed filenames of binary packages whose "
-"control files it generates here; B<dpkg-distaddfile> can be used to add "
-"additional files.  B<dpkg-genchanges> reads the data here when producing a "
-"B<.changes> file."
+"If B<-ss> is specified B<dpkg-source> will expect that the original source "
+"is available both as a directory and as a tarfile. If will use the directory "
+"to create the diff, but the tarfile to create the B<.dsc>.  This option must "
+"be used with care - if the directory and tarfile do not match a bad source "
+"archive will be generated."
 msgstr ""
 
-# type: TP
-#: dpkg-source.1:813
-#, fuzzy, no-wrap
-msgid "B<debian/substvars>"
-msgstr "B<ta bort>"
+# type: Plain text
+#: dpkg-source.1:205
+msgid ""
+"If B<-sn> is specified B<dpkg-source> will not look for any original source, "
+"and will not generate a diff.  The second argument, if supplied, must be the "
+"empty string. This is used for Debian-specific packages which do not have a "
+"separate upstream source and therefore have no debianisation diffs."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:816
-#, fuzzy
-msgid "List of substitution variables and values."
-msgstr "Lista över tillgängliga paket."
-
-# type: TP
-#: dpkg-source.1:816
-#, no-wrap
-msgid "B<debian/shlibs.local>"
+#: dpkg-source.1:234
+msgid ""
+"If B<-sa> or B<-sA> is specified B<dpkg-source> will look for the original "
+"source archive as a tarfile or as a directory - the second argument, if any, "
+"may be either, or the empty string (this is equivalent to using B<-sn>).  If "
+"a tarfile is found it will unpack it to create the diff and remove it "
+"afterwards (this is equivalent to B<-sp>); if a directory is found it will "
+"pack it to create the original source and remove it afterwards (this is "
+"equivalent to B<-sr>); if neither is found it will assume that the package "
+"has no debianisation diffs, only a straightforward source archive (this is "
+"equivalent to B<-sn>).  If both are found then dpkg-source will ignore the "
+"directory, overwriting it, if B<-sA> was specified (this is equivalent to B<-"
+"sP>)  or raise an error if B<-sa> was specified.  B<-sA> is the default."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:819
-msgid "Package-local overriding shared library dependency information."
+#: dpkg-source.1:240
+msgid ""
+"B<-sa>, B<-sp>, B<-sk>, B<-su> and B<-sr> will not overwrite existing "
+"tarfiles or directories. If this is desired then B<-sA>, B<-sP>, B<-sK>, B<-"
+"sU> and B<-sR> should be used instead."
 msgstr ""
 
 # type: TP
-#: dpkg-source.1:819
+#: dpkg-source.1:240
 #, no-wrap
-msgid "B</etc/dpkg/shlibs.override>"
+msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-msgid "Per-system overriding shared library dependency information."
+#: dpkg-source.1:243
+msgid "In all cases any existing original source tree will be removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:822
-#, fuzzy, no-wrap
-msgid "B</etc/dpkg/shlibs.default>"
-msgstr "I</etc/dpkg/dselect.cfg>"
+#: dpkg-source.1:250
+msgid ""
+"If B<-sp> is used when extracting then the original source (if any) will be "
+"left as a tarfile. If it is not already located in the current directory or "
+"if an existing but different file is there it will be copied there.  This is "
+"the default."
+msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:825
-msgid "Per-system default shared library dependency information."
+#: dpkg-source.1:253
+msgid "B<-su> unpacks the original source tree."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:828
+#: dpkg-source.1:258
 msgid ""
-"The point at which field overriding occurs compared to certain standard "
-"output field settings is rather confused."
+"B<-sn> ensures that the original source is neither copied to the current "
+"directory nor unpacked. Any original source tree that was in the current "
+"directory is still removed."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:835
+#: dpkg-source.1:263
 msgid ""
-"The binary package entries in the B<debian/files> file will be passed "
-"through variable substitution twice. This should not matter, since B<$>, B<"
-"{> and B<}> are not legal in package names or version numbers."
+"All the B<-sX> options are mutually exclusive. If you specify more than one "
+"only the last one will be used."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:839
+#: dpkg-source.1:274
 msgid ""
-"It should be possible to specify spaces and shell metacharacters in and "
-"initial arguments for I<gain-root-command> and I<sign-command>."
+"The binary package entries in the B<debian/files> file will be passed "
+"through variable substitution twice. This should not matter, since B<$>, B<"
+"{> and B<}> are not legal in package names or version numbers."
 msgstr ""
 
 # type: Plain text
-#: dpkg-source.1:845
+#: dpkg-source.1:279
 #, fuzzy
-msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1), B<gpg>(1), B<pgp>(1)."
+msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
-# type: Plain text
-#: dpkg-source.1:847
-msgid "The utilities and this manpage were written by Ian Jackson."
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:849
-msgid "Copyright (C) 1995-1996 Ian Jackson"
-msgstr ""
-
-# type: Plain text
-#: dpkg-source.1:851
-#, fuzzy
-msgid "Copyright (C) 2000 Wichert Akkerman"
-msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
-
-# type: Plain text
-#: dpkg-source.1:857
-#, fuzzy
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or later "
-"for copying conditions. There is NO WARRANTY. See B</usr/share/doc/dpkg/"
-"copyright> and B</usr/share/common-licenses/GPL> for details."
-msgstr ""
-"Detta är fri programvara; se GNU General Public License version 2 eller "
-"senare för kopieringsvillkor. Det finns INGEN garanti."
-
 # type: TH
 #: dpkg-split.1:2
 #, no-wrap
@@ -6637,37 +6742,13 @@ msgid "dpkg-split - Debian package archive split/join tool"
 msgstr "dpkg-split - Verktyg för att dela/slå ihop Debianpaket"
 
 # type: Plain text
-#: dpkg-split.1:9
-msgid "B<dpkg-split> B<-s>|B<--split> I<complete-archive> [I<prefix>]"
-msgstr "B<dpkg-split> B<-s>|B<--split> I<helt-arkiv> [I<prefix>]"
-
-# type: Plain text
-#: dpkg-split.1:13
-msgid "B<dpkg-split> B<-j>|B<--join> I<part> ..."
-msgstr "B<dpkg-split> B<-j>|B<--join> I<del>..."
-
-# type: Plain text
-#: dpkg-split.1:17
-msgid "B<dpkg-split> B<-I>|B<--info> I<part> ..."
-msgstr "B<dpkg-split> B<-I>|B<--info> I<del>..."
-
-# type: Plain text
-#: dpkg-split.1:21
-msgid "B<dpkg-split> B<-a>|B<--auto> B<-o>I< complete-output part>"
-msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< fullständig-utdata del>"
-
-# type: Plain text
-#: dpkg-split.1:24
-msgid "B<dpkg-split> B<-l>|B<--listq>"
-msgstr "B<dpkg-split> B<-l>|B<--listq>"
-
-# type: Plain text
-#: dpkg-split.1:28
-msgid "B<dpkg-split> B<-d>|B<--discard> [I<package> ...]"
-msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paket>...]"
+#: dpkg-split.1:10
+#, fuzzy
+msgid "B<dpkg-split> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-split.1:33
+#: dpkg-split.1:16
 msgid ""
 "B<dpkg-split> splits Debian binary package files into smaller parts and "
 "reassembles them again, to support the storage of large package files on "
@@ -6678,7 +6759,7 @@ msgstr ""
 "media, till exempel disketter."
 
 # type: Plain text
-#: dpkg-split.1:37
+#: dpkg-split.1:20
 msgid ""
 "It can be operated manually using the B<--split>, B<--join> and B<--info> "
 "options."
@@ -6687,7 +6768,7 @@ msgstr ""
 "info>."
 
 # type: Plain text
-#: dpkg-split.1:45
+#: dpkg-split.1:28
 msgid ""
 "It also has an automatic mode, invoked using the B<--auto> option, where it "
 "maintains a queue of parts seen but not yet reassembled and reassembles a "
@@ -6700,7 +6781,7 @@ msgstr ""
 "listq> and B<--discard> gör det möjligt att hantera kön."
 
 # type: Plain text
-#: dpkg-split.1:48
+#: dpkg-split.1:31
 msgid ""
 "All splitting, joining and queueing operations produce informative messages "
 "on standard output; these may safely be ignored."
@@ -6708,19 +6789,19 @@ msgstr ""
 "Alla funktioner för uppdelning, sammanslagning och köande visar informativa "
 "meddelanden på standard ut; dessa kan ignoreras."
 
-# type: TP
-#: dpkg-split.1:49
-#, no-wrap
-msgid "B<--split>, B<-s>"
-msgstr "B<--split>, B<-s>"
+# type: Plain text
+#: dpkg-split.1:33
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--split> I<complete-archive> [I<prefix>]"
+msgstr "B<dpkg-split> B<-s>|B<--split> I<helt-arkiv> [I<prefix>]"
 
 # type: Plain text
-#: dpkg-split.1:52
+#: dpkg-split.1:36
 msgid "Splits a single Debian binary package into several parts."
 msgstr "Delar ett ensamt binärt Debianpaket i flera delar."
 
 # type: Plain text
-#: dpkg-split.1:60
+#: dpkg-split.1:44
 msgid ""
 "The parts are named I<prefix>B<.>I<N>B<of>I<M>B<.deb> where I<N> is the part "
 "number, starting at 1, and I<M> is the total number of parts (both in "
@@ -6731,7 +6812,7 @@ msgstr ""
 "decimalt)."
 
 # type: Plain text
-#: dpkg-split.1:68
+#: dpkg-split.1:52
 msgid ""
 "If no I<prefix> is supplied then the I<complete-archive> filename is taken, "
 "including directory, with any trailing B<.deb> removed."
@@ -6739,14 +6820,14 @@ msgstr ""
 "Om inget I<prefix> ges tas filnamnet för I<helt-arkiv>, inklusive "
 "katalognamn, med den avslutande B<.deb> borttagen."
 
-# type: TP
-#: dpkg-split.1:68
-#, no-wrap
-msgid "B<--join>, B<-j>"
-msgstr "B<--join>, B<-j>"
+# type: Plain text
+#: dpkg-split.1:52
+#, fuzzy, no-wrap
+msgid "B<-j>, B<--join> I<part>..."
+msgstr "B<dpkg-split> B<-j>|B<--join> I<del>..."
 
 # type: Plain text
-#: dpkg-split.1:72
+#: dpkg-split.1:56
 msgid ""
 "Joins the parts of a package file together, reassembling the original file "
 "as it was before it was split."
@@ -6755,7 +6836,7 @@ msgstr ""
 "den såg ut innan den delades."
 
 # type: Plain text
-#: dpkg-split.1:76
+#: dpkg-split.1:60
 msgid ""
 "The part files given as arguments must be all the parts of exactly the same "
 "original binary file. Each part must occur exactly once in the argument "
@@ -6766,7 +6847,7 @@ msgstr ""
 "men de behöver inte listas i ordning."
 
 # type: Plain text
-#: dpkg-split.1:81
+#: dpkg-split.1:65
 msgid ""
 "The parts must of course all have been generated with the same part size "
 "specified at split time, which means that they must usually have been "
@@ -6777,17 +6858,23 @@ msgstr ""
 "vid samma körning av B<dpkg-split --split>."
 
 # type: Plain text
-#: dpkg-split.1:83
+#: dpkg-split.1:67
 msgid "The parts' filenames are not significant for the reassembly process."
 msgstr "Delarnas filnamn är inte signifikanta för sammanslagningsproceduren."
 
 # type: Plain text
-#: dpkg-split.1:86
+#: dpkg-split.1:70
 msgid "By default the output file is called I<package>B<->I<version>B<.deb>."
 msgstr "Förvalt namn på utdatafilen är I<paket>B<->I<version>B<.deb>."
 
 # type: Plain text
-#: dpkg-split.1:92
+#: dpkg-split.1:71
+#, fuzzy, no-wrap
+msgid "B<-I>, B<--info> I<part>..."
+msgstr "B<dpkg-split> B<-I>|B<--info> I<del>..."
+
+# type: Plain text
+#: dpkg-split.1:76
 msgid ""
 "Prints information, in a human-readable format, about the part file(s)  "
 "specified. Arguments which are not binary package parts produce a message "
@@ -6797,19 +6884,19 @@ msgstr ""
 "Parametrar som inte är delar av binärpaket resulterar i ett meddelande som "
 "talar om detta (men fortfarande på standard ut)."
 
-# type: TP
-#: dpkg-split.1:92
-#, no-wrap
-msgid "B<--auto>, B<-a>"
-msgstr "B<--auto>, B<-a>"
+# type: Plain text
+#: dpkg-split.1:76
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--auto -o> I<complete-output part>"
+msgstr "B<dpkg-split> B<-a>|B<--auto> B<-o>I< fullständig-utdata del>"
 
 # type: Plain text
-#: dpkg-split.1:95
+#: dpkg-split.1:79
 msgid "Automatically queue parts and reassemble a package if possible."
 msgstr "Köa automatiskt delarna och återskapa paketet om möjligt."
 
 # type: Plain text
-#: dpkg-split.1:100
+#: dpkg-split.1:84
 msgid ""
 "The I<part> specified is examined, and compared with other parts of the same "
 "package (if any) in the queue of packages file parts."
@@ -6818,7 +6905,7 @@ msgstr ""
 "(om sådana existerar) i kön av delar av paket."
 
 # type: Plain text
-#: dpkg-split.1:107
+#: dpkg-split.1:91
 msgid ""
 "If all parts of the package file of which I<part> is a part are available "
 "then the package is reassembled and written to I<complete-output> (which "
@@ -6830,7 +6917,7 @@ msgstr ""
 "gjorde det)."
 
 # type: Plain text
-#: dpkg-split.1:113
+#: dpkg-split.1:97
 msgid ""
 "If not then the I<part> is copied into the queue and I<complete-output> is "
 "not created."
@@ -6839,7 +6926,7 @@ msgstr ""
 "inte."
 
 # type: Plain text
-#: dpkg-split.1:120
+#: dpkg-split.1:104
 msgid ""
 "If I<part> is not a split binary package part then B<dpkg-split> will exit "
 "with status 1; if some other trouble occurs then it will exit with status 2."
@@ -6849,7 +6936,7 @@ msgstr ""
 "returvärde 2."
 
 # type: Plain text
-#: dpkg-split.1:127
+#: dpkg-split.1:111
 msgid ""
 "The B<--output> or B<-o> option must be supplied when using B<--auto>.  (If "
 "this were not mandatory the calling program would not know what output file "
@@ -6860,18 +6947,18 @@ msgstr ""
 "utdatafil som förväntades.)"
 
 # type: TP
-#: dpkg-split.1:127
-#, no-wrap
-msgid "B<--listq>, B<-l>"
-msgstr "B<--listq>, B<-l>"
+#: dpkg-split.1:111
+#, fuzzy, no-wrap
+msgid "B<-l>, B<--listq>"
+msgstr "B<--licence>"
 
 # type: Plain text
-#: dpkg-split.1:130
+#: dpkg-split.1:114
 msgid "Lists the contents of the queue of packages to be reassembled."
 msgstr "Listar innehållet i kön över paket att återställa."
 
 # type: Plain text
-#: dpkg-split.1:134
+#: dpkg-split.1:118
 msgid ""
 "For each package file of which parts are in the queue the output gives the "
 "name of the package, the parts in the queue, and the total number of bytes "
@@ -6880,14 +6967,14 @@ msgstr ""
 "För varje paketfil för vilken delar finns i kön visas i utdata namnet på "
 "paketet, antal delar i kön, och det totala antalet byte som är lagrade i kön."
 
-# type: TP
-#: dpkg-split.1:134
-#, no-wrap
-msgid "B<--discard>, B<-d>"
-msgstr "B<--discard>, B<-d>"
+# type: Plain text
+#: dpkg-split.1:118
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--discard> [I<package>...]"
+msgstr "B<dpkg-split> B<-d>|B<--discard> [I<paket>...]"
 
 # type: Plain text
-#: dpkg-split.1:138
+#: dpkg-split.1:122
 msgid ""
 "This discards parts from the queue of those waiting for the remaining parts "
 "of their packages."
@@ -6896,7 +6983,7 @@ msgstr ""
 "paket."
 
 # type: Plain text
-#: dpkg-split.1:143
+#: dpkg-split.1:127
 msgid ""
 "If no I<package> is specified then the queue is cleared completely; if any "
 "are specified then only parts of the relevant package(s) are deleted."
@@ -6904,38 +6991,14 @@ msgstr ""
 "Om inget I<paket> anges töms kön helt; om paket anges kastas bara delar för "
 "de(t) paket som anges."
 
-# type: Plain text
-#: dpkg-split.1:148
-msgid ""
-"Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-"their uses."
-msgstr ""
-"Visar B<dpkg-split>s hjälpskärm, vilken ger en sammanfattning av "
-"kommandoradsflaggorna och deras användningsområden."
-
-# type: Plain text
-#: dpkg-split.1:153
-msgid "Prints B<dpkg-split>'s version number."
-msgstr "Visar B<dpkg-split>s versionsnummer."
-
-# type: Plain text
-#: dpkg-split.1:160
-msgid ""
-"Prints information about B<dpkg-split>'s copyright licensing and lack of "
-"warranty. (The American spelling B<--license> is also supported.)"
-msgstr ""
-"Visar information om B<dpkg-split>s upphovsrättsliga licensiering och "
-"avsaknad av garanti. (Den amerikanskengelska stavningen B<--license> stöds "
-"också.)"
-
 # type: TP
-#: dpkg-split.1:161
+#: dpkg-split.1:138
 #, no-wrap
 msgid "B<--depotdir>I< directory>"
 msgstr "B<--depotdir>I< katalog>"
 
 # type: Plain text
-#: dpkg-split.1:166
+#: dpkg-split.1:143
 msgid ""
 "Specifies an alternative directory for the queue of parts awaiting automatic "
 "reassembly. The default is B</var/lib/dpkg>."
@@ -6944,33 +7007,34 @@ msgstr ""
 "sammanslagning. Förvalet är B</var/lib/dpkg>."
 
 # type: TP
-#: dpkg-split.1:166
-#, no-wrap
-msgid "B<--partsize>|B<-S>I< kbytes>"
+#: dpkg-split.1:143
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--partsize> I<kbytes>"
 msgstr "B<--partsize>|B<-S>I< kbyte>"
 
 # type: Plain text
-#: dpkg-split.1:170
+#: dpkg-split.1:147
+#, fuzzy
 msgid ""
 "Specifies the maximum part size when splitting, in kilobytes (1024 bytes). "
-"The default is 450Kb."
+"The default is 450 KiB."
 msgstr ""
 "Anger maximal storlek vid delning, i kilobyte (1024 byte). Förval är 450 "
 "Kbyte."
 
 # type: TP
-#: dpkg-split.1:170
-#, no-wrap
-msgid "B<--output>|B<-O>I< complete-output>"
+#: dpkg-split.1:147
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--output> I<complete-output>"
 msgstr "B<--output>|B<-O>I< fullständig-utdata>"
 
 # type: Plain text
-#: dpkg-split.1:173
+#: dpkg-split.1:150
 msgid "Specifies the output file name for a reassembly."
 msgstr "Anger filnamnet för utdata vid sammanslagning."
 
 # type: Plain text
-#: dpkg-split.1:178
+#: dpkg-split.1:155
 msgid ""
 "This overrides the default for a manual reassembly (B<--join>)  and is "
 "mandatory for an automatic queue-or-reassemble (B<--auto>)."
@@ -6979,13 +7043,13 @@ msgstr ""
 "och krävs för automatisk köa-eller-sammanslå (B<--auto>)."
 
 # type: TP
-#: dpkg-split.1:178
-#, no-wrap
-msgid "B<--npquiet>, B<-Q>"
-msgstr "B<--npquiet>, B<-Q>"
+#: dpkg-split.1:155
+#, fuzzy, no-wrap
+msgid "B<-Q>, B<--npquiet>"
+msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 msgid ""
 "When doing automatic queue-or-reassembly B<dpkg-split> usually prints a "
 "message if it is given a I<part> that is not a binary package part. This "
@@ -6999,19 +7063,19 @@ msgstr ""
 "felaktiga meddelanden."
 
 # type: TP
-#: dpkg-split.1:189
+#: dpkg-split.1:166
 #, no-wrap
 msgid "B<--msdos>"
 msgstr "B<--msdos>"
 
 # type: Plain text
-#: dpkg-split.1:194
+#: dpkg-split.1:171
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr "Tvingar utdatafilnamn skapade av B<--split> att vara msdos-kompatibla."
 
 # type: Plain text
-#: dpkg-split.1:200
+#: dpkg-split.1:177
 msgid ""
 "This mangles the prefix - either the default derived from the input filename "
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
@@ -7022,7 +7086,7 @@ msgstr ""
 "plustecken ersätts med B<x> och alla andra tecken kastas."
 
 # type: Plain text
-#: dpkg-split.1:205
+#: dpkg-split.1:182
 msgid ""
 "The result is then truncated as much as is necessary, and filenames of the "
 "form I<prefixN>B<of>I<M>B<.deb> are generated."
@@ -7031,13 +7095,13 @@ msgstr ""
 "I<prefixN>B<of>I<M>B<.deb> genereras."
 
 # type: SH
-#: dpkg-split.1:205 update-alternatives.8:429
+#: dpkg-split.1:183 update-alternatives.8:339
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "RETURVÄRDE"
 
 # type: Plain text
-#: dpkg-split.1:211
+#: dpkg-split.1:189
 msgid ""
 "An exit status of 0 indicates that the requested split, merge, or other "
 "command succeeded.  B<--info> commands count as successful even if the files "
@@ -7048,7 +7112,7 @@ msgstr ""
 "även om indatafilen inte är en del av ett binärpaket."
 
 # type: Plain text
-#: dpkg-split.1:217
+#: dpkg-split.1:195
 msgid ""
 "An exit status of 1 occurs only with B<--auto> and indicates that the "
 "I<part> file was not a binary package part."
@@ -7057,7 +7121,7 @@ msgstr ""
 "var en del av ett binärpaket."
 
 # type: Plain text
-#: dpkg-split.1:221
+#: dpkg-split.1:199
 msgid ""
 "An exit status of 2 indicates some kind of trouble, such as a system call "
 "failure, a file that looked like a package part file but was corrupted, a "
@@ -7068,7 +7132,7 @@ msgstr ""
 "användningsfel, eller något annat problem."
 
 # type: Plain text
-#: dpkg-split.1:225
+#: dpkg-split.1:204
 msgid ""
 "B<dpkg-split> uses some rather out-of-date conventions for the the filenames "
 "of Debian packages."
@@ -7077,7 +7141,7 @@ msgstr ""
 "Debianpaket."
 
 # type: Plain text
-#: dpkg-split.1:228
+#: dpkg-split.1:207
 msgid ""
 "Full details of the packages in the queue are impossible to get without "
 "digging into the queue directory yourself."
@@ -7086,7 +7150,7 @@ msgstr ""
 "katalogen."
 
 # type: Plain text
-#: dpkg-split.1:231
+#: dpkg-split.1:210
 msgid ""
 "There is no easy way to test whether a file that may be a binary package "
 "part is one."
@@ -7095,7 +7159,7 @@ msgstr ""
 "binärpaket faktiskt är det."
 
 # type: Plain text
-#: dpkg-split.1:235
+#: dpkg-split.1:214
 msgid ""
 "The architecture is not represented in the part files' header, only in the "
 "control information of the contained binary package file, and it is not "
@@ -7106,20 +7170,20 @@ msgstr ""
 "som genereras."
 
 # type: TP
-#: dpkg-split.1:236
+#: dpkg-split.1:216
 #, no-wrap
 msgid "I</var/lib/dpkg/parts>"
 msgstr "B</var/lib/dpkg/parts>"
 
 # type: Plain text
-#: dpkg-split.1:240
+#: dpkg-split.1:220
 msgid ""
 "The default queue directory for part files awaiting automatic reassembly."
 msgstr ""
 "Förvald kö-katalog för delfiler som väntar på automatisk sammanslagning."
 
 # type: Plain text
-#: dpkg-split.1:245
+#: dpkg-split.1:225
 msgid ""
 "The filenames used in this directory are in a format internal to B<dpkg-"
 "split> and are unlikely to be useful to other programs, and in any case the "
@@ -7130,12 +7194,12 @@ msgstr ""
 "inte formatet på filnamnen litas på."
 
 # type: Plain text
-#: dpkg-split.1:250
+#: dpkg-split.1:231
 msgid "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 msgstr "B<deb>(5), B<deb-control>(5), B<dpkg-deb>(1), B<dpkg>(1)."
 
 # type: Plain text
-#: dpkg-split.1:260
+#: dpkg-split.1:241
 #, fuzzy
 msgid ""
 "B<dpkg-split> and this manpage were written by Ian Jackson. They are "
@@ -7167,23 +7231,12 @@ msgstr ""
 
 # type: Plain text
 #: dpkg-statoverride.8:9
-msgid ""
-"B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> "
-"E<lt>modeE<gt> E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:13
-msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: dpkg-statoverride.8:18
-msgid "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-msgstr ""
+#, fuzzy
+msgid "B<dpkg-statoverride> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: dpkg-statoverride.8:28
+#: dpkg-statoverride.8:19
 msgid ""
 "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a file when a package is installed. (note: I use the word `file' "
@@ -7194,125 +7247,102 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:32
+#: dpkg-statoverride.8:23
 msgid ""
 "B<dpkg-statoverride> is a utility to manage the list of stat overrides. It "
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:34
+#: dpkg-statoverride.8:25
 #, fuzzy, no-wrap
-msgid "B<--add>I< E<lt>userE<gt> E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
+msgid "B<--add>I< user group mode file>"
 msgstr "B<--debug>I< E<lt>filE<gt> >|I< >B<-D>I<E<lt>filE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:41
+#: dpkg-statoverride.8:32
 msgid ""
-"Add an override for B<E<lt>fileE<gt>>. B<E<lt>fileE<gt>> does not need to "
-"exist when this command is used; the override will be stored and used "
-"later.  Users and groups can be specified by their name (for example B<root> "
-"or B<nobody>), or by their number by prepending the number with a "
-"`B<#>' (for example B<#0> or B<#65534>)."
+"Add an override for B<file>. B<file> does not need to exist when this "
+"command is used; the override will be stored and used later.  Users and "
+"groups can be specified by their name (for example B<root> or B<nobody>), or "
+"by their number by prepending the number with a `B<#>' (for example B<#0> or "
+"B<#65534>)."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:44
+#: dpkg-statoverride.8:35
 msgid ""
-"If --update is specified and B<E<lt>fileE<gt>> exists, it is immediately set "
-"to the new owner and mode."
+"If --update is specified and B<file> exists, it is immediately set to the "
+"new owner and mode."
 msgstr ""
 
-# type: TP
-#: dpkg-statoverride.8:44
-#, fuzzy, no-wrap
-msgid "B<--remove>I< E<lt>fileE<gt>>"
-msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
-
 # type: Plain text
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 msgid ""
-"Remove an override for B<E<lt>fileE<gt>>, the status of B<E<lt>fileE<gt>> is "
-"left unchanged by this command."
+"Remove an override for B<file>, the status of B<file> is left unchanged by "
+"this command."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:48
+#: dpkg-statoverride.8:39
 #, fuzzy, no-wrap
-msgid "B<--list> [I<E<lt>glob-patternE<gt>>]"
+msgid "B<--list> [I<glob-pattern>]"
 msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 # type: Plain text
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:44
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob. If there are no overrides or none match the "
 "glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgstr ""
 
+# type: Plain text
+#: dpkg-statoverride.8:56
+#, fuzzy
+msgid ""
+"Change the directory of the dpkg database where the statoverride file is "
+"also stored. Defaults to I</var/lib/dpkg>."
+msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
+
 # type: TP
-#: dpkg-statoverride.8:53
+#: dpkg-statoverride.8:56
 #, fuzzy, no-wrap
 msgid "B<--force>"
 msgstr "B<--nocheck>"
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
 "is necessary to override an existing override."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:57
+#: dpkg-statoverride.8:60
 #, fuzzy, no-wrap
 msgid "B<--update>"
 msgstr "B<822-date>"
 
 # type: Plain text
-#: dpkg-statoverride.8:61
+#: dpkg-statoverride.8:64
 msgid ""
 "Immediately try to change the file to the new owner and mode if it exists."
 msgstr ""
 
-# type: Plain text
-#: dpkg-statoverride.8:64
-msgid "Be less verbose about what we do."
-msgstr ""
-
 # type: Plain text
 #: dpkg-statoverride.8:67
-#, fuzzy
-msgid "Show usage information."
-msgstr "Visar versionsinformation."
-
-# type: Plain text
-#: dpkg-statoverride.8:70
-msgid "Show program version and copyright."
+msgid "Be less verbose about what we do."
 msgstr ""
 
 # type: TP
-#: dpkg-statoverride.8:70
-#, fuzzy, no-wrap
-msgid "B<--admindir>"
-msgstr "B<--admindir=>I<kat>"
-
-# type: Plain text
-#: dpkg-statoverride.8:74
-#, fuzzy
-msgid ""
-"Change the directory of the dpkg database where the statoverride file is "
-"also stored. Defaults to I</var/lib/dpkg>."
-msgstr "Ändra platsen för B<dpkg>-databasen. Förval är I</var/lib/dpkg>."
-
-# type: TP
-#: dpkg-statoverride.8:76
+#: dpkg-statoverride.8:69
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/statoverride>"
 msgstr "I</var/lib/dpkg/status>"
 
 # type: Plain text
-#: dpkg-statoverride.8:81
+#: dpkg-statoverride.8:74
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the dpkg administration directory, along with other files "
@@ -7320,14 +7350,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:84
+#: dpkg-statoverride.8:77
 msgid ""
 "Note: dpkg-statoverride preserves the old copy of this file, with extension "
 "\"-old\", before replacing it with the new one."
 msgstr ""
 
 # type: Plain text
-#: dpkg-statoverride.8:90
+#: dpkg-statoverride.8:83
 #, fuzzy
 msgid "Copyright 2000 Wichert Akkerman"
 msgstr "Upphovsrättsskyddat 2001 Wichert Akkerman"
@@ -7427,6 +7457,12 @@ msgstr ""
 "antingen en flagga (precis samma som på kommandoraden, men utan inledande "
 "bindestreck) eller en kommentar (om den börjar med ett B<#>)."
 
+# type: TP
+#: dselect.1:52
+#, no-wrap
+msgid "B<--admindir>I< E<lt>directoryE<gt>>"
+msgstr "B<--admindir>I< E<lt>katalogE<gt>>"
+
 # type: Plain text
 #: dselect.1:57
 msgid ""
@@ -7671,6 +7707,11 @@ msgstr ""
 "Visar upphovsrättslig och licensinformation om B<dselect>, och ger lyckat "
 "avslut."
 
+# type: Plain text
+#: dselect.1:131
+msgid "Print version information and exit successfully."
+msgstr "Visar versionsinformation och ger lyckat avslut."
+
 # type: SH
 #: dselect.1:132
 #, no-wrap
@@ -8927,48 +8968,61 @@ msgid "start-stop-daemon - start and stop system daemon programs"
 msgstr "start-stop-daemon - startar och stoppar bakgrundsprocesser"
 
 # type: Plain text
-#: start-stop-daemon.8:11
-msgid "B<start-stop-daemon> B<-S>|B<--start> I<options> [B<-->] I<arguments>"
-msgstr "B<start-stop-daemon> B<-S>|B<--start> I<flaggor> [B<-->] I<parametrar>"
-
-# type: Plain text
-#: start-stop-daemon.8:15
-msgid "B<start-stop-daemon> B<-K>|B<--stop> I<options>"
+#: start-stop-daemon.8:9
+#, fuzzy
+msgid "B<start-stop-daemon> [I<options>] I<command>"
 msgstr "B<start-stop-daemon> B<-K>|B<--stop> I<flaggor>"
 
 # type: Plain text
-#: start-stop-daemon.8:18
-msgid "B<start-stop-daemon> B<-H>|B<--help>"
-msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+#: start-stop-daemon.8:17
+msgid ""
+"B<start-stop-daemon> is used to control the creation and termination of "
+"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
+"B<--name> options, B<start-stop-daemon> can be configured to find existing "
+"instances of a running process."
+msgstr ""
+"B<start-stop-daemon> används för att kontrollera hur processer på systemnivå "
+"skapas och avslutas. Med hjälp av flaggorna B<--exec>, B<--pidfile>, B<--"
+"user> och B<--name> kan B<start-stop-daemon> ställas in att hitta "
+"existerande instanser av en körande process."
 
 # type: Plain text
-#: start-stop-daemon.8:21
-msgid "B<start-stop-daemon> B<-V>|B<--version>"
-msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+#: start-stop-daemon.8:36
+#, fuzzy
+msgid ""
+"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
+"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
+"for any processes which match the process name, uid, and/or gid (if "
+"specified). Any matching process will prevent B<--start> from starting the "
+"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
+"specified. For daemons which have long-lived children which need to live "
+"through a B<--stop> you must specify a pidfile."
+msgstr ""
+"Observera att om inte B<--pidfile> anges kommer B<start-stop-daemon> att "
+"jobba på ett sätt som liknar B<killall(1).> B<start-stop-daemon> kommer att "
+"söka i processtabellen efter processer med motsvarande namn på processen, "
+"användar-id och/eller grupp-id (om sådant anges). Alla processer som stämmer "
+"överens kommer hindra B<--start> från att starta processen. Alla processer "
+"som stämmer överens kommer att sända KILL-signalen om B<--stop> anges.  För "
+"processer som har långlivade barn som måste överleva en B<--stop> måste du "
+"ange en pidfil."
 
 # type: Plain text
-#: start-stop-daemon.8:29
-msgid ""
-"B<start-stop-daemon> is used to control the creation and termination of "
-"system-level processes.  Using the B<--exec>, B<--pidfile>, B<--user>, and "
-"B<--name> options, B<start-stop-daemon> can be configured to find existing "
-"instances of a running process."
-msgstr ""
-"B<start-stop-daemon> används för att kontrollera hur processer på systemnivå "
-"skapas och avslutas. Med hjälp av flaggorna B<--exec>, B<--pidfile>, B<--"
-"user> och B<--name> kan B<start-stop-daemon> ställas in att hitta "
-"existerande instanser av en körande process."
+#: start-stop-daemon.8:38
+#, fuzzy, no-wrap
+msgid "B<-S>, B<--start> [B<-->] I<arguments>"
+msgstr "B<start-stop-daemon> B<-S>|B<--start> I<flaggor> [B<-->] I<parametrar>"
 
 # type: Plain text
-#: start-stop-daemon.8:48
+#: start-stop-daemon.8:55
+#, fuzzy
 msgid ""
-"With B<--start>, B<start-stop-daemon> checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> does "
-"nothing, and exits with error status 1 (0 if B<--oknodo> is specified).  If "
-"such a process does not exist, it starts an instance, using either the "
-"executable specified by B<--exec>, (or, if specified, by B<--startas>).  Any "
-"arguments given after B<--> on the command line are passed unmodified to the "
-"program being started."
+"Check for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> does nothing, and exits with error status 1 (0 if B<--"
+"oknodo> is specified).  If such a process does not exist, it starts an "
+"instance, using either the executable specified by B<--exec>, (or, if "
+"specified, by B<--startas>).  Any arguments given after B<--> on the command "
+"line are passed unmodified to the program being started."
 msgstr ""
 "Med B<--start> letar B<start-stop-daemon> efter om en angiven process "
 "existerar, och om så är fallet gör B<start-stop-daemon> ingenting och "
@@ -8978,15 +9032,22 @@ msgstr ""
 "ges efter B<--> på kommandoraden skickas omodiferade till programmet som "
 "startas."
 
+# type: TP
+#: start-stop-daemon.8:55
+#, fuzzy, no-wrap
+msgid "B<-K>, B<--stop>"
+msgstr "B<-o>|B<--oknodo>"
+
 # type: Plain text
-#: start-stop-daemon.8:68
+#: start-stop-daemon.8:73
+#, fuzzy
 msgid ""
-"With B<--stop>, B<start-stop-daemon> also checks for the existence of a "
-"specified process.  If such a process exists, B<start-stop-daemon> sends it "
-"the signal specified by B<--signal>, and exits with error status 0.  If such "
-"a process does not exist, B<start-stop-daemon> exits with error status 1 (0 "
-"if B<--oknodo> is specified). If B<--retry> is specified then B<start-stop-"
-"daemon> will check that the process(es) have terminated."
+"Checks for the existence of a specified process.  If such a process exists, "
+"B<start-stop-daemon> sends it the signal specified by B<--signal>, and exits "
+"with error status 0.  If such a process does not exist, B<start-stop-daemon> "
+"exits with error status 1 (0 if B<--oknodo> is specified). If B<--retry> is "
+"specified then B<start-stop-daemon> will check that the process(es) have "
+"terminated."
 msgstr ""
 "Med B<--stop> testar B<start-stop-daemon> också om den angivna processen "
 "existerar, och om så är fallet sänder B<start-stop-daemon> den signal som "
@@ -8995,35 +9056,38 @@ msgstr ""
 "oknodo> anges). Om B<--retry> anges kommer B<start-stop-daemon> kontrollera "
 "att processen har avslutats."
 
+# type: TP
+#: start-stop-daemon.8:73
+#, fuzzy, no-wrap
+msgid "B<-H>, B<--help>"
+msgstr "B<-H>|B<--help>"
+
 # type: Plain text
-#: start-stop-daemon.8:87
+#: start-stop-daemon.8:76
 #, fuzzy
-msgid ""
-"Note: unless B<--pidfile> is specified, B<start-stop-daemon> behaves similar "
-"to B<killall>(1).  B<start-stop-daemon> will scan the process table looking "
-"for any processes which match the process name, uid, and/or gid (if "
-"specified). Any matching process will prevent B<--start> from starting the "
-"daemon. All matching processes will be sent the KILL signal if B<--stop> is "
-"specified. For daemons which have long-lived children which need to live "
-"through a B<--stop> you must specify a pidfile."
-msgstr ""
-"Observera att om inte B<--pidfile> anges kommer B<start-stop-daemon> att "
-"jobba på ett sätt som liknar B<killall(1).> B<start-stop-daemon> kommer att "
-"söka i processtabellen efter processer med motsvarande namn på processen, "
-"användar-id och/eller grupp-id (om sådant anges). Alla processer som stämmer "
-"överens kommer hindra B<--start> från att starta processen. Alla processer "
-"som stämmer överens kommer att sända KILL-signalen om B<--stop> anges.  För "
-"processer som har långlivade barn som måste överleva en B<--stop> måste du "
-"ange en pidfil."
+msgid "Show usage information and exit."
+msgstr "Visar versionsinformation."
 
 # type: TP
-#: start-stop-daemon.8:90
-#, no-wrap
-msgid "B<-x>|B<--exec> I<executable>"
+#: start-stop-daemon.8:76
+#, fuzzy, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>|B<--version>"
+
+# type: Plain text
+#: start-stop-daemon.8:79
+#, fuzzy
+msgid "Show the program version and exit."
+msgstr "Skriv ut versionsinformation och avsluta sedan."
+
+# type: TP
+#: start-stop-daemon.8:81
+#, fuzzy, no-wrap
+msgid "B<-x>, B<--exec> I<executable>"
 msgstr "B<-x>|B<--exec> I<programfil>"
 
 # type: Plain text
-#: start-stop-daemon.8:94
+#: start-stop-daemon.8:85
 msgid ""
 "Check for processes that are instances of this executable (according to B</"
 "proc/>I<pid>B</exe>)."
@@ -9032,24 +9096,24 @@ msgstr ""
 ">I<pid>B</exe>)."
 
 # type: TP
-#: start-stop-daemon.8:94
-#, no-wrap
-msgid "B<-p>|B<--pidfile> I<pid-file>"
+#: start-stop-daemon.8:85
+#, fuzzy, no-wrap
+msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>|B<--pidfile> I<pidfil>"
 
 # type: Plain text
-#: start-stop-daemon.8:98
+#: start-stop-daemon.8:89
 msgid "Check whether a process has created the file I<pid-file>."
 msgstr "Sök efter processer vars process-id anges i I<pidfil>."
 
 # type: TP
-#: start-stop-daemon.8:98
-#, no-wrap
-msgid "B<-u>|B<--user> I<username>|I<uid>"
+#: start-stop-daemon.8:89
+#, fuzzy, no-wrap
+msgid "B<-u>, B<--user> I<username>|I<uid>"
 msgstr "B<-u>|B<--user> I<användarnamn>|I<användar-id>"
 
 # type: Plain text
-#: start-stop-daemon.8:104
+#: start-stop-daemon.8:95
 msgid ""
 "Check for processes owned by the user specified by I<username> or I<uid>."
 msgstr ""
@@ -9057,24 +9121,24 @@ msgstr ""
 "eller I<användar-id>."
 
 # type: TP
-#: start-stop-daemon.8:104
-#, no-wrap
-msgid "B<-g>|B<--group> I<group>|I<gid>"
+#: start-stop-daemon.8:95
+#, fuzzy, no-wrap
+msgid "B<-g>, B<--group> I<group>|I<gid>"
 msgstr "B<-g>|B<--group> I<grupp>|I<grupp-id>"
 
 # type: Plain text
-#: start-stop-daemon.8:107
+#: start-stop-daemon.8:98
 msgid "Change to I<group> or I<gid> when starting the process."
 msgstr "Byt till I<grupp> eller I<grupp-id> när processen startas."
 
 # type: TP
-#: start-stop-daemon.8:107
-#, no-wrap
-msgid "B<-n>|B<--name> I<process-name>"
+#: start-stop-daemon.8:98
+#, fuzzy, no-wrap
+msgid "B<-n>, B<--name> I<process-name>"
 msgstr "B<-n>|B<--name> I<processnamn>"
 
 # type: Plain text
-#: start-stop-daemon.8:113
+#: start-stop-daemon.8:104
 msgid ""
 "Check for processes with the name I<process-name> (according to B</proc/"
 ">I<pid>B</stat>)."
@@ -9083,13 +9147,13 @@ msgstr ""
 "stat>)."
 
 # type: TP
-#: start-stop-daemon.8:113
-#, no-wrap
-msgid "B<-s>|B<--signal> I<signal>"
+#: start-stop-daemon.8:104
+#, fuzzy, no-wrap
+msgid "B<-s>, B<--signal> I<signal>"
 msgstr "B<-s>|B<--signal> I<signal>"
 
 # type: Plain text
-#: start-stop-daemon.8:118
+#: start-stop-daemon.8:109
 msgid ""
 "With B<--stop>, specifies the signal to send to processes being stopped "
 "(default 15)."
@@ -9098,13 +9162,13 @@ msgstr ""
 "processen som stoppas (förval är 15)."
 
 # type: TP
-#: start-stop-daemon.8:118
-#, no-wrap
-msgid "B<-R>|B<--retry> I<timeout>|I<schedule>"
+#: start-stop-daemon.8:109
+#, fuzzy, no-wrap
+msgid "B<-R>, B<--retry> I<timeout>|I<schedule>"
 msgstr "B<-R>|B<--retry> I<tidsgräns>|I<schema>"
 
 # type: Plain text
-#: start-stop-daemon.8:128
+#: start-stop-daemon.8:119
 msgid ""
 "With B<--stop>, specifies that B<start-stop-daemon> is to check whether the "
 "process(es)  do finish. It will check repeatedly whether any matching "
@@ -9117,7 +9181,7 @@ msgstr ""
 "avslutar kommer programmet utföra ytterligare kommandon enligt schemat."
 
 # type: Plain text
-#: start-stop-daemon.8:139
+#: start-stop-daemon.8:130
 msgid ""
 "If I<timeout> is specified instead of I<schedule> then the schedule "
 "I<signal>B</>I<timeout>B</KILL/>I<timeout> is used, where I<signal> is the "
@@ -9128,7 +9192,7 @@ msgstr ""
 "anges med B<--signal>."
 
 # type: Plain text
-#: start-stop-daemon.8:155
+#: start-stop-daemon.8:146
 msgid ""
 "I<schedule> is a list of at least two items separated by slashes (B</>); "
 "each item may be B<->I<signal-number> or [B<->]I<signal-name>, which means "
@@ -9144,7 +9208,7 @@ msgstr ""
 "så behövs."
 
 # type: Plain text
-#: start-stop-daemon.8:165
+#: start-stop-daemon.8:156
 msgid ""
 "If the end of the schedule is reached and B<forever> is not specified, then "
 "B<start-stop-daemon> exits with error status 2.  If a schedule is specified, "
@@ -9155,13 +9219,13 @@ msgstr ""
 "angiven med B<--signal> att ignoreras."
 
 # type: TP
-#: start-stop-daemon.8:165
-#, no-wrap
-msgid "B<-a>|B<--startas> I<pathname>"
+#: start-stop-daemon.8:156
+#, fuzzy, no-wrap
+msgid "B<-a>, B<--startas> I<pathname>"
 msgstr "B<-a>|B<--startas> I<sökväg>"
 
 # type: Plain text
-#: start-stop-daemon.8:173
+#: start-stop-daemon.8:164
 msgid ""
 "With B<--start>, start the process specified by I<pathname>.  If not "
 "specified, defaults to the argument given to B<--exec>."
@@ -9170,13 +9234,13 @@ msgstr ""
 "skall startas. Om den inte anges används parametern som gavs till B<--exec>."
 
 # type: TP
-#: start-stop-daemon.8:173
-#, no-wrap
-msgid "B<-t>|B<--test>"
+#: start-stop-daemon.8:164
+#, fuzzy, no-wrap
+msgid "B<-t>, B<--test>"
 msgstr "B<-t>|B<--test>"
 
 # type: Plain text
-#: start-stop-daemon.8:177
+#: start-stop-daemon.8:168
 msgid ""
 "Print actions that would be taken and set appropriate return value, but take "
 "no action."
@@ -9185,36 +9249,36 @@ msgstr ""
 "ingenting."
 
 # type: TP
-#: start-stop-daemon.8:177
-#, no-wrap
-msgid "B<-o>|B<--oknodo>"
+#: start-stop-daemon.8:168
+#, fuzzy, no-wrap
+msgid "B<-o>, B<--oknodo>"
 msgstr "B<-o>|B<--oknodo>"
 
 # type: Plain text
-#: start-stop-daemon.8:180
+#: start-stop-daemon.8:171
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
 "Returnerar felstatus 0 i stället för 1 om ingen åtgärd utförs/skulle utförts."
 
 # type: TP
-#: start-stop-daemon.8:180
-#, no-wrap
-msgid "B<-q>|B<--quiet>"
+#: start-stop-daemon.8:171
+#, fuzzy, no-wrap
+msgid "B<-q>, B<--quiet>"
 msgstr "B<-q>|B<--quiet>"
 
 # type: Plain text
-#: start-stop-daemon.8:183
+#: start-stop-daemon.8:174
 msgid "Do not print informational messages; only display error messages."
 msgstr "Skriv inte informationsmeddelanden; visa endast felmeddelanden."
 
 # type: TP
-#: start-stop-daemon.8:183
-#, no-wrap
-msgid "B<-c>|B<--chuid> I<username>|I<uid>"
+#: start-stop-daemon.8:174
+#, fuzzy, no-wrap
+msgid "B<-c >,B< --chuid >I<username>|I<uid>"
 msgstr "B<-c>|B<--chuid> I<användarnamn>|I<användar-id>"
 
 # type: Plain text
-#: start-stop-daemon.8:200
+#: start-stop-daemon.8:191
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -9235,13 +9299,13 @@ msgstr ""
 "\")."
 
 # type: TP
-#: start-stop-daemon.8:200
-#, no-wrap
-msgid "B<-r>|B<--chroot> I<root>"
+#: start-stop-daemon.8:191
+#, fuzzy, no-wrap
+msgid "B<-r>, B<--chroot> I<root>"
 msgstr "B<-r>|B<--chroot> I<rot>"
 
 # type: Plain text
-#: start-stop-daemon.8:206
+#: start-stop-daemon.8:197
 msgid ""
 "Chdir and chroot to I<root> before starting the process. Please note that "
 "the pidfile is also written after the chroot."
@@ -9250,13 +9314,13 @@ msgstr ""
 "pidfilen skrivs efter chroot har utförts."
 
 # type: TP
-#: start-stop-daemon.8:206
-#, no-wrap
-msgid "B<-d>|B<--chdir> I<path>"
+#: start-stop-daemon.8:197
+#, fuzzy, no-wrap
+msgid "B<-d>, B<--chdir> I<path>"
 msgstr "B<-d>|B<--chdir> I<sökväg>"
 
 # type: Plain text
-#: start-stop-daemon.8:214
+#: start-stop-daemon.8:205
 msgid ""
 "Chdir to I<path> before starting the process. This is done after the chroot "
 "if the B<-r>|B<--chroot> option is set. When not specified, start-stop-"
@@ -9267,13 +9331,13 @@ msgstr ""
 "stop-daemon byta till rotkatalogen innan processen startas."
 
 # type: TP
-#: start-stop-daemon.8:214
-#, no-wrap
-msgid "B<-b>|B<--background>"
+#: start-stop-daemon.8:205
+#, fuzzy, no-wrap
+msgid "B<-b>, B<--background>"
 msgstr "B<-b>|B<--background>"
 
 # type: Plain text
-#: start-stop-daemon.8:226
+#: start-stop-daemon.8:217
 #, fuzzy
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
@@ -9294,36 +9358,36 @@ msgstr ""
 "koden för detta på egen hand."
 
 # type: TP
-#: start-stop-daemon.8:226
-#, no-wrap
-msgid "B<-N>|B<--nicelevel> I<int>"
+#: start-stop-daemon.8:217
+#, fuzzy, no-wrap
+msgid "B<-N>, B<--nicelevel> I<int>"
 msgstr "B<-N>|B<--nicelevel> I<heltal>"
 
 # type: Plain text
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 msgid "This alters the priority of the process before starting it."
 msgstr "Detta ändrar prioriteten på processen innan den startas."
 
 # type: TP
-#: start-stop-daemon.8:229
+#: start-stop-daemon.8:220
 #, fuzzy, no-wrap
-msgid "B<-k>|B<--umask> I<mask>"
+msgid "B<-k>, B<--umask> I<mask>"
 msgstr "B<-s>|B<--signal> I<signal>"
 
 # type: Plain text
-#: start-stop-daemon.8:232
+#: start-stop-daemon.8:223
 #, fuzzy
 msgid "This sets the umask of the process before starting it."
 msgstr "Detta ändrar prioriteten på processen innan den startas."
 
 # type: TP
-#: start-stop-daemon.8:232
-#, no-wrap
-msgid "B<-m>|B<--make-pidfile>"
+#: start-stop-daemon.8:223
+#, fuzzy, no-wrap
+msgid "B<-m>, B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: start-stop-daemon.8:247
+#: start-stop-daemon.8:238
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -9344,40 +9408,18 @@ msgstr ""
 "background>."
 
 # type: TP
-#: start-stop-daemon.8:247
-#, no-wrap
-msgid "B<-v>|B<--verbose>"
+#: start-stop-daemon.8:238
+#, fuzzy, no-wrap
+msgid "B<-v>, B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: start-stop-daemon.8:250
+#: start-stop-daemon.8:241
 msgid "Print verbose informational messages."
 msgstr "Skriv ut pratsamma informationsmeddelanden."
 
-# type: TP
-#: start-stop-daemon.8:250
-#, no-wrap
-msgid "B<-H>|B<--help>"
-msgstr "B<-H>|B<--help>"
-
-# type: Plain text
-#: start-stop-daemon.8:253
-msgid "Print help information; then exit."
-msgstr "Skriv ut hjälpinformation och avsluta sedan."
-
-# type: TP
-#: start-stop-daemon.8:253
-#, no-wrap
-msgid "B<-V>|B<--version>"
-msgstr "B<-V>|B<--version>"
-
-# type: Plain text
-#: start-stop-daemon.8:256
-msgid "Print version information; then exit."
-msgstr "Skriv ut versionsinformation och avsluta sedan."
-
 # type: Plain text
-#: start-stop-daemon.8:260
+#: start-stop-daemon.8:245
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -9386,7 +9428,7 @@ msgstr ""
 "en tidigare version av Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: start-stop-daemon.8:262
+#: start-stop-daemon.8:247
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."
@@ -9400,12 +9442,6 @@ msgstr ""
 msgid "update-alternatives"
 msgstr ""
 
-# type: TH
-#: update-alternatives.8:8
-#, fuzzy, no-wrap
-msgid "2006-11-24"
-msgstr "2006-02-28"
-
 # type: Plain text
 #: update-alternatives.8:11
 msgid ""
@@ -9413,61 +9449,20 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:20
-msgid ""
-"B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-"priority> [B<--slave> I<genname symlink> I<altern>]..."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:25
-msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:30
-msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:34
-msgid "B<update-alternatives> [I<options>] B<--all>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:39
-msgid "B<update-alternatives> [I<options>] B<--auto> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:44
-msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:49
-msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:54
-msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:59
-msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-msgstr ""
+#: update-alternatives.8:16
+#, fuzzy
+msgid "B<update-alternatives> [I<options>] I<command>"
+msgstr "B<dpkg> [I<flaggor>] I<åtgärd>"
 
 # type: Plain text
-#: update-alternatives.8:64
+#: update-alternatives.8:21
 msgid ""
 "B<update-alternatives> creates, removes, maintains and displays information "
 "about the symbolic links comprising the Debian alternatives system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:72
+#: update-alternatives.8:29
 msgid ""
 "It is possible for several programs fulfilling the same or similar functions "
 "to be installed on a single system at the same time.  For example, many "
@@ -9478,7 +9473,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:94
+#: update-alternatives.8:51
 msgid ""
 "Debian's alternatives system aims to solve this problem.  A generic name in "
 "the filesystem is shared by all files providing interchangeable "
@@ -9493,7 +9488,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:104
+#: update-alternatives.8:61
 msgid ""
 "The generic name is not a direct symbolic link to the selected alternative.  "
 "Instead, it is a symbolic link to a name in the I<alternatives> "
@@ -9504,7 +9499,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:116
+#: update-alternatives.8:73
 msgid ""
 "When each package providing a file with a particular functionality is "
 "installed, changed or removed, B<update-alternatives> is called to update "
@@ -9514,7 +9509,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:135
+#: update-alternatives.8:92
 msgid ""
 "It is often useful for a number of alternatives to be synchronised, so that "
 "they are changed as a group; for example, when several versions of the B<vi>"
@@ -9526,7 +9521,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:143
+#: update-alternatives.8:100
 msgid ""
 "Each link group is, at any given time, in one of two modes: automatic or "
 "manual.  When a group is in automatic mode, the alternatives system will "
@@ -9537,7 +9532,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:152
+#: update-alternatives.8:109
 msgid ""
 "Link groups are in automatic mode when they are first introduced to the "
 "system.  If the system administrator makes changes to the system's automatic "
@@ -9547,7 +9542,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:159
+#: update-alternatives.8:116
 msgid ""
 "Each alternative has a I<priority> associated with it.  When a link group is "
 "in automatic mode, the alternatives pointed to by members of the group will "
@@ -9555,7 +9550,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:175
+#: update-alternatives.8:132
 msgid ""
 "When using the I<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master link. "
@@ -9567,14 +9562,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:179
+#: update-alternatives.8:136
 msgid ""
 "If you want to configure non-interactively you can use the I<--set> option "
 "instead (see below)."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:190
+#: update-alternatives.8:147
 msgid ""
 "Different packages providing the same file need to do so B<cooperatively>.  "
 "That is - the usage of B<update-alternatives> is B<mandatory> for all "
@@ -9583,39 +9578,39 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: update-alternatives.8:191
+#: update-alternatives.8:148
 #, no-wrap
 msgid "TERMINOLOGY"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 msgid ""
 "Since the activities of B<update-alternatives> are quite involved, some "
 "specific terms will help to explain its operation."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:196
+#: update-alternatives.8:153
 #, no-wrap
 msgid "generic name"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 msgid ""
 "A name, like I</usr/bin/editor>, which refers, via the alternatives system, "
 "to one of a number of files of similar function."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:202
+#: update-alternatives.8:159
 #, no-wrap
 msgid "symlink"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 msgid ""
 "Without any further qualification, this means a symbolic link in the "
 "alternatives directory: one which the system administrator is expected to "
@@ -9623,86 +9618,86 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:207
+#: update-alternatives.8:164
 #, no-wrap
 msgid "alternative"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 msgid ""
 "The name of a specific file in the filesystem, which may be made accessible "
 "via a generic name using the alternatives system."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:211
+#: update-alternatives.8:168
 #, no-wrap
 msgid "alternatives directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 msgid "A directory, by default I</etc/alternatives>, containing the symlinks."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:216
+#: update-alternatives.8:173
 #, no-wrap
 msgid "administrative directory"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 msgid ""
 "A directory, by default I</var/lib/dpkg/alternatives>, containing B<update-"
 "alternatives>' state information."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:223
+#: update-alternatives.8:180
 #, no-wrap
 msgid "link group"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 msgid "A set of related symlinks, intended to be updated as a group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:226
+#: update-alternatives.8:183
 #, no-wrap
 msgid "master link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 msgid ""
 "The link in a link group which determines how the other links in the group "
 "are configured."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:230
+#: update-alternatives.8:187
 #, no-wrap
 msgid "slave link"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 msgid ""
 "A link in a link group which is controlled by the setting of the master link."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:234
+#: update-alternatives.8:191
 #, no-wrap
 msgid "automatic mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 msgid ""
 "When a link group is in automatic mode, the alternatives system ensures that "
 "the links in the group point to the highest priority alternative appropriate "
@@ -9710,141 +9705,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:240
+#: update-alternatives.8:197
 #, no-wrap
 msgid "manual mode"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:245
+#: update-alternatives.8:202
 msgid ""
 "When a link group is in manual mode, the alternatives system will not make "
 "any changes to the system administrator's settings."
 msgstr ""
 
-# type: Plain text
-#: update-alternatives.8:257
-msgid ""
-"There are several packages which provide a text editor compatible with "
-"B<vi>, for example B<nvi> and B<vim>.  Which one is used is controlled by "
-"the link group B<vi>, which includes links for the program itself and the "
-"associated manpage."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:263
-msgid ""
-"To display the available packages which provide B<vi> and the current "
-"setting for it, use the I<--display> action:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:266
-msgid "update-alternatives --display vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:272
-msgid ""
-"To choose a particular B<vi> implementation, use this command as root and "
-"then select a number from the list:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:275
-msgid "update-alternatives --config vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:280
-msgid ""
-"To go back to having the B<vi> implementation chosen automatically, do this "
-"as root:"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:283
-msgid "update-alternatives --auto vi"
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:290
-msgid ""
-"Exactly one action must be specified if B<update-alternatives> is to perform "
-"any meaningful task.  Any number of the common options may be specified "
-"together with any action."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:291
-#, fuzzy, no-wrap
-msgid "B<--verbose>"
-msgstr "B<-v>|B<--verbose>"
-
-# type: Plain text
-#: update-alternatives.8:296
-msgid "Generate more comments about what B<update-alternatives> is doing."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:300
-msgid ""
-"Don't generate any comments unless errors occur.  This option is not yet "
-"implemented."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:304
-msgid ""
-"Don't actually do anything, just say what would be done.  This option is not "
-"yet implemented."
-msgstr ""
-
-# type: Plain text
-#: update-alternatives.8:307
-#, fuzzy
-msgid "Give some usage information."
-msgstr "Visar versionsinformation."
-
-# type: Plain text
-#: update-alternatives.8:312
-msgid "Tell which version of B<update-alternatives> this is."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:312
-#, fuzzy, no-wrap
-msgid "B<--altdir> I<directory>"
-msgstr "B<--depotdir>I< katalog>"
-
-# type: Plain text
-#: update-alternatives.8:316
-msgid ""
-"Specifies the alternatives directory, when this is to be different from the "
-"default."
-msgstr ""
-
-# type: TP
-#: update-alternatives.8:316
-#, fuzzy, no-wrap
-msgid "B<--admindir> I<directory>"
-msgstr "B<--admindir=>I<kat>"
-
-# type: Plain text
-#: update-alternatives.8:320
-msgid ""
-"Specifies the administrative directory, when this is to be different from "
-"the default."
-msgstr ""
-
 # type: TP
-#: update-alternatives.8:323
+#: update-alternatives.8:204
 #, no-wrap
 msgid "B<--install> I<genname symlink altern priority> [B<--slave> I<genname symlink altern>] ..."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:338
+#: update-alternatives.8:219
 msgid ""
 "Add a group of alternatives to the system.  I<genname> is the generic name "
 "for the master link, I<symlink> is the name of its symlink in the "
@@ -9856,7 +9736,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 msgid ""
 "If the master symlink specified exists already in the alternatives system's "
 "records, the information supplied will be added as a new set of alternatives "
@@ -9868,26 +9748,26 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:349
+#: update-alternatives.8:230
 #, no-wrap
 msgid "B<--set> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 msgid ""
 "Set the program I<path> as alternative for I<name.> This is equivalent to "
 "I<--config> but is non-interactive and thus scriptable."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:358
+#: update-alternatives.8:239
 #, no-wrap
 msgid "B<--remove> I<name path>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 msgid ""
 "Remove an alternative and all of its associated slave links.  I<name> is a "
 "name in the alternatives directory, and I<path> is an absolute filename to "
@@ -9900,37 +9780,37 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:378
+#: update-alternatives.8:259
 #, fuzzy, no-wrap
 msgid "B<--remove-all> I<name>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 msgid ""
 "Remove all alternatives and all of their associated slave links.  I<name> is "
 "a name in the alternatives directory."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:383
+#: update-alternatives.8:264
 #, fuzzy, no-wrap
 msgid "B<--all>"
 msgstr "B<--old>"
 
 # type: Plain text
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 msgid "Call B<--config> on all alternatives."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:386
+#: update-alternatives.8:267
 #, fuzzy, no-wrap
 msgid "B<--auto> I<link>"
 msgstr "B<--auto>, B<-a>"
 
 # type: Plain text
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 msgid ""
 "Switch the master symlink I<link> to automatic mode.  In the process, this "
 "symlink and its slaves are updated to point to the highest priority "
@@ -9938,13 +9818,13 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:393
+#: update-alternatives.8:274
 #, fuzzy, no-wrap
 msgid "B<--display> I<link>"
 msgstr "B<--discard>, B<-d>"
 
 # type: Plain text
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 msgid ""
 "Display information about the link group of which I<link> is the master "
 "link.  Information displayed includes the group's mode (auto or manual), "
@@ -9954,24 +9834,24 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:404
+#: update-alternatives.8:285
 #, fuzzy, no-wrap
 msgid "B<--list> I<link>"
 msgstr "B<--listq>, B<-l>"
 
 # type: Plain text
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 msgid "Display all targets of the link group."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:407
+#: update-alternatives.8:288
 #, fuzzy, no-wrap
 msgid "B<--config> I<link>"
 msgstr "B<--log=>I<filename>"
 
 # type: Plain text
-#: update-alternatives.8:414
+#: update-alternatives.8:295
 msgid ""
 "Show available alternatives for a link group and allow the user to "
 "interactively select which one to use. The link group is updated and taken "
@@ -9979,57 +9859,102 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:416
+#: update-alternatives.8:303
+#, fuzzy, no-wrap
+msgid "B<--altdir>I< directory>"
+msgstr "B<--depotdir>I< katalog>"
+
+# type: Plain text
+#: update-alternatives.8:307
+msgid ""
+"Specifies the alternatives directory, when this is to be different from the "
+"default."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:311
+msgid ""
+"Specifies the administrative directory, when this is to be different from "
+"the default."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:311
+#, fuzzy, no-wrap
+msgid "B<--verbose>"
+msgstr "B<-v>|B<--verbose>"
+
+# type: Plain text
+#: update-alternatives.8:316
+msgid "Generate more comments about what B<update-alternatives> is doing."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:320
+msgid ""
+"Don't generate any comments unless errors occur.  This option is not yet "
+"implemented."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:324
+msgid ""
+"Don't actually do anything, just say what would be done.  This option is not "
+"yet implemented."
+msgstr ""
+
+# type: TP
+#: update-alternatives.8:326
 #, no-wrap
 msgid "I</etc/alternatives/>"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 msgid ""
 "The default alternatives directory.  Can be overridden by the B<--altdir> "
 "option."
 msgstr ""
 
 # type: TP
-#: update-alternatives.8:422
+#: update-alternatives.8:332
 #, fuzzy, no-wrap
 msgid "I</var/lib/dpkg/alternatives/>"
 msgstr "B</var/lib/dpkg/parts>"
 
 # type: Plain text
-#: update-alternatives.8:428
+#: update-alternatives.8:338
 msgid ""
 "The default administration directory.  Can be overridden by the B<--"
 "admindir> option."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:430
+#: update-alternatives.8:340
 #, no-wrap
 msgid "0"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 msgid "The requested action was successfully performed."
 msgstr ""
 
 # type: IP
-#: update-alternatives.8:432
+#: update-alternatives.8:342
 #, no-wrap
 msgid "2"
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:435
+#: update-alternatives.8:345
 msgid ""
 "Problems were encountered whilst parsing the command line or performing the "
 "action."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:445
+#: update-alternatives.8:355
 msgid ""
 "B<update-alternatives> chatters incessantly about its activities on its "
 "standard output channel.  If problems occur, B<update-alternatives> outputs "
@@ -10039,14 +9964,59 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:449
+#: update-alternatives.8:361
+msgid ""
+"There are several packages which provide a text editor compatible with "
+"B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the "
+"link group B<vi>, which includes links for the program itself and the "
+"associated manpage."
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:364
+msgid ""
+"To display the available packages which provide B<vi> and the current "
+"setting for it, use the I<--display> action:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:367
+msgid "B<update-alternatives --display vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:371
+msgid ""
+"To choose a particular B<vi> implementation, use this command as root and "
+"then select a number from the list:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:374
+msgid "B<update-alternatives --config vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:378
+msgid ""
+"To go back to having the B<vi> implementation chosen automatically, do this "
+"as root:"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:381
+msgid "B<update-alternatives --auto vi>"
+msgstr ""
+
+# type: Plain text
+#: update-alternatives.8:386
 msgid ""
 "If you find a bug, please report it using the Debian bug-tracking system, "
 "or, if that is not possible, email the author directly."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:454
+#: update-alternatives.8:391
 msgid ""
 "If you find any discrepancy between the operation of B<update-alternatives> "
 "and this manual page, it is a bug, either in the implementation or the "
@@ -10054,7 +10024,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:459
+#: update-alternatives.8:396
 #, fuzzy
 msgid ""
 "Debian update-alternatives is copyright 1995 Ian Jackson. It is free "
@@ -10065,7 +10035,7 @@ msgstr ""
 "senare för kopieringsvillkor. Det finns INGEN garanti."
 
 # type: Plain text
-#: update-alternatives.8:463
+#: update-alternatives.8:400
 #, fuzzy
 msgid ""
 "This manual page is copyright 1997/98 Charles Briscoe-Smith.  This is free "
@@ -10076,17 +10046,360 @@ msgstr ""
 "senare för kopieringsvillkor. Det finns INGEN garanti."
 
 # type: Plain text
-#: update-alternatives.8:465
+#: update-alternatives.8:402
 msgid ""
 "You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian "
 "system."
 msgstr ""
 
 # type: Plain text
-#: update-alternatives.8:468
+#: update-alternatives.8:405
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+# type: Plain text
+#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+#~ msgstr "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
+
+# type: Plain text
+#~ msgid ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+#~ msgstr ""
+#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
+#~ "section 5.2.14,"
+
+# type: Plain text
+#~ msgid "B<date>(1)."
+#~ msgstr "B<date>(1)."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<822-date> and this manpage were written by Ian Jackson. They are hereby "
+#~ "placed by him into the public domain."
+#~ msgstr ""
+#~ "B<822-date> och denna manualsida skrevs av Ian Jackson. De är härmed av "
+#~ "honom släppta som allmängods (public domain)."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Output the help screen and exit successfully."
+#~ msgstr "Visar en kort hjälptext och ger lyckat avslut."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Output version and exit successfully."
+#~ msgstr "Visar versionsinformation och ger lyckat avslut."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-23"
+#~ msgstr "2006-02-28"
+
+# type: Plain text
+#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
+#~ msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<arkiv>"
+
+# type: Plain text
+#~ msgid ""
+#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
+#~ msgstr "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<arkivkatalog>"
+
+# type: SH
+#, fuzzy
+#~ msgid "ACTION OPTIONS"
+#~ msgstr ""
+#~ "#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "HANDLINGSFLAGGOR\n"
+#~ "#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "ÅTGÄRDSFLAGGOR"
+
+# type: TP
+#~ msgid "B<--build>, B<-b>"
+#~ msgstr "B<--build>, B<-b>"
+
+# type: Plain text
+#~ msgid ""
+#~ "You can specify the compression level used by adding a B<-z#> option.  "
+#~ "B<dpkg-deb> will pass that option on to gzip."
+#~ msgstr ""
+#~ "Du kan ange komprimeringsnivån genom att lägga till flaggan B<-z#>. "
+#~ "B<dpkg-deb> kommer sända vidare den flaggan till gzip."
+
+# type: TP
+#~ msgid "B<--info>, B<-I>"
+#~ msgstr "B<--info>, B<-I>"
+
+# type: TP
+#~ msgid "B<--show>, B<-W>"
+#~ msgstr "B<--show>, B<-W>"
+
+# type: TP
+#~ msgid "B<--field>, B<-f>"
+#~ msgstr "B<--field>, B<-f>"
+
+# type: TP
+#~ msgid "B<--contents>, B<-c>"
+#~ msgstr "B<--contents>, B<-c>"
+
+# type: TP
+#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
+
+# type: TP
+#~ msgid "B<--fsys-tarfile>"
+#~ msgstr "B<--fsys-tarfile>"
+
+# type: TP
+#~ msgid "B<--control>, B<-e>"
+#~ msgstr "B<--control>, B<-e>"
+
+# type: TP
+#~ msgid "B<--help>, B<-h>"
+#~ msgstr "B<--help>, B<-h>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Visar B<dpkg-deb>s användningsmeddelande, vilket sammanfattar dess "
+#~ "flaggor och deras användning."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-deb>'s version number."
+#~ msgstr "Visar B<dpkg-deb>s versionnummer."
+
+# type: TP
+#~ msgid "B<--licence>"
+#~ msgstr "B<--licence>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported)."
+#~ msgstr ""
+#~ "Visar information om B<dpkg-deb>s upphovsrätt, licensinformation och "
+#~ "avsaknad av garanti. (Den amerikanskengelska stavningen B<--license> "
+#~ "stöds också.)"
+
+# type: SH
+#~ msgid "OTHER OPTIONS"
+#~ msgstr "ANDRA FLAGGOR"
+
+# type: TP
+#~ msgid "B<--debug>, B<-D>"
+#~ msgstr "B<--debug>, B<-D>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Output short usage instructions, and exit successfully."
+#~ msgstr "Visar versionsinformation och ger lyckat avslut."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Output program name and version and exit successfully."
+#~ msgstr "Visar versionsinformation och ger lyckat avslut."
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-h, --help>"
+#~ msgstr "B<--help>"
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "Print copyright information and (a reference to GNU) license information "
+#~ "and exit successfully."
+#~ msgstr ""
+#~ "Visar upphovsrättslig och licensinformation om B<dselect>, och ger lyckat "
+#~ "avslut."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-l>|B<--list> I<paketnamnsmönster> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-W>|B<--show> I<paketnamnsmönster> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-s>|B<--status> I<paketnamn> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-L>|B<--listfiles> I<paketnamn> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
+#~ msgstr "B<dpkg-query> B<-S>|B<--search> I<filnamnssökmönster> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
+#~ msgstr "B<dpkg-query> B<-p>|B<--print-avail> I<paketnamn> ..."
+
+# type: TP
+#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
+#~ msgstr "B<dpkg-query> B<--licence>|B<--license>"
+
+# type: Plain text
+#~ msgid "B<dpkg-query> B<--version>"
+#~ msgstr "B<dpkg-query> B<--version>"
+
+# type: Plain text
+#~ msgid "Display licence and copyright information."
+#~ msgstr "Visar licensvillkor och upphovsrättsinformation."
+
+# type: Plain text
+#~ msgid "Display version information."
+#~ msgstr "Visar versionsinformation."
+
+# type: TH
+#, fuzzy
+#~ msgid "2006-05-10"
+#~ msgstr "2006-04-09"
+
+# type: SH
+#, fuzzy
+#~ msgid "COMMON OPTIONS"
+#~ msgstr ""
+#~ "#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "HANDLINGSFLAGGOR\n"
+#~ "#-#-#-#-#  sv.po (dpkg man pages)  #-#-#-#-#\n"
+#~ "ÅTGÄRDSFLAGGOR"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-SOURCE OPTIONS"
+#~ msgstr "ANDRA FLAGGOR"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-x>"
+#~ msgstr "B<-G>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<-IE<lt>filenameE<gt>>"
+#~ msgstr "B<--log=>I<filename>"
+
+# type: SH
+#, fuzzy
+#~ msgid "dpkg-GENCONTROL OPTIONS"
+#~ msgstr "ANDRA FLAGGOR"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
+#~ msgstr "B<822-date> tar inga flaggor eller parametrar."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
+#~ msgstr "B<822-date> tar inga flaggor eller parametrar."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
+#~ msgstr "B<822-date> tar inga flaggor eller parametrar."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
+#~ "arguments."
+#~ msgstr "B<822-date> tar inga flaggor eller parametrar."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or "
+#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
+#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
+#~ msgstr ""
+#~ "Detta är fri programvara; se GNU General Public License version 2 eller "
+#~ "senare för kopieringsvillkor. Det finns INGEN garanti."
+
+# type: Plain text
+#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
+#~ msgstr "B<dpkg-split> B<-l>|B<--listq>"
+
+# type: TP
+#~ msgid "B<--split>, B<-s>"
+#~ msgstr "B<--split>, B<-s>"
+
+# type: TP
+#~ msgid "B<--join>, B<-j>"
+#~ msgstr "B<--join>, B<-j>"
+
+# type: TP
+#~ msgid "B<--auto>, B<-a>"
+#~ msgstr "B<--auto>, B<-a>"
+
+# type: TP
+#~ msgid "B<--listq>, B<-l>"
+#~ msgstr "B<--listq>, B<-l>"
+
+# type: TP
+#~ msgid "B<--discard>, B<-d>"
+#~ msgstr "B<--discard>, B<-d>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
+#~ "their uses."
+#~ msgstr ""
+#~ "Visar B<dpkg-split>s hjälpskärm, vilken ger en sammanfattning av "
+#~ "kommandoradsflaggorna och deras användningsområden."
+
+# type: Plain text
+#~ msgid "Prints B<dpkg-split>'s version number."
+#~ msgstr "Visar B<dpkg-split>s versionsnummer."
+
+# type: Plain text
+#~ msgid ""
+#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
+#~ "warranty. (The American spelling B<--license> is also supported.)"
+#~ msgstr ""
+#~ "Visar information om B<dpkg-split>s upphovsrättsliga licensiering och "
+#~ "avsaknad av garanti. (Den amerikanskengelska stavningen B<--license> "
+#~ "stöds också.)"
+
+# type: TP
+#~ msgid "B<--npquiet>, B<-Q>"
+#~ msgstr "B<--npquiet>, B<-Q>"
+
+# type: TP
+#, fuzzy
+#~ msgid "B<--admindir>"
+#~ msgstr "B<--admindir=>I<kat>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
+#~ msgstr "B<start-stop-daemon> B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
+#~ msgstr "B<start-stop-daemon> B<-V>|B<--version>"
+
+# type: TP
+#~ msgid "B<-H>|B<--help>"
+#~ msgstr "B<-H>|B<--help>"
+
+# type: Plain text
+#~ msgid "Print help information; then exit."
+#~ msgstr "Skriv ut hjälpinformation och avsluta sedan."
+
+# type: Plain text
+#~ msgid "Print version information; then exit."
+#~ msgstr "Skriv ut versionsinformation och avsluta sedan."
+
+# type: Plain text
+#, fuzzy
+#~ msgid "Give some usage information."
+#~ msgstr "Visar versionsinformation."
+
 # type: TP
 #~ msgid "B<DPKG_OLD_CONFFILE>"
 #~ msgstr "B<DPKG_OLD_CONFFILE>"
diff --git a/po/ChangeLog b/po/ChangeLog
index f16a2c23..3858c629 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-21  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot. Formerly completed translations
+	become 907t11f2u.
+
 2007-03-18  Robert Luberda
 
 	* pl.po: Updated to 920t
diff --git a/po/bs.po b/po/bs.po
index 52fbb611..dd9388b5 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -57,72 +57,57 @@ msgstr "Sistemska greška br.%d"
 msgid "Signal no.%d"
 msgstr "Signal br.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
 #, c-format
-msgid "%s: internal gzip error: `%s'"
+msgid "%s: failed to exec '%s %s'"
 msgstr ""
 
-#: lib/compression.c:60
+#: lib/compression.c:62
 #, c-format
-msgid "%s: failed to exec gzip -dc"
+msgid "%s: internal gzip error: `%s'"
 msgstr ""
 
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr ""
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr ""
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr ""
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr ""
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr ""
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr ""
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr ""
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr ""
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr ""
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr ""
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr ""
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr ""
@@ -166,7 +151,7 @@ msgstr ""
 
 #  Now that we have verified everything its time to actually
 #  * build something. Lets start by making the ar-wrapper.
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -876,291 +861,296 @@ msgstr ""
 msgid "failed to realloc for variable buffer"
 msgstr ""
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr ""
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr ""
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
 msgstr ""
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr ""
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, fuzzy, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ažurirani instalirani paketi"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr ""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr ""
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr ""
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1489,110 +1479,117 @@ msgstr ""
 msgid "unable to check for existence of `%.250s'"
 msgstr ""
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr "zavisi o"
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr "unaprijed zavisi o"
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr "preporučuje"
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr "predlaže"
+
+#: src/depcon.c:168
+#, c-format
+msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr "sukobljava se sa"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr "predlaže"
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr "poboljšava"
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
@@ -2302,7 +2299,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
@@ -2375,6 +2372,10 @@ msgstr ""
 msgid "  Package %s is not installed.\n"
 msgstr ""
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr "zavisi o"
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ""
@@ -2560,7 +2561,7 @@ msgstr ""
 #, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 
 #: src/processarc.c:715
@@ -2969,199 +2970,204 @@ msgstr ""
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr ""
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr ""
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr ""
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr ""
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr ""
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr ""
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr ""
 
@@ -3238,130 +3244,130 @@ msgstr ""
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %ld bytes: control archive= %zi bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr ""
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr ""
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr ""
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3511,7 +3517,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3530,7 +3537,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -3874,9 +3881,9 @@ msgstr ""
 msgid "unable to exec mksplit"
 msgstr ""
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
@@ -3887,9 +3894,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 #, fuzzy
 msgid ""
 "\n"
@@ -3941,7 +3948,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr ""
@@ -3968,7 +3975,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -3988,19 +3995,19 @@ msgstr ""
 msgid "%s: unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4030,89 +4037,89 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4120,7 +4127,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4128,95 +4135,95 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4236,107 +4243,107 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 #, fuzzy
 msgid "aborting"
 msgstr "upozorenje"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4527,14 +4534,14 @@ msgstr ""
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4555,7 +4562,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4575,291 +4582,290 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
+#: scripts/update-alternatives.pl:131
+msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
+#: scripts/update-alternatives.pl:135
+#, perl-format
+msgid "duplicate slave %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
+#: scripts/update-alternatives.pl:138
+#, perl-format
+msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:136
+#: scripts/update-alternatives.pl:139
 #, perl-format
-msgid "--%s needs <name> <path>"
+msgid "duplicate slave link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:141
+#: scripts/update-alternatives.pl:143
 #, perl-format
-msgid "--%s needs <name>"
+msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
+#: scripts/update-alternatives.pl:149
+#, perl-format
+msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:147
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "slave name %s duplicated"
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:148
+#: scripts/update-alternatives.pl:168
 #, perl-format
-msgid "slave link %s duplicated"
+msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:164
+#: scripts/update-alternatives.pl:187
 #, perl-format
-msgid "name %s is both primary and slave"
+msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:165
+#: scripts/update-alternatives.pl:191
 #, perl-format
-msgid "link %s is both primary and slave"
+msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
+#: scripts/update-alternatives.pl:193
+msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
+#: scripts/update-alternatives.pl:195
+#, perl-format
+msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:176
-msgid "manflag"
+#: scripts/update-alternatives.pl:199
+#, perl-format
+msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:203
 #, perl-format
-msgid "duplicate slave %s"
+msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:183
-#, perl-format
-msgid "slave link same as main link %s"
+#: scripts/update-alternatives.pl:208
+msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:210
 #, perl-format
-msgid "duplicate slave link %s"
+msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:237
 #, perl-format
-msgid "duplicate path %s"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
-#, perl-format
-msgid "priority %s %s"
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
-#, perl-format
-msgid ""
-"Alternative for %s points to %s - which wasn't found.  Removing from list of "
-"alternatives."
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:256
 #, perl-format
-msgid "No alternatives for %s."
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:261
 #, perl-format
-msgid "%s - status is %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
-#, perl-format
-msgid " link currently points to %s"
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
-msgid " link currently absent"
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:268
 #, perl-format
-msgid " link unreadable - %s"
+msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:284
 #, perl-format
-msgid "%s - priority %s"
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:286
 #, perl-format
-msgid " slave %s: %s"
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
-msgid "No versions available."
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:241
-#, perl-format
-msgid "Current `best' version is %s."
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4868,41 +4874,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 2b7b2bb8..128c64f1 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -58,74 +58,59 @@ msgstr "S'ha produït un error del sistema núm.%d"
 msgid "Signal no.%d"
 msgstr "Senyal núm.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: no s'ha pogut executar gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: s'ha produït un error intern de gzip: «%s»"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: no s'ha pogut executar gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: s'ha produït un error intern de bzip2: «%s»"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: no s'ha pogut executar bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompressió"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: s'ha produït un error intern de gzip: lectura: «%s»"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: s'ha produït un error intern de gzip: escriptura «%s»"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr ""
 "%s: s'ha produït un error intern de gzip: lectura(%i) != escriptura(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: no s'ha pogut executar gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: s'ha produït un error intern de bzip2: lectura: «%s»"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: s'ha produït un error intern de bzip2: escriptura «%s»"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr ""
 "%s: s'ha produït un error intern de bzip2: lectura(%i) != escriptura(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: no s'ha pogut executar bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressió"
@@ -171,7 +156,7 @@ msgstr "no es pot analitzar el directori d'actualitzacions «%.255s»"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "no s'ha pogut eliminar el fitxer d'actualització incorporat %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "no es pot crear «%.255s»"
@@ -915,30 +900,30 @@ msgid "failed to realloc for variable buffer"
 msgstr ""
 "s'ha produït un error en fer «realloc» per la memòria temporal d'una variable"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  ja ha desaparegut!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "s'ha produït un error en llegir des d'un conducte de dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "s'ha produït un error en establir les dates de «%.255s»"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "s'ha produït un error en establir el propietari de «%.255s»"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "s'ha produït un error en establir els permisos de «%.255s»"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -947,17 +932,17 @@ msgstr ""
 "s'està intentant sobreescriure «%.250s», que és la versió desviada de "
 "«%.250s»%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paquet: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, 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)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -965,29 +950,29 @@ msgid ""
 msgstr ""
 "no es pot netejar el desordre de «%.255s» abans d'instal·lar una altra versió"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, 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ó"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "l'arxiu conté l'objete «%.255s» de tipus 0x%x desconegut"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "S'està reemplaçant fitxers del paquet antic %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Reemplaçat pels fitxers al paquet instal·lat %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -995,94 +980,94 @@ msgstr ""
 "s'està intentant sobreescriure el directori «%.250s» del paquet %.250s amb "
 "un no directori"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "s'està intentant sobreescriure «%.250s», que també està en el paquet %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "s'està descartant el fitxer reemplaçat «%.255s»"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "rerefons dpkg-deb durant «%.255s»"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "s'ha produït un error en tancar/escriure «%.255s»"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "s'ha produït un error en crear el conducte «%.255s»"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "s'ha produït un error en crear el dispositiu «%.255s»"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "s'ha produït un error en crear l'enllaç dur «%.255s»"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "s'ha produït un error en crear l'enllaç simbòlic «%.255s»"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 "s'ha produït un error en establir el propietari de l'enllaç simbòlic «%.255s»"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "s'ha produït un error en crear el directori «%.255s»"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "no es pot moure «%.255s» per a instal·lar una versió nova"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "no es pot llegir l'enllaç «%.255s»"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 "no es pot fer una còpia de seguretat de l'enllaç simbòlic per a «%.255s»"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "no es pot fer «chown» sobre l'enllaç simbòlic de la còpia de seguretat de "
 "«%.255s»"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "no es pot crear un enllaç de seguretat de «%.255s» abans d'instal·lar la "
 "versió nova"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "no es pot instal·lar una versió nova de «%.255s»"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1092,7 +1077,7 @@ msgstr ""
 "desinstal·lar %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1101,7 +1086,7 @@ msgstr ""
 "dpkg: avís - es considera la desconfiguració del paquet\n"
 " essencial %s, per a permetre la desinstal·lació de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1110,7 +1095,7 @@ msgstr ""
 "dpkg: no, %s és essencial, no serà desconfigurat\n"
 " per a permetre la desinstal·lació de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1119,26 +1104,26 @@ msgstr ""
 "dpkg: no, no es pot desinstal·lar %s (--auto-deconfigure ajudarà):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: es considera la desinstal·lació de %s en favor de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s no està correctament instal·lat - no es tindrà en compte cap dependència "
 "d'aquest.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: poden haver-hi problemes en desinstal·lar %s, donat que proveeix a %"
 "s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1147,17 +1132,22 @@ msgstr ""
 "dpkg: el paquet %s requereix ser reinstal·lat, però es desinstal·larà tal i "
 "com heu demanat.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: el paquet %s requereix ser reinstal·lat, no es desinstal·larà.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: si, es desinstal·larà %s en favor de %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1166,74 +1156,74 @@ msgstr ""
 "dpkg: referent a %s que conté %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquets en conflicte - no s'instal·larà %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: avís - s'ignorarà el conflicte, es pot procedir igualment!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necessita al menys un camí com a argument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "no s'ha pogut executar «find» per a --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "no s'ha pogut fer «fdopen» al conducte de find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "s'ha produït un error en llegir el conducte de find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "s'ha produït un error en tancar el conducte de find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "La recerca usant --recursive ha tornat l'eixida no gestionada %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "s'ha buscat, però no s'han trobat paquets (fitxers que coincidisquen amb *."
 "deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s necessita al menys un paquet arxiu com a argument"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "S'està seleccionant el paquet %s prèviament no seleccionat.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "S'està ometent el paquet no seleccionat %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "La versió %.250s de %.250s ja és instal·lada, es descarta.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - avís: s'està desactualitzant %.250s de %.250s a %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1617,110 +1607,117 @@ msgstr "EOF en l'entrada estàndard al preguntar sobre conffiles"
 msgid "unable to check for existence of `%.250s'"
 msgstr "no es pot comprovar l'existència de «%.250s»"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depèn de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pre-depèn de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomana "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " suggereix "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " trenca "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " entra en conflicte amb "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " suggereix "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " millora a "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s serà desinstal·lat.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s serà desconfigurat.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s serà instal·lat, però té una versió %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s està instal·lat, però té una versió %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s està desempaquetat, però no ha estat configurat.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s està desempaquetat, però té una versió %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  l'última versió configurada de %.250s és la %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s és %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s proveeix %.250s però serà desinstal·lat.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s proveeix %.250s però serà desconfigurat.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proveeix %.250s però és %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no està instal·lat.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versió %.250s) serà instal·lat.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versió %.250s) és %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s proveeix %.250s y serà instal·lat.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s proveeix %.250s i és %s.\n"
@@ -2656,7 +2653,7 @@ msgstr "no s'ha pogut obrir «%i» per a un flux"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
@@ -2733,6 +2730,10 @@ msgstr "  El paquet %s que proveeix %s no està instal·lat.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  El paquet %s no està instal·lat.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depèn de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; tot i així:\n"
@@ -2930,10 +2931,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "no es pot fer «stat» sobre el fitxer nou «%.250s»"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: avís - el fitxer antic «%.250s» és igual que diversos fitxers nous! "
 "(«%.250s» i «%.250s»)"
@@ -3417,26 +3418,31 @@ msgstr "--forget-old-unavail no accepta cap argument"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - error: %s («%s») no conté cap dígit\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build necessita un directori amb paràmetre"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build porta com a molt dos arguments"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "no es pot comprovar l'existència de l'arxiu «%.250s»"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "l'objectiu és un directori - no es pot ometre la comprovació del fitxer de "
 "control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3445,43 +3451,43 @@ msgstr ""
 "dpkg-deb: avís, no es comprova el contingut de l'àrea de control.\n"
 "dpkg-deb: es construeix un paquet desconegut en «%s».\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "el nom del paquet té caràcters que no són minúscules, alfanumèrics o «-+»."
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "avís, «%s» conté un valor Priority «%s» definit pel usuari\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "avís, «%s» conté un camp «%s» definit pel usuari\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d errors en el fitxer de control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: s'està construint el paquet «%s» en «%s».\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "el directori de control té permisos erronis %03lo (ha de ser >=0755 i <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "la seqüència «%.50s» no és un fitxer normal o un enllaç simbòlic"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3489,16 +3495,16 @@ msgid ""
 msgstr ""
 "la seqüència «%.50s» té permisos erronis %03lo (ha de ser >=0555 i <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "no es pot fer «stat» sobre la seqüència «%.50s»"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "cadena buida de fgets al llegir conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3506,123 +3512,123 @@ msgstr ""
 "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:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "avís, el nom del conffile «%s» conté espais en blanc al final\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "el conffile «%.250s» no està dins del paquet"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "no es pot fer «stat» sobre el conffile «%.250s»"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "avís, el conffile «%s» no és un fitxer normal\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "s'ha produït un error en llegir el fitxer de conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "s'ha produït un error en l'obrir el fitxer de conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 "dpkg-deb: no es tindran en compte %d avisos sobre els fitxers de control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "no es pot desfer la memòria temporal `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "s'ha produït un error en canviar al directori «%.255s»"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "s'ha produït un error en canviar al directori .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "s'ha produït un error en executar tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "s'ha produït un error en crear un fitxer temporal (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "s'ha produït un error en obrir un fitxer temporal (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "s'ha produït un error en desenllaçar el fitxer temporal (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 "s'ha produït un error en fer «fstat» sobre el fitxer temporal (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 "s'ha produït un error en fer «rewind» sobre el fitxer temporal (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "s'ha produït un error en crear el fitxer temporal (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "s'ha produït un error en obrir el fitxer temporal (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "s'ha produït un error en esborrar el fitxer temporal (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dades"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "s'ha produït un error en executar find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 "s'ha produït un error en escriure el nom del fitxer al conducte de tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "S'ha produït un error intern, el compress_type «%i» és desconegut."
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "s'ha produït un error al fer «rewind» sobre el fitxer temporal (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (dades)"
 
@@ -3702,22 +3708,22 @@ msgstr "l'arxiu no té cap punt en el número de versió"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "no s'entén la versió %.250s de l'arxiu, aconseguiu un dpkg-deb més nou"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "s'omet l'element de %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "el fitxer «%.250s» conté un element %.*s inintel·ligible, s'abandona"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "el fitxer «%.250s» conté dos elements de control, s'abandona"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3726,17 +3732,17 @@ msgstr ""
 " paquet de debian nou, versió %s.\n"
 " mida %ld bytes: arxiu de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "longitud de la informació de control"
 
 # FIXME original
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "l'arxiu té una longitud de control mal formatada «%s»"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3745,15 +3751,15 @@ msgstr ""
 " paquet debian antic, versió %s.\n"
 " mida %ld bytes: arxiu de control= %zi, arxiu principal= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "no s'ha produït reservar memòria per a la variable «ctrlarea»"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "àrea de control"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3762,65 +3768,65 @@ msgstr ""
 "dpkg-deb: el fitxer té pinta de ser un arxiu que ha sigut corromput\n"
 "dpkg-deb     al ser descarregat en mode ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» no és un arxiu amb el format debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "no s'ha pogut obtenir la posició actual del fitxer"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "no s'ha pogut establir la posició actual del fitxer"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "no s'ha pogut obrir el descriptor de fitxer «1» en «paste»"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "no s'ha pogut escriure a gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "no s'ha pogut tancar gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "no s'ha pogut fer «syscall lseek» en els fitxers porció d'arxiu"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "s'ha produït un error en escriure al conducte en la còpia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "s'ha produït un error en tancar el conducte en la còpia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "no s'ha pogut canviar a un directori després de crear-lo"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "no s'ha pogut canviar al directori"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "no s'ha pogut executar tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necessita un nom de fitxer .deb com a argument"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3829,12 +3835,12 @@ msgstr ""
 "--%s necessita un directori de destí.\n"
 "Potser voleu fer dpkg --install?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s pren com a molt dos arguments (.deb i directori)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s només pren un argument (fitxer .deb)"
@@ -3992,7 +3998,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -4003,7 +4009,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opcions:\n"
@@ -4043,7 +4050,7 @@ msgstr ""
 "Escriviu dpkg --help per a obtindre ajuda a sobre de com instal·lar i "
 "desinstal·lar paquets."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "el tipus de compressió «%s» és desconegut!"
@@ -4432,9 +4439,9 @@ msgstr "el fitxer font «%.250s» no és un fitxer normal"
 msgid "unable to exec mksplit"
 msgstr "no es pot executar mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -4447,9 +4454,9 @@ msgstr ""
 "\n"
 "Copyright © 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4507,7 +4514,7 @@ msgstr "proveu a suprimir %s"
 # Normalment pose "no es pot" si diu "unable" (present, i com que mai ho
 # pot fer, i "no s'ha pogut" per a casos concrets com "failed to". jm
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "no es pot obrir %s: %s"
@@ -4534,7 +4541,7 @@ msgid "unable to close %s after read: %s"
 msgstr "no es pot tancar %s després de la lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no es pot tancar %s: %s"
@@ -4554,12 +4561,12 @@ msgstr "no s'ha pogut instal·lar %s, es deixarà com a %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: no es pot desblocar %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "No es pot obtenir el valor ENOENT de %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4570,7 +4577,7 @@ msgstr ""
 "Copyright © 2000, 2001 Wichert Akkerman."
 
 # Move the file aside (or back) ? -- Jordà
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4626,90 +4633,90 @@ msgstr ""
 "Els guions de preinst/postrm sempre haurien d'especificar --package i --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "s'ha especificat dos modes: %s i --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s necessita un argument amb la desviació"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "la desviació no pot contenir salts de línia"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s necessita un <paquet> com a paràmetre"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "el paquet no pot contenir salts de línia"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita un <directori> com a paràmetre"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "l'opció «%s» és desconeguda"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "no s'han pogut obrir les desviacions: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "manca el nom alternatiu"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "manca el paquet"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s necessita un sol paràmetre"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "el nom de fitxer «%s» no és absolut"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "el fitxer no pot contenir salts de línia"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "No es poden desviar directoris"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "S'està deixant «%s»"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "«%s» té un conflicte amb «%s»"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "S'està afegint «%s»"
 
 # Discrepància? -- Jordà
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4721,7 +4728,7 @@ msgstr ""
 "  s'ha trobat «%s»"
 
 # Discrepància? -- Jordà
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4732,37 +4739,37 @@ msgstr ""
 "  en eliminar «%s»\n"
 "  s'ha trobat «%s»"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "S'està desinstal·lant «%s»"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "No hi ha cap desviació «%s», no s'ha eliminat"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "s'ha produït un error intern - el mode «%s» és incorrecte"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "no es pot fer «stat» sobre el nom vell «%s»: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "no es pot fer «stat» sobre el nom nou «%s»: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "s'ha produït un error en comprovar «%s»: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4771,52 +4778,52 @@ msgstr ""
 "el canvi de nom implica sobreescriure «%s» amb\n"
 "  el fitxer diferent «%s», no és permés"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, 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:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "crea el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escriu el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "tanca el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "esborra l'antic diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "crea el nou diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instal·la el nou diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "s'ha produït un error intern: %s està corromput: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4824,7 +4831,7 @@ msgstr ""
 "\n"
 "Copyright © 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4863,108 +4870,108 @@ msgstr ""
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "no s'ha especificat cap mode"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add necessita quatre arguments"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "l'usuari %s és il·legal"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "l'usuari %s no existeix"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "el grup %s és il·legal"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "el grup %s no existeix"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "el mode %s és il·legal"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "s'està suprimint la / de davant"
 
 # Override -> substitució? -- Jordà
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Ja existeix una substitució per a «%s», "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "però com s'ha especificat --force, s'ignorarà."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "s'està avortant"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "avís: s'ha donat --update però %s no existeix"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "no s'ha pogut fer chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "no s'ha pogut fer chmod %s: %s"
 
 # Override -> substitució? -- Jordà
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "No hi ha cap substitució present."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "avís: no té sentit utilitzar --update amb --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "no s'ha pogut obrir el fitxer de statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Hi ha múltiples substitucions per a «%s», s'està avortant"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "no s'ha pogut obrir el nou fitxer de statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "s'ha produït un error en esborrar statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "s'ha produït un error en crear el nou statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "s'ha produït un error en instal·lar el nou statoverride: %s"
@@ -5197,7 +5204,7 @@ msgstr "no es pot llegir %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5207,8 +5214,8 @@ msgstr ""
 "Copyright © 1995 Ian Jackson.\n"
 "Copyright © 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5228,7 +5235,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5282,95 +5289,36 @@ msgstr ""
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "l'argument «%s» és desconegut"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install necessita <enllaç> <nom> <camí> <prioritat>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "la prioritat ha de ser un enter"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s necessita <nom> <camí>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s necessita <nom>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave necessita <enllaç> <nom> <camí>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "el nom de l'esclau %s està duplicat"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "l'enllaç duplicat %s està duplicat"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "el nom %s és alhora primari i esclau"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "l'enllaç %s és alhora primari i esclau"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"es necessita --display, --config, --set, --install, --remove, --all, --"
-"remove-all o --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave només es pot especificar junt amb --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "esclau duplicat %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "l'enllaç esclau és el mateix que l'enllaç principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "enllaç esclau duplicat %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "camí duplicat %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioritat %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5379,66 +5327,124 @@ msgstr ""
 "L'alternativa per %s apunta a %s, però no ha estat possible trobar-la. "
 "S'està esborrant de la llista d'alternatives."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hi ha alternatives per a %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - l'estat és %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " l'enllaç apunta actualment cap a %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " l'enllaç està actualment absent"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " no es pot llegir l'enllaç - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritat %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " esclau %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "No hi ha cap versió disponible."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Actualment la «millor» versió és %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "l'argument «%s» és desconegut"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install necessita <enllaç> <nom> <camí> <prioritat>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "la prioritat ha de ser un enter"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s necessita <nom> <camí>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s necessita <nom>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave necessita <enllaç> <nom> <camí>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "el nom de l'esclau %s està duplicat"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "l'enllaç duplicat %s està duplicat"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "el nom %s és alhora primari i esclau"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "l'enllaç %s és alhora primari i esclau"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"es necessita --display, --config, --set, --install, --remove, --all, --"
+"remove-all o --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave només es pot especificar junt amb --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "S'està configurant la selecció automàtica de %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "no es pot esborrar %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5447,7 +5453,7 @@ msgstr ""
 "%s ha estat modificat (manualment o per alguna seqüència).\n"
 "S'està canviant a modificacions manuals únicament."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5457,7 +5463,7 @@ msgstr ""
 "a %s ...\n"
 "(Si ho voleu, podeu modificar els enllaços simbòlics - vegeu «man ln».)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "S'està tornant a anomenar l'enllaç %s de %s a %s.n"
@@ -5465,67 +5471,67 @@ msgstr "S'està tornant a anomenar l'enllaç %s de %s a %s.n"
 # Reanomenar - Canviar el nom - Tornar a anomenar? -- Jordà
 # Jo personalment preferisc "canvia el nom", però per exemple al Termcat
 # van més amb reanomena, i el GNOME ho està seguint.
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no es pot reanomenar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom d'enllaç esclau %s duplicat"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "S'està descartant l'enllaç esclau obsolet %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, 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:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5534,38 +5540,38 @@ msgstr ""
 "avís: %s hauria de ser un enllaç simbòlic a %s\n"
 " (o no existent); tanmateix, readlink ha fallat: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "no es pot garantir que %s sigui no existent: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, 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:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "S'està deixant %s (%s) apuntant cap a %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, 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:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5574,13 +5580,13 @@ msgstr ""
 "avís: %s hauria de ser un enllaç simbòlic esclau a\n"
 " %s, o no existent; tanmateix, readlink ha fallat: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, 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:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5589,7 +5595,7 @@ msgstr ""
 "Només hi ha 1 programa que proveeixi %s\n"
 "(%s). No hi ha res a configurar.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5602,48 +5608,57 @@ msgstr ""
 "  Selecció     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "S'utilitzarà «%s» per proveir «%s»."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No es pot trobar l'alternativa «%s»."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, 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:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta un salt de línia després de %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema seriós: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: no s'ha pogut executar gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: no s'ha pogut executar bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: no s'ha pogut executar bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "no es pot crear %.250s"
 
diff --git a/po/cs.po b/po/cs.po
index 73bf1d81..461e541c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-08-18 17:12+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -60,72 +60,57 @@ msgstr "Systémová chyba číslo %d"
 msgid "Signal no.%d"
 msgstr "Signál číslo %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: nelze spustit gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: vnitřní chyba gzipu: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: nelze spustit gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: vnitřní chyba bzipu2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: nelze spustit bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprese"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: vnitřní chyba gzipu: čtení: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: vnitřní chyba gzipu: zápis: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: vnitřní chyba gzipu: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: nelze spustit gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: vnitřní chyba bzipu2: čtení: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: vnitřní chyba bzipu2: zápis: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: vnitřní chyba bzipu2: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: nelze spustit bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprese"
@@ -170,7 +155,7 @@ msgstr "nelze zjistit obsah adresáře s aktualizacemi `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "selhalo odstranění spojeného aktualizačního souboru %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nelze vytvořit `%.255s'"
@@ -892,30 +877,30 @@ msgstr "Ve formátu chybí uzavírací závorka\n"
 msgid "failed to realloc for variable buffer"
 msgstr "selhalo realokování proměnlivého bufferu"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  již zmizel !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "chyba při čtení z trubky od dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "chyba při nastavování času u `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "chyba při nastavování vlastníka `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "chyba při nastavování práv `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -923,131 +908,131 @@ msgid ""
 msgstr ""
 "zkouším přepsat `%.250s', což je odkloněná verze `%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (balík: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "nelze zjistit stav souboru `%.255s', který bude zrovna nainstalován"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr "nelze uklidit nepořádek u `%.255s' před nainstalováním další verze "
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "nelze zjistit stav obnoveného souboru `%.255s' před nainstalováním další "
 "verze"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archiv obsahoval objekt `%.255s' neznámého typu 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Nahrazuji soubory ve starém balíku %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Nahrazen soubory v nainstalovaném balíku %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "zkouším přepsat adresář `%.250s' v balíku %.250s neadresářem"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "zkouším přepsat soubor `%.250s', který je také v balíku %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "zpracování nahradilo soubor `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb během `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "chyba při uzavírání nebo zápisu `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "chyba při vytváření trubky `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "chyba při vytváření spec. souboru `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "chyba při vytváření pevného odkazu `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "chyba při vytváření symbolického odkazu `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "chyba při nastavování vlastníka symbolického odkazu `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "chyba při vytváření adresáře `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nelze odsunout `%.255s' pro nainstalování nové verze"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nelze přečíst odkaz `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nelze vytvořit záložní symbolický odkaz pro `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "nelze změnit vlastníka záložního symbolického odkazu `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "nelze vytvořit záložní odkaz `%.255s' před nainstalováním nové verze"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nelze nainstalovat novou verzi `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1056,7 +1041,7 @@ msgstr ""
 "dpkg: pozor - ignoruji problém se závislostmi při odstranění balíku %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1065,7 +1050,7 @@ msgstr ""
 "dpkg: varování - uvažuji o dekonfiguaci nezbytného balíku\n"
 "%s, která umožní odstranění balíku %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1074,7 +1059,7 @@ msgstr ""
 "dpkg: balík %s je nezbytný, neprovedu dekonfiguraci\n"
 " pro odstranění balíku %s\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1083,24 +1068,24 @@ msgstr ""
 "dpkg: nelze odstranit balík %s (--auto-deconfigure pomůže):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: zvažuji odstranění %s ve prospěch %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "balík %s není správně nainstalován - ignoruji všechny závislosti na něm.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: možné problémy s odstraněním balíku %s, protože poskytuje %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1109,18 +1094,23 @@ msgstr ""
 "dpkg: balík %s vyžaduje přeinstaci, ale bude odstraněn podle vašeho "
 "požadavku.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg: balík %s vyžaduje přeinstalaci, nebudu nepokračovat v odinstalaci.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ano, odstraním %s ve prospěch %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1129,72 +1119,72 @@ msgstr ""
 "dpkg: ohledně %s obsahující balík %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt balíků - nebudu instalovat %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: pozor - ignoruji konflikt, pokračuji dál !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive vyžaduje alespoň jednu cestu"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "chyba při spuštění find pro --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "nelze provést fdopen na rouře od příkazu find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "chyba při čtení z roury příkazu find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "chyba při zavírání roury od příkazu find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "hledání --recursive vrátilo neošetřenou chybu %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "prohledáno, ale nebyl nalezen žádný balík (soubory vyhovující *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s vyžaduje jako argument alespoň jeden soubor s balíkem"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Instaluji balík %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Přeskakuji balík %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Verze %.250s balíku %.250s je již nainstalována, přeskakuji.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - varování: instaluji starší verzi %.250s z %.250s na %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1570,110 +1560,117 @@ msgstr "EOF na stdin při otázce na konfigurační soubor"
 msgid "unable to check for existence of `%.250s'"
 msgstr "existenci `%.250s' nelze zkontrolovat"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " závisí na "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " před-závisí na "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " doporučuje "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr "navrhuje "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " porušuje "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " je v konfliktu s "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr "navrhuje "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " rozšiřuje "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s bude odstraněn.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s bude dekonfigurován.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s bude nainstalován, ale je verze %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s je nainstalován, ale je verze %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s je rozbalen, ale ještě nebyl zkonfigurován.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s je rozbalen, ale je verze %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s poslední zkonfigurovaná verze je %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s je %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude odstraněn.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude dekonfigurován.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr " %250s není nainstalován.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (verze %.250s) bude nainstalován.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (verze %.250s) je %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s poskytuje %.250s a bude nainstalován.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s poskytuje %.250s a je %s.\n"
@@ -2549,7 +2546,7 @@ msgstr "nelze otevřít `%i' pro proud"
 msgid "unexpected eof before end of line %d"
 msgstr "neočekávaný konec souboru před koncem řádku %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "potřebuji zadat akci"
@@ -2626,6 +2623,10 @@ msgstr "  Balík %s poskytující %s není nainstalován.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Balík %s není nainstalován.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " závisí na "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; avšak:\n"
@@ -2820,10 +2821,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "nelze zavolat stat na novém souboru `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: varování - starý soubor `%.250s' je stejný jako některé nové soubory! "
 "(`%.250s' i `%.250s')"
@@ -3280,24 +3281,29 @@ msgstr "--forget-old-unavail musí být zadán bez argumentu"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - chyba: %s (`%s') neobsahuje čísla\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build vyžaduje jméno adresáře"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build vyžaduje nejvýše dva parametry"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "nelze zkontrolovat existenci archivu `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "cíl je adresář - nemohu přeskočit test kontrolního souboru"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3306,41 +3312,41 @@ msgstr ""
 "dpkg-deb: pozor, nekontroluji obsah oblasti control.\n"
 "dpkg-deb: vytvářím neznámý balík v `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "jméno balíku se skládá ze znaků, které nejsou malými písmeny ani `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "pozor, `%s' obsahuje uživatelskou hodnotu Priority `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "pozor, `%s' obsahuje uživatelskou položku `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d chyb v souboru control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: vytvářím balík `%s' v `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "řídící adresář má špatná práva %03lo (musí být >=0755 a <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "maintainer skript `%.50s' není obyčejný soubor ani symlink"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3348,16 +3354,16 @@ msgid ""
 msgstr ""
 "maintainer script `%.50s' má špatná práva %03lo (musí být >=0555 a <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "maintainer script `%.50s' is not stattable"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "fgets vrátil při čtení konfiguračního souboru prázdný řetězec"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3365,119 +3371,119 @@ msgstr ""
 "pozor, jméno konfiguračního souboru `%.50s...' je příliš dlouhé, nebo chybí\n"
 "koncová nová řádka\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "varování, konfigurační soubor `%s' má na konci mezery\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "konfigurační soubor `%.250s' nebyl v balíku nenalezen"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "na konfiguračním souboru `%.250s' nelze spustit stat()"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "varování, konfigurační soubor `%.s' není obyčejný soubor\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "chyba při čtení souboru conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "chyba při otevření soubory conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignoruji %d varování o kontrolních souborech\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "nelze odbufferovat `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nelze změnit adresář na `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "nelze změnit adresář na .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "nelze spustit tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "selhalo vytvoření dočasného souboru (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "selhalo otevření dočasného souboru (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "selhalo smazání dočasného souboru (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "selhal fstat na dočasném souboru (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "selhalo přesunutí v dočasném souboru (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "selhalo vytvoření dočasného souboru (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "selhalo otevření dočasného souboru (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "selhalo smazání dočasného souboru (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "nelze spustit find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "selhal zápis jména souboru do roury s tarem (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Vnitřní chyba, neznámý compress_type `%i'!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "přesun v dočasném souboru (data) selhal"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3554,22 +3560,22 @@ msgstr "archiv nemá tečku v čísle verze"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "neznámá verze %.250s archivu, nainstalujte novější dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "přeskočena část od %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "soubor `%.250s' obsahuje nerozpoznanou část %.*s, vzdávám to"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "soubor `%.250s' obsahuje dvě kontrolní části, vzdávám to"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3578,16 +3584,16 @@ msgstr ""
 " nový formát balíku, verze %s.\n"
 " velikost %ld bajtů, řídící archiv= %zi bajtů.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "délka kontrolní informace"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "archiv má chybně formátovanou kontrolní délku `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3596,15 +3602,15 @@ msgstr ""
 " starý debianí balík, verze %s.\n"
 " velikost %ld bajtů: kontrolní archiv= %zi, hlavní archiv= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "chyba při alokaci paměti pro proměnnou `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "kontrolní oblast"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3613,65 +3619,65 @@ msgstr ""
 "dpkg-deb: soubor vypadá jako archiv, který byl poškozen\n"
 "dpkg-deb:    při stahování v ASCII módu\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nemá formát balíku debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "nelze získat aktuální pozici v souboru"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "nelze nastavit aktuální pozici v souboru"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "nelze otevřít popisovač `1' roury"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "nelze zapisovat do gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "nelze zavřít gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "selhal lseek k části archivu se soubory"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "nelze zapisovat do roury během kopírování"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "nelze zavřít rouru během kopírování"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "nelze vytvořit adresář"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "nelze se přepnout do právě vytvořeného adresáře"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "nelze vstoupit do adresáře"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "nelze spustit tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s vyžaduje jméno .deb souboru"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3681,12 +3687,12 @@ msgstr ""
 "Nechtěli jste použít dpkg --install ?"
 
 # nemá tak být ) na konci ?
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s vyžaduje nejvýše dva parametry (.deb a adresář)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s vyžaduje jen jeden parametr (jméno .deb souboru)"
@@ -3840,7 +3846,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3851,7 +3857,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Volby:\n"
@@ -3886,7 +3893,7 @@ msgstr ""
 "Napište dpkg-deb --help k získání nápovědy k manipulaci s *.deb soubory;\n"
 "Napište dpkg --help k získání informací o instalování a odinstalování balíků."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámý typ komprese `%s'!"
@@ -4260,9 +4267,9 @@ msgstr "zdrojový soubor `%.250s' není obyčejným souborem"
 msgid "unable to exec mksplit"
 msgstr "nelze spustit mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s verze %s.\n"
@@ -4275,9 +4282,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4333,7 +4340,7 @@ msgid "try deleting %s"
 msgstr "zkuste smazat %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "nelze otevřít %s: %s"
@@ -4360,7 +4367,7 @@ msgid "unable to close %s after read: %s"
 msgstr "po čtení nelze zavřít %s: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nelze zavřít %s: %s"
@@ -4380,12 +4387,12 @@ msgstr "instalace %s selhala; ponechám jej jako %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: nelze odemknout %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Nemohu získat hodnotu ENOENT z %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4395,7 +4402,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4449,89 +4456,89 @@ msgstr ""
 "Před/poinstalační skripty balíku by měly vždy používat --package a --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "zadány dva režimy: %s a --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s vyžaduje argument kam-odklonit"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "kam-odklonit nemůže obsahovat znak nového řádku"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s vyžaduje jako argument <balík>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "jméno balíku nemůže obsahovat znak nového řádku"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje jako argument <adresář>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznámá volba \"%s\""
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "nelze otevřít soubor s odsuny: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "chybí alternativní jméno"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "chybí balík"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s vyžaduje jeden argument"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "název souboru \"%s\" není absolutní"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "soubor nesmí obsahovat znaky nového řádku"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Nelze odklonit adresář"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Opouštím `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' koliduje s `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Přidávám `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4542,7 +4549,7 @@ msgstr ""
 "  při odstraňování `%s'\n"
 "  nalezeno `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4553,37 +4560,37 @@ msgstr ""
 "  při odstraňování `%s'\n"
 "  nalezen `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Odstraňuji `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Odklonění `%s' neexistuje, tedy nebylo odstraněno"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "vnitřní chyba - chybný režim `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "nelze volat stat na staré jméno `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "nelze volat stat na nové jméno `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "chyba při kontrole `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4592,52 +4599,52 @@ msgstr ""
 "přejmenování znamená přepsání `%s'\n"
 "  souborem `%s', což není povoleno"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "přejmenování: přejmenování `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "vytváření souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zápis souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zavírání souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "odstranění starého souboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "vytvoření nového souboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalace nového souboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "vnitřní chyba: %s porušeno: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4645,7 +4652,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4680,106 +4687,106 @@ msgstr ""
 "  --help                   zobrazí tuto nápovědu\n"
 "  --version                zobrazí verzi\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nebyl vybrán žádný režim"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add vyžaduje čtyři argumenty"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "chybný uživatel %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "neexistující uživatel %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "chybná skupina %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "neexistující skupina %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "chybný režim %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "odstraňuji koncové /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Přepis \"%s\" již existuje, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "ale kvůli --force jej budeme ignorovat."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "přerušuji"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "varování: bylo zadáno --update, ale %s neexistuje"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "selhala změna vlastníka %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "selhala změna oprávnění %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Žádné přebití neexistuje"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "varování: pro --remove je --update zbytečné"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "nelze otevřít soubor statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Vícero přebití pro \"%s\", přerušuji"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "nelze otevřít nový soubor statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "chyba při odstraňování souboru statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "chyba při vytváření souboru statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "chyba při instalaci nového souboru statoverride: %s"
@@ -4999,7 +5006,7 @@ msgstr "nelze číst %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5009,8 +5016,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5030,7 +5037,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5083,95 +5090,36 @@ msgstr ""
 "  --help                   zobrazí tuto nápovědu\n"
 "  --version                zobrazí verzi\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "neznámý argument `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install vyžaduje <odkaz> <jméno> <cesta> <priorita>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "priorita musí být celé číslo"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s vyžaduje <jméno> <cesta>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s vyžaduje <jméno>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave vyžaduje <odkaz> <jméno> <cesta>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "závislé jméno %s je duplicitní"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "závislý odkaz %s je duplicitní"
-
-#: scripts/update-alternatives.pl:164
-#, 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:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "odkaz %s je jak primární, tak závislý"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"vyžaduji --display, --config, --set, --install, --remove, --all, --remove-"
-"all nebo --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave je povoleno jen současně s --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "ruční příznak"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "duplicitní závislost %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "závislý odkaz je stejný nako hlavní odkaz %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "duplicitní závislý odkaz %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "duplicitní cesta %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "priorita %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5180,66 +5128,124 @@ msgstr ""
 "Alternativa pro %s ukazuje na verzi %s, která nebyla nalezena. Odstraňuji ze "
 "systému alternativ."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pro %s neexistují žádné alternativy."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - stav je %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " odkaz momentálně ukazuje na %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " odkaz momentálně chybí"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " odkaz není čitelný - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorita %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " závislost %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nejsou k dispozici žádné verze."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Momentálně \"nejlepší\" verze je \"%s\"."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "neznámý argument `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install vyžaduje <odkaz> <jméno> <cesta> <priorita>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "priorita musí být celé číslo"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s vyžaduje <jméno> <cesta>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s vyžaduje <jméno>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave vyžaduje <odkaz> <jméno> <cesta>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "závislé jméno %s je duplicitní"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "závislý odkaz %s je duplicitní"
+
+#: scripts/update-alternatives.pl:284
+#, 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:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "odkaz %s je jak primární, tak závislý"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"vyžaduji --display, --config, --set, --install, --remove, --all, --remove-"
+"all nebo --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave je povoleno jen současně s --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuji automatický výběr %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nelze odstranit %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5248,7 +5254,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:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5257,70 +5263,70 @@ msgstr ""
 "Kontroluji dostupné verze %s, aktualizuji odkazy v %s ...\n"
 "(Symbolické odkazy můžete měnit i ručně - viz `man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, 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:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nelze přejmenovat %s na %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "závislý odkaz jménem %s byl duplikován"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahazuji zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Obnovuji z předchozí nefunkční aktualizace %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nelze otevřít %s pro zápis: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5329,38 +5335,38 @@ msgstr ""
 "varování: %s má být symbolický odkaz na %s,\n"
 " avšak volání readlink selhalo: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nelze se přesvědčit, že %s neexistuje: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nelze nainstalovat %s jako %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Ponechávám %s (%s), aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualizuji %s (%s), aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5369,13 +5375,13 @@ msgstr ""
 "varování: %s má být záviský symbolický odkaz na\n"
 " %s, avšak volání readlink selhalo: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Odstraňuji %s (%s), neodpovídá %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5384,7 +5390,7 @@ msgstr ""
 "Existuje pouze jediný program poskytující %s\n"
 "(%s). Nemám nic k nastavení.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5397,45 +5403,54 @@ msgstr ""
 "  Výběr        Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Používám '%s' pro poskytnutí `%s'. "
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nemohu najít alternativu `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba při zápisu na standardní výstup: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chybí nový řádek za %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážný problém: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: nelze spustit gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: nelze spustit bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: nelze spustit bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "nelze vytvořit %.250s"
 
diff --git a/po/da.po b/po/da.po
index 2d50f002..8762b2df 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-06 20:39+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -61,72 +61,57 @@ msgstr "Systemfejl nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal nr. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: kunne ikke eksekvere 'gzip' %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: intern gzip-fejl: '%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: kunne ikke udføre 'gzip -dc'"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: intern bzip2-fejl: '%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: kunne ikke udføre 'bzip2 -dc'"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: intern gzip-fejl: læste: '%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: intern gzip-fejl: skrev: '%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: intern gzip-fejl: læst(%i) != skrevet(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: kunne ikke eksekvere 'gzip' %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: intern bzip2-fejl: læste: '%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: intern bzip2-fejl: skrev: '%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: intern bzip2-fejl: læst(%i) != skrevet(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: kunne ikke udføre bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
@@ -156,7 +141,8 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "opdateringsmappen indeholder filer med forskellige navnelængder (både %d og %"
 "d)"
@@ -171,7 +157,7 @@ msgstr "kan ikke gennems
 msgid "failed to remove incorporated update file %.255s"
 msgstr "kunne ikke slette indlemmet opdateringsfil %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kunne ikke oprette '%.255s'"
@@ -280,7 +266,8 @@ msgstr "kunne ikke lukke '%.250s' efter skrivning af %s-information"
 #: lib/dump.c:323
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
-msgstr "kunne ikke lænke '%.250s' til '%.250s' som sikkerhedskopiering af %s-info"
+msgstr ""
+"kunne ikke lænke '%.250s' til '%.250s' som sikkerhedskopiering af %s-info"
 
 #: lib/dump.c:326
 #, c-format
@@ -421,8 +408,10 @@ msgstr "root- eller null-mappen er n
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "'%s'-felt, manglende pakkenavn eller skrammel, hvor pakkenavnet var forventet"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"'%s'-felt, manglende pakkenavn eller skrammel, hvor pakkenavnet var forventet"
 
 #: lib/fields.c:340
 #, c-format
@@ -754,12 +743,14 @@ msgstr "feltnavn '%.*s' skal efterf
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "Slut-på-fil før værdien af felt '%.*s' (afsluttende linjeskift mangler)"
+msgstr ""
+"Slut-på-fil før værdien af felt '%.*s' (afsluttende linjeskift mangler)"
 
 #: lib/parse.c:174
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
-msgstr "MSDOS-slut-på-fil-tegn i værdien for felt '%.*s' (manglende linjeskift?)"
+msgstr ""
+"MSDOS-slut-på-fil-tegn i værdien for felt '%.*s' (manglende linjeskift?)"
 
 #: lib/parse.c:188
 #, c-format
@@ -843,7 +834,8 @@ msgstr "skal starte med alfanumerisk tegn"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "tegnet '%c' tillades ikke (kun bogstaver, tal og tegnene '%s' tillades)"
+msgstr ""
+"tegnet '%c' tillades ikke (kun bogstaver, tal og tegnene '%s' tillades)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -893,30 +885,30 @@ msgstr "H
 msgid "failed to realloc for variable buffer"
 msgstr "kunne ikke omallokere variabel-mellemlager"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  mangler allerede!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "fejl ved læsning fra dpkg-deb videreførsel"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "fejl ved indstilling af tidsmærker for '%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fejl ved indstilling af ejerskab for '%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fejl ved indstilling af filrettigheder for '%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -925,16 +917,16 @@ msgstr ""
 "forsøger at overskrive '%.250s', som er den omdirigerede version af "
 "'%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakke: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "kunne ikke finde '%.255s' (som jeg skulle til at installere)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -943,114 +935,116 @@ msgstr ""
 "kunne ikke rydde op i rodet omkring '%.255s', inden jeg installerede en "
 "anden version"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "kunne ikke finde genskabt '%.255s', inden jeg installerede en anden version"
+msgstr ""
+"kunne ikke finde genskabt '%.255s', inden jeg installerede en anden version"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet indeholdt objektet '%.255s' med ukendt type 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Erstatter filer i den gamle pakke %s...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Erstattet af filer i den installerede pakke %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "forsøger at overskrive mappen '%.250s' i pakken %.250s med ikke-mappe"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "forsøger at overskrive '%.250s', som også er i pakken %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "læste og oversprang filen '%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "'backend' dpkg-deb under '%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fejl under lukning/skrivning '%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fejl under oprettelse af videreførsel '%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fejl under oprettelse af enhed '%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fejl under oprettelse af hård lænke '%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fejl under oprettelse af symbolsk lænke '%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "fejl under indstilling af ejerskab af symbolsk lænke '%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "kunne ikke oprette mappen '%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "kunne ikke flytte '%.255s' væk for at installere en ny version"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kunne ikke læse lænken '%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kunne ikke oprette sikkerhedskopi af symbolsk lænke for '%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "kunne ikke ændre ejerskab af symbolsk lænke for '%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "kunne ikke oprette sikkerhedskopi af lænke til '%.255s' inden installationen "
 "af en ny version"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kunne ikke installere ny version af '%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1059,7 +1053,7 @@ msgstr ""
 "dpkg: advarsel - ignorerer afhængighedsproblem ved afinstallation af %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1068,7 +1062,7 @@ msgstr ""
 "dpkg: advarsel - overvejer dekonfigurering af den essentielle\n"
 " pakke %s for at muliggøre afinstallation af %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1077,7 +1071,7 @@ msgstr ""
 "dpkg: nej, %s er essentiel, vil ikke dekonfigurere\n"
 " for at muliggøre afinstallation af %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1086,22 +1080,22 @@ msgstr ""
 "dpkg: nej, kan ikke afinstallere %s (--auto-deconfigure ville hjælpe):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: overvejer at afinstallere %s til fordel for %s...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s er ikke ordentligt installeret - ignorerer afhængigheder af den.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: kan få problemer med at afinstallere %s, da den giver %s...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1110,17 +1104,22 @@ msgstr ""
 "dpkg: pakken %s kræver geninstallation, men afinstalleres efter dit ønske "
 "alligevel.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pakken %s kræver geninstallation. Afinstalleres ikke.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ja, vil afinstallere %s fil fordel for %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1129,75 +1128,76 @@ msgstr ""
 "dpkg: vedrørende %s, der indeholder %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "modstridende pakker - installerer ikke %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: advarsel - ignorerer konflikt og fortsætter alligevel.\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive kræver mindst ét stiargument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "kunne ikke eksekvere 'find' for --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "kunne ikke udføre 'fdopen' på find's videreførsel"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "fejl ved læsning af find's videreførsel"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "fejl ved lukning af find's videreførsel"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerede uforudset fejl %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søgte, men fandt ingen pakker (filer, der matcher *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s kræver mindst én pakkearkivfil som argument"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Vælger tidligere fravalgt pakke %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Overspringer tidligere fravalgt pakke %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s af %.250s er allerede installeret, springer over.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - advarsel: nedgraderer %.250s fra %.250s til %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "Vil ikke nedgradere %.250s fra version %.250s til %.250s, springer over.\n"
+msgstr ""
+"Vil ikke nedgradere %.250s fra version %.250s til %.250s, springer over.\n"
 
 #: src/cleanup.c:83
 #, c-format
@@ -1302,7 +1302,8 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: advarsel - kunne ikke slette gammel sikkerhedskopi '%.250s': %s\n"
+msgstr ""
+"dpkg: %s: advarsel - kunne ikke slette gammel sikkerhedskopi '%.250s': %s\n"
 
 #: src/configure.c:241
 #, c-format
@@ -1324,7 +1325,8 @@ msgstr ""
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: advarsel - kunne ikke slette '%.250s' (inden overskrivning): %s\n"
+msgstr ""
+"dpkg: %s: advarsel - kunne ikke slette '%.250s' (inden overskrivning): %s\n"
 
 #: src/configure.c:267
 #, c-format
@@ -1394,7 +1396,8 @@ msgstr "md5hash"
 #: src/configure.c:417
 #, c-format
 msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
-msgstr "dpkg: %s: advarsel - kunne ikke åbne konfigurationsfil %s til hashning: %s\n"
+msgstr ""
+"dpkg: %s: advarsel - kunne ikke åbne konfigurationsfil %s til hashning: %s\n"
 
 #: src/configure.c:435
 #, c-format
@@ -1404,7 +1407,8 @@ msgstr "kunne ikke 
 #: src/configure.c:438
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr "kunne ikke ændre rettighedsflag for medsendt konfigurationsfil '%.250s'"
+msgstr ""
+"kunne ikke ændre rettighedsflag for medsendt konfigurationsfil '%.250s'"
 
 #: src/configure.c:468
 #, c-format
@@ -1426,7 +1430,8 @@ msgstr "kunne ikke udf
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Glem ikke at sætte denne proces i forgrunden ('fg'), når du er færdig!\n"
+msgstr ""
+"Glem ikke at sætte denne proces i forgrunden ('fg'), når du er færdig!\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1549,7 +1554,8 @@ msgstr "[ingen forvalgt handling]"
 
 #: src/configure.c:631
 msgid "error writing to stderr, discovered before conffile prompt"
-msgstr "fejl ved skrivning til standardfejl, opdaget inden konfigurationsfil-prompt"
+msgstr ""
+"fejl ved skrivning til standardfejl, opdaget inden konfigurationsfil-prompt"
 
 #: src/configure.c:638
 msgid "read error on stdin at conffile prompt"
@@ -1564,110 +1570,117 @@ msgstr "Slut-p
 msgid "unable to check for existence of `%.250s'"
 msgstr "kunne ikke tjekke eksistensen af '%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " afhænger af "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " afhænger i forvejen af "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " anbefaler "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " foreslår "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " ødelægger "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " er i konflikt med "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " foreslår "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " forbedrer "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil blive slettet.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vil blive dekonfigureret.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s vil blive installeret, men versionen er %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installeret, men versionen er %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er udpakket, men blev aldrig konfigureret.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er udpakket, men versionen er %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s sidst konfigurerede version er %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s er %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s giver %.250s, men planlægges afinstalleret.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s giver %.250s, men planlægges dekonfigureret.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s giver %.250s, men er %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikke installeret.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) vil blive installeret.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) er %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s giver %.250s og vil blive installeret.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s giver %.250s og er %s.\n"
@@ -1785,8 +1798,10 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture tager ingen parametre"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "--compare-versions kræver tre parametre: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"--compare-versions kræver tre parametre: <version> <relation> <version>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
@@ -1807,7 +1822,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: kunne ikke frigøre hukommelse til ny indgang i listen over mislykkede "
 "pakker."
@@ -1832,7 +1848,8 @@ msgstr "Pakken %s var tilbageholdt, behandler den alligevel, efter dit 
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 "Pakken %s er tilbageholdt, rører den ikke.  Brug --force-hold for at "
 "gennemtvinge.\n"
@@ -2335,7 +2352,8 @@ msgstr ""
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n"
+msgstr ""
+"Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2553,7 +2571,7 @@ msgstr "kunne ikke 
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
@@ -2572,7 +2590,8 @@ msgstr "--%s kr
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
-msgstr "du skal angive pakker ved deres egne navne, ikke ved de filnavne, de ligger i"
+msgstr ""
+"du skal angive pakker ved deres egne navne, ikke ved de filnavne, de ligger i"
 
 #: src/packages.c:150
 #, c-format
@@ -2628,6 +2647,10 @@ msgstr "  Pakken '%s, som giver %s,' er ikke installeret.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Pakken '%s' er ikke installeret.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " afhænger af "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ", men:\n"
@@ -2643,7 +2666,8 @@ msgstr "kunne ikke sikre, at '%.250s' ikke eksisteret"
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "kunne ikke eksekvere 'dpkg-split' for at se om den er en del af multiparter"
+msgstr ""
+"kunne ikke eksekvere 'dpkg-split' for at se om den er en del af multiparter"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2750,7 +2774,8 @@ msgstr "Udpakker %s (fra %s)...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "navnet på konfigurationsfilen (starter med '%.250s') er for langt (>%d tegn)"
+msgstr ""
+"navnet på konfigurationsfilen (starter med '%.250s') er for langt (>%d tegn)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2820,10 +2845,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "kunne ikke tilgå den anden ny fil '%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: advarsel - gammel fil '%.250s' er den samme som adskillige nye filer!  "
 "(både %.250s' og'%.250s')"
@@ -2873,7 +2898,8 @@ msgstr "pakkekontrolinformation indeholdt mappen '%.250s'"
 #: src/processarc.c:792
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
-msgstr "pakkekontrolinformation 'rmdir' af '%.250s' påstod, det ikke er en mappe"
+msgstr ""
+"pakkekontrolinformation 'rmdir' af '%.250s' påstod, det ikke er en mappe"
 
 #: src/processarc.c:798
 #, c-format
@@ -2888,7 +2914,8 @@ msgstr "kunne ikke installere ny informationsfil '%.250s' som '%.250s'"
 #: src/processarc.c:962
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
-msgstr "(Bemærker forsvindingen af %s, der er blevet fuldstændigt erstattet.)\n"
+msgstr ""
+"(Bemærker forsvindingen af %s, der er blevet fuldstændigt erstattet.)\n"
 
 #: src/processarc.c:998
 #, c-format
@@ -2954,7 +2981,8 @@ msgstr "dpkg: %s ikke fundet.\n"
 #: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
-msgstr "Pakken '%s' er ikke installeret og der er ingen tilgængelig information.\n"
+msgstr ""
+"Pakken '%s' er ikke installeret og der er ingen tilgængelig information.\n"
 
 #: src/query.c:350
 #, c-format
@@ -3065,7 +3093,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 "dpkg - advarsel: ignorerer ønsket om at afinstallere %.250s, som ikke er "
 "installeret.\n"
@@ -3256,7 +3285,8 @@ msgstr "kunne ikke tilg
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "rå tilgængelighedsopdatering kræve skriveadgang til dpkg's statusområde"
+msgstr ""
+"rå tilgængelighedsopdatering kræve skriveadgang til dpkg's statusområde"
 
 #: src/update.c:66
 #, c-format
@@ -3282,24 +3312,29 @@ msgstr "--forget-old-unavail tager ingen parametre"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - fejl: %s ('%s') indeholder ingen tal\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build kræver et mappe-parameter"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build kræver mindst to parametre"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "kunne ikke tjekke eksistensen af arkivet '%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "målet er en mappe - kan ikke overspringe kontrolfil-tjek"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3308,43 +3343,44 @@ msgstr ""
 "dpkg-deb: advarsel, tjekker ikke indholdet af kontrolområdet.\n"
 "dpkg-deb: opbygger en ukendt pakke i '%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "pakkenavnet har tegn, der hverken er små bogstaver, tal eller '-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "advarsel, '%s' indeholder brugerangivet prioritetsværdi '%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "advarsel, '%s' indeholder brugerangivet felt '%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d fejl i kontrolfil"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: opbygger pakken '%s' i '%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
-msgstr "kontrolmappen har forkerte rettigheder %03lo (skal være >=0755 og <=0775)"
+msgstr ""
+"kontrolmappen har forkerte rettigheder %03lo (skal være >=0755 og <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "den pakkeansvarliges script '%.50s' er hverken en almindelig fil eller "
 "symbolsk lænke"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3353,135 +3389,136 @@ msgstr ""
 "den pakkeansvarliges script '%.50s' har dårlige filrettigheder %03lo (skal "
 "være >=0555 og <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "den pakkeansvarliges script '%.50s' kan ikke findes"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "tom streng fra 'fgets' under læsning af konfigurationsfiler"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 "advarsel, konfigurationsfilnavn '%.50s...' er for langt, eller mangler "
 "afsluttende linjeskift\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "advarsel, konfigurationsfilnavnet '%s' afsluttes med mellemrum\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "konfigurationsfil '%.250s' optræder ikke i pakken"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "konfigurationsfil '%.250s' kan ikke findes"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "advarsel, konfigurationsfil '%s' er ikke en almindelig fil\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "fejl ved læsning af 'conffiles'-fil"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "fejl ved åbning af 'conffiles'-fil"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignorerer %d advarsler om kontrolfiler\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "kunne ikke lukke mellemlager for '%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "kunne ikke skifte mappe til '%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "kunne ikke skifte mappe til .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "kunne ikke eksekvere 'tar -cf'"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "kunne ikke oprette midlertidig fil (kontrol)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "kunne ikke åbne midlertidig fil (kontrol), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "kunne ikke slette lænke til midlertidig fil (kontrol), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "kontrol"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "kunne ikke køre 'fstat' på midlertidig fil (kontrol)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "kunne ikke hoppe tilbage i midlertidig fil (kontrol)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "kunne ikke oprette midlertidig fil (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "kunne ikke åbne midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "kunne ikke slette lænke til midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "kunne ikke eksekvere 'find'"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "kunne ikke skrive filnavn til tar-videreførsel (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Intern fejl, compress_type '%i' ukendt!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "kunne ikke hoppe tilbage i midlertidig fil (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3560,22 +3597,22 @@ msgstr "arkivet har intet punktum i versionsnummer"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "arkivets version %.250s blev ikke forstået. Hent en nyere dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "sprang over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "filen '%.250s' indeholder uforstået datamedlem %.*s. Opgiver"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "filen '%.250s' indeholder to kontrolmedlemmer. Opgiver"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3584,16 +3621,16 @@ msgstr ""
 " ny debianpakke, version %s.\n"
 " størrelse %ld byte: kontrolarkiv= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "kontrolinformationslængde"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arkivet har forkert udformet kontrollængde '%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3602,15 +3639,15 @@ msgstr ""
 " gammel debianpakke, version %s.\n"
 " størrelse %ld byte: kontrolarkiv= %zi, hovedarkiv= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "kunne ikke allokere hukommelse til variablen ctrlarea "
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "kontrolområde"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3619,65 +3656,65 @@ msgstr ""
 "dpkg-deb: filen ser ud til at være et arkiv, der er blevet\n"
 "dpkg-deb:    ødelagt ved at blive nedhentet i ASCII-tilstand\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "'%.255s' er ikke et arkiv i debianformat"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "kunne ikke hente den aktuelle filposition"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "kunne ikke ændre den aktuelle filposition"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "kunne ikke åbne datalednings-beskrivelsen '1' ved indsættelse"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "kunne ikke skrive til 'gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "kunne ikke lukke 'gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "kunne ikke udføre systemkaldet lseek på arkivfildelen"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "kunne ikke skrive til videreførsel i 'copy'"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "kunne ikke lukke videreførsel i 'copy'"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "kunne ikke oprette mappe"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "kunne ikke skifte til mappe efter at have oprettet den"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "kunne ikke skifte til mappe"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "kunne ikke eksekvere 'tar'"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s kræver et .deb-filnavn som parameter"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3686,12 +3723,12 @@ msgstr ""
 "--%s kræver en målmappe.\n"
 "Måske skulle du bruge 'dpkg --install'?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s tager højst to parametre (.deb og mappe)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tager kun ét parameter(.deb-filnavn)"
@@ -3844,7 +3881,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3855,7 +3892,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Tilvalg:\n"
@@ -3891,7 +3929,7 @@ msgstr ""
 "Skriv 'dpkg-deb --help' for hjælp med manipulation med *.deb-filer\n"
 "Skriv 'dpkg --help' for hjælp med installation og afinstallation af pakker."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukendt komprimeringstype '%s'!"
@@ -3923,7 +3961,8 @@ msgstr "filen '%.250s' is 
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "filen '%.250s' har formatversion '%.250s' - du behøver en nyere dpkg-split"
+msgstr ""
+"filen '%.250s' har formatversion '%.250s' - du behøver en nyere dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3955,7 +3994,8 @@ msgstr "filen '%.250s' is 
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "filen '%.250s' is ødelagt - forkert antal dele for de oplyste størrelser"
+msgstr ""
+"filen '%.250s' is ødelagt - forkert antal dele for de oplyste størrelser"
 
 #: dpkg-split/info.c:157
 #, c-format
@@ -4043,7 +4083,8 @@ msgstr "filerne '%.250s' og '%.250s' er ikke dele af samme fil"
 #: dpkg-split/join.c:89
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
-msgstr "der er flere versioner af del %d - i hvert tilfælde '%.250s' og '%.250s'"
+msgstr ""
+"der er flere versioner af del %d - i hvert tilfælde '%.250s' og '%.250s'"
 
 #: dpkg-split/join.c:102
 msgid "--join requires one or more part file arguments"
@@ -4267,9 +4308,9 @@ msgstr "kildefil '%.250s' ikke en almindelig fil"
 msgid "unable to exec mksplit"
 msgstr "kunne ikke udføre 'mksplit'"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -4282,9 +4323,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4339,7 +4380,7 @@ msgid "try deleting %s"
 msgstr "prøv at slette %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "kunne ikke åbne %s: %s"
@@ -4366,7 +4407,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kunne ikke lukke %s efter læsning: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunne ikke lukke %s: %s"
@@ -4386,12 +4427,12 @@ msgstr "kunne ikke installere %s; den bliver efterladt som %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: kunne ikke låse %s op: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Kan ikke hente ENOENT-værdien fra %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4401,7 +4442,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4455,89 +4496,89 @@ msgstr ""
 "angivet.\n"
 "Pakkescripterne preinst/postrm skal altid angive --package og --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "to tilstande angivet: %s og --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s kræver et 'omrokér-til'-parameter"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "omrokér-til må ikke indeholde linjeskift"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s kræver et <pakke>-parameter>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pakke må ikke indeholde linjeskift"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s kræver et <mappe>-parameter"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukendt tilvalg '%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "kunne ikke åbne omrokeringer: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "manglende altnavn"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "manglende pakke"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s kræver et enkelt parameter"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filenavnet \"%s\" er ikke absolut"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "filen må ikke indeholde linjeskift"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Kan ikke omdirigere mapper"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Efterlader '%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' er i modstrid med '%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Tilføjer '%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4548,7 +4589,7 @@ msgstr ""
 "  under fjernelse af '%s'\n"
 "  fandt '%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4559,37 +4600,37 @@ msgstr ""
 "  under fjernelse af '%s'\n"
 "  fandt '%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Fjerner '%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Ingen omrokeringer '%s', ingen fjernet"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "Intern fejl - ugyldig tilstand '%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "kan ikke finde det gamle navn '%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "kan ikke finde det nye navn '%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "fejl under tjek af '%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4598,52 +4639,52 @@ msgstr ""
 "omdøbning medfører overskrivning af '%s' med\n"
 "  anden fil `%s', ikke tilladt"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "omdøb: fjern identisk gammel lænke '%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "omdøb: omdøb '%s' til '%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "opret diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriv diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "luk diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "fjern gammel diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "opret ny diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installér nye omrokeringer: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern fejl:'%s ugyldig: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4651,7 +4692,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4687,106 +4728,106 @@ msgstr ""
 "  --help                   vis denne hjælpebesked.\n"
 "  --version                vis versionen.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "ingen tilstand angivet"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add kræver fire parametre"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ugyldig bruger %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "ikke-eksisterende bruger %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ugyldig gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "ikke-eksisterende gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "ugyldig tilstand %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "fjerner afsluttende /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Der findes allerede en omgåelse for \"%s\", "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "men --force er angivet, så den ignoreres."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "afbryder"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "advarsel: --update er angivet, men %s eksisterer ikke"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "kunne ikke ændre ejerskab af %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "kunne ikke ændre filrettigheder for %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Der er ingen omgåelser."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "advarsel: --update er værdiløs med --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "kan ikke åbne statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Flere omgåelser for \"%s\", afbryder"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "kan ikke åbne ny statoverride-fil: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "fejl under fjernelse af statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "fejl under oprettelse af ny statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "fejl under installation af ny statoverride: %s"
@@ -5008,7 +5049,7 @@ msgstr "kunne ikke l
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5018,8 +5059,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5039,7 +5080,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5095,95 +5136,36 @@ msgstr ""
 "  --help                   vis denne hjælpebesked.\n"
 "  --version                vis versionen.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "ukendt parameter '%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install kræver <lænke> <navn> <sti> <prioritet>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioritet skal være et heltal"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s kræver <navn> <sti>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s kræver <navn>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave kræver <lænke> <navn> <sti>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "slavenavnet %s eksisterer flere gange"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "slavelænken %s eksisterer flere gange"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "navnet %s er både primær og slave"
-
-#: scripts/update-alternatives.pl:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"kræver --display, --config, --set, --install, --remove, --all, --remove-all "
-"eller --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave er kun tilladt med --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "slaveduplet %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "slavelænke er den samme som hovedlænken %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "slavelænke-duplet %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "sti-duplet %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioritet %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5192,66 +5174,124 @@ msgstr ""
 "Alternativet for %s peger på %s - som ikke blev fundet. Fjerner den fra "
 "listen over alternativer."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativer til %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status er %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lænken peger for øjeblikket på %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " lænken findes ikke i øjeblikket"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lænken er ulæselig - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Ingen tilgængelige versioner."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Den bedste aktuelle version er  %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "ukendt parameter '%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install kræver <lænke> <navn> <sti> <prioritet>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioritet skal være et heltal"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s kræver <navn> <sti>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s kræver <navn>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave kræver <lænke> <navn> <sti>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "slavenavnet %s eksisterer flere gange"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "slavelænken %s eksisterer flere gange"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "navnet %s er både primær og slave"
+
+#: scripts/update-alternatives.pl:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"kræver --display, --config, --set, --install, --remove, --all, --remove-all "
+"eller --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave er kun tilladt med --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Sætter automatisk valg af %s op."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "kunne ikke fjerne %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5260,7 +5300,7 @@ msgstr ""
 "%s er blevet ændret (manuelt eller af et script).\n"
 "Skifter til rent manuelle opdateringer."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5269,69 +5309,69 @@ msgstr ""
 "Tjekker tilgængelige versioner af %s, opdaterer lænkgerne i %s ...\n"
 "(Du kan selv ændre de symbolske lænker der, hvis du vil - se 'man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Omdøber %s-lænke fra %s til %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunne ikke omdøbe %s til %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavelænkenavnet %s findes flere gange"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgt alternativ - skifter til automatisk tilstand"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Sletter den forældede slavelænke %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Genskaber fra tidligere mislykkede opdatering af '%s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunne ikke åbne %s for skrivning: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5340,38 +5380,38 @@ msgstr ""
 "advarsel: %s burde være en symbolsk lænke til %s\n"
 " (eller ikke eksisterende), men readlink fejlede: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kunne ikke sikre at %s ikke fandtes: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kunne ikke installere %s som %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lader fortsat %s (%s) pege på %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Opdaterer %s (%s) til at pege på %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5380,13 +5420,13 @@ msgstr ""
 "advarsel: %s burde være en symbolsk slave-lænke til\n"
 " %s, eller ikke eksistere. readlink mislykkedes: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Fjernelse af %s (%s), er i modstrid med %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5395,7 +5435,7 @@ msgstr ""
 "Der er kun et enkelt program, der giver %s\n"
 "(%s). Intet at sætte op.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5408,47 +5448,56 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Bruger `%s' til at give '%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan ikke finde alternativet '%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fejl under skrivning til standard-ud: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift er ikke tilladt i update-alternatives-filer (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manglende linjeskift efter %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorligt problem: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: kunne ikke udføre 'gzip -dc'"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: kunne ikke udføre 'bzip2 -dc'"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: kunne ikke udføre bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "kunne ikke oprette %.250s"
 
@@ -5823,4 +5872,3 @@ msgstr "Alvorligt problem: %s"
 #~ "  --msdos                         Generér 8.3-filnavne.\n"
 #~ "\n"
 #~ "Afslutningsstatus: 0 = o.k.;  1 = -a er ikke en del;  2 = problemer!\n"
-
diff --git a/po/de.po b/po/de.po
index f63c68cb..6a4abad3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.13.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-07 15:46+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -62,72 +62,57 @@ msgstr "Systemfehler Nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal Nr. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: Konnte »gzip %s« nicht ausführen"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: interner gzip-Fehler: »%s«"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: Konnte »gzip -dc« nicht ausführen"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: interner bzip2-Fehler: »%s«"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: Konnte »bzip2 -dc« nicht ausführen"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: Dekomprimierung"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: interner gzip-Fehler beim Lesen: »%s«"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: interner gzip-Fehler beim Schreiben: »%s«"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: interner gzip-Fehler: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: Konnte »gzip %s« nicht ausführen"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: interner bzip2-Fehler beim Lesen: »%s«"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: interner bzip2-Fehler beim Schreiben: »%s«"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: interner bzip2-Fehler: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: Konnte »bzip2 %s« nicht ausführen"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: Komprimierung"
@@ -173,7 +158,7 @@ msgstr "Kann das Updates-Verzeichnis »%.255s« nicht einlesen"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "Konnte die eingebundene Update-Datei %.255s nicht löschen"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "Kann »%.255s« nicht erzeugen"
@@ -902,30 +887,30 @@ msgstr "Schließende Klammer fehlt in Format\n"
 msgid "failed to realloc for variable buffer"
 msgstr "Konnte kein realloc für Variablenpuffer durchführen"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  schon verschwunden!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "Fehler beim Lesen aus der dpkg-deb-Pipe"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "Fehler beim Setzen des Zeitstempels von »%.255s«"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "Fehler beim Setzen des Eigentümers von »%.255s«"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "Fehler beim Setzen der Zugriffsrechte von »%.255s«"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -934,17 +919,17 @@ msgstr ""
 "Versuche, »%.250s« zu überschreiben, welches die umgeleitete Version von "
 "»%.250s«%.10s%.100s%.10s ist"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (Paket: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 "Kann kein stat auf »%.255s« durchführen (was ich gerade installieren wollte)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -953,29 +938,29 @@ msgstr ""
 "Kann Unordnung um »%.255s« vor der Installation einer anderen Version nicht "
 "aufräumen"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "Kann kein stat auf wiederhergestelltes »%.255s« vor der Installation einer "
 "anderen Version durchführen"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "Archiv enthielt Objekt »%.255s« von unbekanntem Typ 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Ersetze die Dateien im alten Paket %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ersetzt durch Dateien in installiertem Paket %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -983,92 +968,92 @@ msgstr ""
 "Versuche, Verzeichnis »%.250s« in Paket %.250s mit Nichtverzeichnis zu "
 "überschreiben"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "Versuche, »%.250s« zu überschreiben, welches auch in Paket %.250s ist"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "verschlinge ersetzte Datei »%.255s«"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "Backend dpkg-deb während »%.255s«"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "Fehler beim Schließen/Schreiben von »%.255s«"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "Fehler beim Erzeugen der Pipe »%.255s«"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "Fehler beim Erzeugen des Geräts »%.255s«"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "Fehler beim Erzeugen des festen Verweises »%.255s«"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "Fehler beim Erzeugen des symbolischen Verweises »%.255s«"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "Fehler beim Setzen des Eigentümers des symbolischen Verweises »%.255s«"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "Fehler beim Erstellen des Verzeichnisses »%.255s«"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, 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"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "Kann Verweis »%.255s« nicht lesen"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "Kann keinen symbolischen Verweis zur Sicherung von »%.255s« anlegen"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "Kann Eigentümer des symbolischen Verweises zur Sicherung von »%.255s« nicht "
 "setzen"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "Kann keinen Verweis zur Sicherung von »%.255s« vor Installation der neuen "
 "Version anlegen"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "Kann neue Version von »%.255s« nicht installieren"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1077,7 +1062,7 @@ msgstr ""
 "dpkg: Warnung - Ignoriere Abhängigkeitsproblem beim Entfernen von %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1086,7 +1071,7 @@ msgstr ""
 "dpkg: Warnung - Ziehe Dekonfiguration des essenziellen Paketes\n"
 " %s in Betracht, um %s entfernen zu können.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1095,7 +1080,7 @@ msgstr ""
 "dpkg: Nein, %s ist essenziell, werde es nicht dekonfigurieren,\n"
 " um %s entfernen zu können.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1104,24 +1089,24 @@ msgstr ""
 "dpkg: Nein, kann %s nicht entfernen (--auto-deconfigure wird helfen):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: Ziehe Entfernen von %s zugunsten von %s in Betracht ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s ist nicht sauber installiert - ignoriere alle Abhängigkeiten darauf.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: Könnte Probleme haben, %s zu entfernen, da es %s bereitstellt ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1130,18 +1115,23 @@ msgstr ""
 "dpkg: Paket %s erfordert Neuinstallation, wird aber auf Ihren Wunsch hin "
 "trotzdem entfernt.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg: Paket %s muss neu installiert werden, werde es nicht entfernen.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: Ja, werde %s zugunsten von %s entfernen.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1150,72 +1140,72 @@ msgstr ""
 "dpkg: Betreffend %s, welches %s enthält:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "Kollidierende Pakete - installiere %.250s nicht"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: Warnung - ignoriere Kollision, kann trotzdem weitermachen!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive benötigt mindestens einen Pfad als Argument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "Konnte find für --recursive nicht ausführen"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "Konnte kein fdopen auf die Pipe von find durchführen"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "Fehler beim Lesen der Pipe von find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "Fehler beim Schließen der Pipe von find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "Suche für --recursive gab unbehandelten Fehler %i zurück"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "durchsucht, aber keine Pakete (auf *.deb passende Dateien) gefunden"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s benötigt mindestens eine Paket-Archivdatei als Argument"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Wähle vormals abgewähltes Paket %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Überspringe abgewähltes Paket %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s von %.250s ist bereits installiert, übergehe es.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - Warnung: deaktualisiere %.250s von %.250s zu %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1595,110 +1585,117 @@ msgstr "EOF auf Standardeingabe an der Conffile-Eingabeaufforderung"
 msgid "unable to check for existence of `%.250s'"
 msgstr "Kann Existenz von »%.250s« nicht prüfen"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " hängt ab von "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " hängt ab (vorher) von "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " empfiehlt "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " befürwortet "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " deaktiviert "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " kollidiert mit "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " befürwortet "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " erweitert "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s soll entfernt werden.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s soll dekonfiguriert werden.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s soll installiert werden, ist aber Version %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ist installiert, ist aber Version %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ist entpackt, wurde aber nie konfiguriert.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ist entpackt, ist aber Version %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s letzte konfigurierte Version ist %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ist %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s liefert %.250s, soll aber entfernt werden.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s liefert %.250s, soll aber dekonfiguriert werden.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s liefert %.250s, ist aber %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ist nicht installiert.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (Version %.250s) soll installiert werden.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (Version %.250s) ist %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s liefert %.250s und wird installiert.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s liefert %.250s und ist %s.\n"
@@ -2605,7 +2602,7 @@ msgstr "Konnte »%i« nicht für Datenstrom öffnen"
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes EOF vor Ende der Zeile %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"
@@ -2682,6 +2679,10 @@ msgstr "  Paket %s, das %s bereitstellt, ist nicht installiert.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Paket %s ist nicht installiert.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " hängt ab von "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; aber:\n"
@@ -2878,10 +2879,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "Kann kein stat auf andere neue Datei »%.250s« durchführen"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: Warnung - alte Datei »%.250s« ist die gleiche wie mehrere neue "
 "Dateien! (sowohl »%.250s« als auch »%.250s«)"
@@ -3356,25 +3357,30 @@ msgstr "--forget-old-unavail akzeptiert keine Argumente"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - Fehler: %s (»%s«) enthält keine Ziffern\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build braucht ein Verzeichnis als Argument"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build akzeptiert maximal zwei Argumente"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "Kann Existenz des Archivs »%.250s« nicht überprüfen"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "Ziel ist ein Verzeichnis - kann Control-Datei-Überprüfung nicht übergehen"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3383,45 +3389,45 @@ msgstr ""
 "dpkg-deb: Warnung, prüfe Inhalt des control-Bereichs nicht.\n"
 "dpkg-deb: Baue ein unbekanntes Paket in »%s«.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "Paketname hat Zeichen, die keine Kleinbuchstaben, Ziffern oder »-+.« sind"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "Warnung, »%s« enthält benutzerdefinierten Prioritätswert »%s«\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "Warnung, »%s« enthält benutzerdefiniertes Feld »%s«\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d Fehler in Control-Datei"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Baue Paket »%s« in »%s«.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "Control-Verzeichnis hat falsche Zugriffsrechte %03lo (muss >=0755 und <=0775 "
 "sein)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "Betreuerskript »%.50s« ist keine gewöhnliche Datei oder symbolischer Verweis"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3430,16 +3436,16 @@ msgstr ""
 "Betreuerskript »%.50s« hat falsche Zugriffsrechte %03lo (muss >=0555 und "
 "<=0775 sein)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "Auf Betreuerskript »%.50s« kann kein stat durchgeführt werden"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "leere Zeichenkette von fgets beim Lesen aus conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3447,119 +3453,119 @@ msgstr ""
 "Warnung, Conffile-Name »%.50s...« ist zu lang oder Zeilenvorschub am Ende "
 "fehlt\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "Warnung, Conffile-Dateiname »%s« enthält Leerzeichen am Ende\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "Conffile »%.250s« kommt nicht im Paket vor"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "Auf Conffile »%.250s« kann kein stat durchgeführt werden"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "Warnung, Conffile »%s« ist keine gewöhnliche Datei\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "Fehler beim Lesen der conffiles-Datei"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "Fehler beim Öffnen der conffiles-Datei"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: Ignoriere %d Warnungen wegen der control-Datei(en)\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "Kann »%.255s« nicht entpuffern"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "Konnte nicht in das Verzeichnis »%.255s« wechseln"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "Konnte nicht in das Verzeichnis .../DEBIAN wechseln"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "Konnte »tar -cf« nicht ausführen"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "Konnte temporäre Datei nicht erstellen (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "Konnte temporäre Datei nicht öffnen (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "unlink von temporärer Datei fehlgeschlagen (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "Konnte kein fstat auf temporäre Datei durchführen (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "Konnte temporäre Datei nicht zurücksetzen (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "Konnte temporäre Datei nicht erstellen (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "Konnte temporäre Datei nicht öffnen (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "unlink von temporärer Datei fehlgeschlagen (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "Konnte find nicht ausführen"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "Konnte Dateinamen nicht in tar-Pipe schreiben (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Interner Fehler, compress_type »%i« unbekannt!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "Konnte temporäre Datei nicht zurücksetzen (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3639,22 +3645,22 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "Archiv-Version %.250s nicht verstanden, installieren Sie ein neueres dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "Elementdaten von %s ausgelassen"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "Datei »%.250s« enthält nicht verstandene Datenelemente %.*s, gebe auf"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "Datei »%.250s« enthält zwei Control-Elemente, gebe auf"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3663,16 +3669,16 @@ msgstr ""
 " neues Debian-Paket, Version %s.\n"
 " Größe %ld Byte: control-Archiv= %zi Byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "control-Informationslänge"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "Archiv hat falsch formatierte control-Länge »%s«"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3681,15 +3687,15 @@ msgstr ""
 " altes Debian-Paket, Version %s.\n"
 " Größe %ld Byte: control-Archiv= %zi, Hauptarchiv= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Fehler beim Zuweisen von Speicher für Variable »ctrlarea«"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "control-Bereich"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3698,65 +3704,65 @@ msgstr ""
 "dpkg-deb: Datei könnte ein Archiv sein, das\n"
 "dpkg-deb:    durch einen Download im ASCII-Modus beschädigt wurde\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "»%.255s« ist kein Archiv im Debian-Format"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "Konnte aktuelle Position in der Datei nicht erhalten"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "Konnte aktuelle Position in der Datei nicht setzen"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "Konnte Pipe-Deskriptor »1« bei paste nicht öffnen"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "Fehler beim Schreiben nach gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "Fehler beim Schließen von gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "Fehler bei lseek auf Dateiarchiv-Teil"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "Konnte beim Kopieren nicht in die Pipe schreiben"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "Konnte Pipe beim Kopieren nicht schließen"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "Konnte Verzeichnis nicht erstellen"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "Konnte nach Erstellen des Verzeichnisses nicht hineinwechseln"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "Konnte nicht in Verzeichnis hineinwechseln"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "Konnte tar nicht ausführen"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s braucht einen .deb-Dateinamen als Argument"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3765,12 +3771,12 @@ msgstr ""
 "--%s braucht ein Zielverzeichnis.\n"
 "Vielleicht sollten Sie dpkg --install verwenden?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s akzeptiert maximal zwei Argumente (.deb und Verzeichnis)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s akzeptiert nur ein Argument (.deb-Dateiname)"
@@ -3927,7 +3933,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3938,7 +3944,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Optionen:\n"
@@ -3976,7 +3983,7 @@ msgstr ""
 "Geben Sie dpkg-deb --help für Hilfe zum Verändern von *.deb-Dateien ein;\n"
 "Geben Sie dpkg --help für Hilfe zum (De-)Installieren von Paketen ein."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "unbekannter Komprimierungstyp »%s«!"
@@ -4359,9 +4366,9 @@ msgid "unable to exec mksplit"
 msgstr "Kann mksplit nicht ausführen"
 
 #
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s.\n"
@@ -4374,9 +4381,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4433,7 +4440,7 @@ msgid "try deleting %s"
 msgstr "Versuchen Sie, %s zu löschen"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "Kann %s nicht öffnen: %s"
@@ -4460,7 +4467,7 @@ msgid "unable to close %s after read: %s"
 msgstr "Kann %s nach dem Lesen nicht schließen: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Kann %s nicht schließen: %s"
@@ -4480,12 +4487,12 @@ msgstr "Konnte Datei %s nicht installieren; sie wird als %s übrig bleiben: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: Kann Sperre von %s nicht aufheben: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Kann ENOENT-Wert nicht von %s erhalten: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4495,7 +4502,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4551,89 +4558,89 @@ msgstr ""
 "falls angegeben. Paket-preinst/postrm-Skripte sollten immer --package\n"
 "und --divert angeben.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "Zwei Modi angegeben: %s und --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s benötigt ein Argument, wohin umgeleitet wird"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "Name der Umleitung darf keine Zeilenvorschübe enthalten"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s benötigt einen Paketnamen als Argument"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "Paketname darf keine Zeilenvorschübe enthalten"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s benötigt ein Verzeichnis als Argument"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "unbekannte Option »%s«"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "Kann diversions nicht öffnen: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "fehlender Alternativname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "fehlendes Paket"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s braucht ein einzelnes Argument"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "Dateiname »%s« ist nicht absolut"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "Dateiname darf keine Zeilenvorschübe enthalten"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Kann keine Verzeichnisse umleiten"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Behalte »%s« bei"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "»%s« kollidiert mit »%s«"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Füge »%s« hinzu"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4644,7 +4651,7 @@ msgstr ""
 "  beim Entfernen von »%s«\n"
 "  »%s« gefunden"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4655,37 +4662,37 @@ msgstr ""
 "  beim Entfernen von »%s«\n"
 "  »%s« gefunden"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Entferne »%s«"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Keine Umleitung »%s«, keine entfernt"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "interner Fehler - falscher Modus »%s«"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "Kann kein stat auf alten Namen »%s« durchführen: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "Kann kein stat auf neuen Namen »%s« durchführen: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "Fehler beim Überprüfen von »%s«: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4694,52 +4701,52 @@ msgstr ""
 "Umbenennen beinhaltet Überschreiben von »%s« mit\n"
 "  anderer Datei »%s«, nicht erlaubt"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: Entfernen des doppelten alten Links »%s«: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: Umbenennen von »%s« nach »%s«: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "Anlegen von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "Schreiben von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "Schließen von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "Entfernen von alter diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "Anlegen von neuer diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "Installieren von neuer diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interner Fehler: %s defekt: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4747,7 +4754,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4783,106 +4790,106 @@ msgstr ""
 "  --help                   diesen Hilfetext anzeigen.\n"
 "  --version                Version anzeigen.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "kein Modus angegeben"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add benötigt vier Argumente"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ungültiger Benutzer %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "nicht existenter Benutzer %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ungültige Gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "nicht existente Gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "ungültiger Modus %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "entferne abschließende(n) /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Ein Override für »%s« existiert bereits, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "wird aber ignoriert, da --force angegeben ist."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "Abbruch"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "Warnung: --update angegeben, aber %s existiert nicht"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "Konnte Eigentümer von %s nicht ändern: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "Konnte Zugriffsrechte von %s nicht ändern: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Kein Override vorhanden."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "Warnung: --update ist sinnlos für --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "Kann statoverride nicht öffnen: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Mehrere Overrides für »%s«, Abbruch"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "Kann neue statoverride-Datei nicht öffnen: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "Fehler beim Entfernen von statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "Fehler beim Anlegen der neuen statoverride-old:%s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "Fehler beim Installieren der neuen statoverride: %s"
@@ -5103,7 +5110,7 @@ msgstr "Kann %s nicht lesen: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5113,8 +5120,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5134,7 +5141,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5191,95 +5198,36 @@ msgstr ""
 "  --help                   diesen Hilfetext anzeigen.\n"
 "  --version                Version anzeigen.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "unbekanntes Argument »%s«"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install benötigt <Link> <Name> <Pfad> <Priorität>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "Priorität muss eine Ganzzahl sein"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s benötigt <Name> <Pfad>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s benötigt <Name>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave benötigt <Link> <Name> <Pfad>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "doppelter Slave-Name %s"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "doppelter Slave-Link %s"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "Name %s ist sowohl primär als auch slave"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "Link %s ist sowohl primär als auch slave"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"brauche --display, --config, --set, --install, --remove, --all, --remove-all "
-"oder --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave ist nur mit --install erlaubt"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "doppelter Slave %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "Slave-Link ist derselbe wie Haupt-Link %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "doppelter Slave-Link %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "doppelter Pfad %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "Priorität %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5288,66 +5236,124 @@ msgstr ""
 "Alternative für %s verweist auf %s - was nicht gefunden wurde. Entferne es "
 "aus der Liste der Alternativen."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Keine Alternativen für %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - Status ist %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " Link verweist zur Zeit auf %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " Link zur Zeit nicht vorhanden"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " Link unlesbar - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - Priorität %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " Slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Keine Versionen verfügbar."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Gegenwärtig »beste« Version ist %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "unbekanntes Argument »%s«"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install benötigt <Link> <Name> <Pfad> <Priorität>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "Priorität muss eine Ganzzahl sein"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s benötigt <Name> <Pfad>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s benötigt <Name>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave benötigt <Link> <Name> <Pfad>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "doppelter Slave-Name %s"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "doppelter Slave-Link %s"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "Name %s ist sowohl primär als auch slave"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "Link %s ist sowohl primär als auch slave"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"brauche --display, --config, --set, --install, --remove, --all, --remove-all "
+"oder --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave ist nur mit --install erlaubt"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Richte automatische Auswahl von %s ein."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "Kann %s nicht entfernen: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5356,7 +5362,7 @@ msgstr ""
 "%s wurde geändert (manuell oder von einem Skript).\n"
 "Wechsle zu ausschließlich manuellen Aktualisierungen."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5366,70 +5372,70 @@ msgstr ""
 "(Sie können die symbolischen Links dort selbst ändern, falls gewünscht - "
 "siehe »man ln«.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Benenne %s-Link von %s in %s um."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "Kann %s nicht in %s umbenennen: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "Slave-Link Name %s doppelt"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Entferne manuell ausgewählte Alternative - wechsle zu Auto-Modus"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verwerfe veralteten Slave-Link %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Behebe zuvor fehlgeschlagene Aktualisierung von %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Kann %s nicht zum Schreiben öffnen: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5438,38 +5444,38 @@ msgstr ""
 "Warnung: %s sollte ein symbolischer Link auf %s sein\n"
 " (oder nicht existent); jedoch schlug readlink fehl: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "Kann nicht sicherstellen, dass %s nicht existiert: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "Kann %s nicht als %s installieren: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lasse %s (%s) weiterhin auf %s verweisen."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualisiere %s (%s), auf %s zu verweisen."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5478,13 +5484,13 @@ msgstr ""
 "Warnung: %s sollte ein symbolischer Slave-Link auf\n"
 " %s sein oder nicht existieren; jedoch schlug readlink fehl: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Entferne %s (%s), nicht angebracht mit %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5493,7 +5499,7 @@ msgstr ""
 "Es gibt nur 1 Programm, welches %s bereitstellt\n"
 "(%s). Nichts zu konfigurieren.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5506,43 +5512,52 @@ msgstr ""
 "  Auswahl      Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Verwende »%s«, um »%s« bereitzustellen."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kann Alternative »%s« nicht finden."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "Fehler beim Schreiben auf Standardausgabe: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "Zeilenvorschübe sind in update-alternatives-Dateien (%s) verboten"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "fehlender Zeilenvorschub nach %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Schwerwiegendes Problem: %s"
+
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: Konnte »gzip -dc« nicht ausführen"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: Konnte »bzip2 -dc« nicht ausführen"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: Konnte »bzip2 %s« nicht ausführen"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index e12dd007..41fd70db 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,72 +58,57 @@ msgstr ""
 msgid "Signal no.%d"
 msgstr ""
 
-#: lib/compression.c:45
+#: lib/compression.c:34
 #, c-format
-msgid "%s: internal gzip error: `%s'"
+msgid "%s: failed to exec '%s %s'"
 msgstr ""
 
-#: lib/compression.c:60
+#: lib/compression.c:62
 #, c-format
-msgid "%s: failed to exec gzip -dc"
+msgid "%s: internal gzip error: `%s'"
 msgstr ""
 
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr ""
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr ""
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr ""
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr ""
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr ""
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr ""
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr ""
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr ""
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr ""
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr ""
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr ""
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr ""
@@ -165,7 +150,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -875,291 +860,296 @@ msgstr ""
 msgid "failed to realloc for variable buffer"
 msgstr ""
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr ""
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr ""
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
 msgstr ""
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr ""
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr ""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr ""
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr ""
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1486,110 +1476,117 @@ msgstr ""
 msgid "unable to check for existence of `%.250s'"
 msgstr ""
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, c-format
+msgid "%s depends on %s"
 msgstr ""
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, c-format
+msgid "%s pre-depends on %s"
 msgstr ""
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, c-format
+msgid "%s recommends %s"
 msgstr ""
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, c-format
+msgid "%s suggests %s"
 msgstr ""
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:168
+#, c-format
+msgid "%s breaks %s"
 msgstr ""
 
-#: src/depcon.c:158
-msgid " suggests "
+#: src/depcon.c:171
+#, c-format
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, c-format
+msgid "%s enhances %s"
 msgstr ""
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
@@ -2292,7 +2289,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
@@ -2365,6 +2362,10 @@ msgstr ""
 msgid "  Package %s is not installed.\n"
 msgstr ""
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr ""
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ""
@@ -2550,7 +2551,7 @@ msgstr ""
 #, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 
 #: src/processarc.c:715
@@ -2959,199 +2960,204 @@ msgstr ""
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr ""
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr ""
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr ""
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr ""
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr ""
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr ""
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr ""
 
@@ -3228,130 +3234,130 @@ msgstr ""
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %ld bytes: control archive= %zi bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr ""
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr ""
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr ""
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3501,7 +3507,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3520,7 +3527,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -3864,9 +3871,9 @@ msgstr ""
 msgid "unable to exec mksplit"
 msgstr ""
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -3877,9 +3884,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -3924,7 +3931,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr ""
@@ -3951,7 +3958,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -3971,19 +3978,19 @@ msgstr ""
 msgid "%s: unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4013,89 +4020,89 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4103,7 +4110,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4111,95 +4118,95 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4219,106 +4226,106 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4509,14 +4516,14 @@ msgstr ""
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4537,7 +4544,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4557,291 +4564,290 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
+#: scripts/update-alternatives.pl:131
+msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
+#: scripts/update-alternatives.pl:135
+#, perl-format
+msgid "duplicate slave %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
+#: scripts/update-alternatives.pl:138
+#, perl-format
+msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:136
+#: scripts/update-alternatives.pl:139
 #, perl-format
-msgid "--%s needs <name> <path>"
+msgid "duplicate slave link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:141
+#: scripts/update-alternatives.pl:143
 #, perl-format
-msgid "--%s needs <name>"
+msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
+#: scripts/update-alternatives.pl:149
+#, perl-format
+msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:147
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "slave name %s duplicated"
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:148
+#: scripts/update-alternatives.pl:168
 #, perl-format
-msgid "slave link %s duplicated"
+msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:164
+#: scripts/update-alternatives.pl:187
 #, perl-format
-msgid "name %s is both primary and slave"
+msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:165
+#: scripts/update-alternatives.pl:191
 #, perl-format
-msgid "link %s is both primary and slave"
+msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
+#: scripts/update-alternatives.pl:193
+msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
+#: scripts/update-alternatives.pl:195
+#, perl-format
+msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:176
-msgid "manflag"
+#: scripts/update-alternatives.pl:199
+#, perl-format
+msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:203
 #, perl-format
-msgid "duplicate slave %s"
+msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:183
-#, perl-format
-msgid "slave link same as main link %s"
+#: scripts/update-alternatives.pl:208
+msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:210
 #, perl-format
-msgid "duplicate slave link %s"
+msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:237
 #, perl-format
-msgid "duplicate path %s"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
-#, perl-format
-msgid "priority %s %s"
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
-#, perl-format
-msgid ""
-"Alternative for %s points to %s - which wasn't found.  Removing from list of "
-"alternatives."
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:256
 #, perl-format
-msgid "No alternatives for %s."
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:261
 #, perl-format
-msgid "%s - status is %s."
+msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
-#, perl-format
-msgid " link currently points to %s"
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
-msgid " link currently absent"
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:268
 #, perl-format
-msgid " link unreadable - %s"
+msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:284
 #, perl-format
-msgid "%s - priority %s"
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:286
 #, perl-format
-msgid " slave %s: %s"
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
-msgid "No versions available."
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:241
-#, perl-format
-msgid "Current `best' version is %s."
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4850,41 +4856,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index ba54549a..36e4c25f 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-09-19 11:37+0530\n"
 "Last-Translator: norbu <nor_den@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -62,72 +62,57 @@ msgstr "རིམ་ལུགས་འཛོལ་བའི་ཨང་ %d"
 msgid "Signal no.%d"
 msgstr "བརྡ་རྟགས་ཨང་ %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: gzip %s ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: gzip -dc ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: bzip2 -dc ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: ཨེབ་བཙུགས་བཤོལ་ནི།"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: ལྷག: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ: འབྲི་: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: ནང་འཁོད་ gzip འཛོལ་བ་: ལྷག་(%i) != འབྲི་(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: gzip %s ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: ལྷག: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛོལ་བ: འབྲི་: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: ནང་འཁོད་ bzip2 འཛེོལ་བ: ལྷག(%i) != འབྲི་(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: bzip2 %s ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: ཨེབ་བཙུགས།"
@@ -148,13 +133,20 @@ msgstr "དྲྭ་རྟགས་སྙན་ཞུའི་སྐབས་འ
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "དུས་མཐུན་བཟོ་ཡོད་པའི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ `%.250s' ག་གི་མིང་རིང་དྲགས་མི་(རིང་ཚད་=%d མང་མཐའ་=%d)འདི་ཡོདཔ་ཨིན།"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"དུས་མཐུན་བཟོ་ཡོད་པའི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ `%.250s' ག་གི་མིང་རིང་དྲགས་མི་(རིང་ཚད་=%d མང་"
+"མཐའ་=%d)འདི་ཡོདཔ་ཨིན།"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "དུས་མཐུན་བཟོ་ཡོད་མི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ རིང་ཚད་མིང་སོ་སོ་འབད་མི་( %d དང་ %d གཉིས་ཆ་ར་)ཚུ་ཡོདཔ་ཨིན།"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"དུས་མཐུན་བཟོ་ཡོད་མི་སྣོད་ཐོའི་ནང་ན་ ཡིག་སྣོད་ རིང་ཚད་མིང་སོ་སོ་འབད་མི་( %d དང་ %d གཉིས་ཆ་ར་)ཚུ་"
+"ཡོདཔ་ཨིན།"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -166,9 +158,7 @@ msgstr "དུས་མཐོན་ཀྱི་སྣོད་ཐོ་ `%.255s'
 msgid "failed to remove incorporated update file %.255s"
 msgstr "གཅིག་ཁར་སྡེབ་ཡོད་པའི་དུས་མཐུན་གྱི་ཡིག་སྣོད་ %.255s རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས།"
@@ -198,7 +188,8 @@ msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁ
 
 #: lib/dbmodify.c:157
 msgid "operation requires read/write access to dpkg status area"
-msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
+msgstr ""
+"ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
 
 #: lib/dbmodify.c:205
 #, c-format
@@ -277,12 +268,15 @@ msgstr " `%.250s' འདི་ %s བརྡ་དོན་འབྲི་བའ
 #: lib/dump.c:323
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
-msgstr "%s བརྡ་དོན་གྱི་རྒྱབ་ཐག་གི་དོན་ལུ་ `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
+msgstr ""
+"%s བརྡ་དོན་གྱི་རྒྱབ་ཐག་གི་དོན་ལུ་ `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་"
+"ཡོད།"
 
 #: lib/dump.c:326
 #, c-format
 msgid "failed to install `%.250s' as `%.250s' containing %s info"
-msgstr " `%.250s' འདི་ `%.250s' ནང་ན་ %s བརྡ་དོན་ཡོད་མི་སྦེ་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
+msgstr ""
+" `%.250s' འདི་ `%.250s' ནང་ན་ %s བརྡ་དོན་ཡོད་མི་སྦེ་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
 #: lib/ehandle.c:81
 msgid "out of memory pushing error handler: "
@@ -418,8 +412,10 @@ msgstr "རྩ་བ་ཡང་ན་སྟོང་ཆ་སྣོད་ཐོ
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་གྱི་མིང་རེ་བ་བསྐྱེད་ཡོད་ས་ལུ་ ཐུམ་སྒྲིལ་མིང་  ཡང་ན་ཕྱགས་ཉིག་ བརླག་སྟོར་ཞུགས་ཡོདཔ།"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་གྱི་མིང་རེ་བ་བསྐྱེད་ཡོད་ས་ལུ་ ཐུམ་སྒྲིལ་མིང་  ཡང་ན་ཕྱགས་ཉིག་ བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
 #: lib/fields.c:340
 #, c-format
@@ -464,10 +460,10 @@ msgid ""
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་:\n"
-"ཐོན་རིམ་གནས་གོང་འདི་ ཀ་ཁ་ཨང་ཡིག༌-མེད་མི་དང་ཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན། བར་སྟོང་ཅིག་ཁ་སྐོང་རྐྱབས་ནིའི་བསམ་འཆར་བཀོད།"
+"ཐོན་རིམ་གནས་གོང་འདི་ ཀ་ཁ་ཨང་ཡིག༌-མེད་མི་དང་ཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན། བར་སྟོང་ཅིག་ཁ་སྐོང་རྐྱབས་ནིའི་"
+"བསམ་འཆར་བཀོད།"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' ས་སྒོ་ `%.255s' ལུ་གཞི་བསྟུན:ཐོན་རིམ་ནང་ན་ `%c'ཡོད།"
@@ -517,8 +513,7 @@ msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་ཀྱི་ག
 msgid "malloc failed (%ld bytes)"
 msgstr "མཱལ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོདཔ་ (%ld བཱའིཊིསི་)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "རིའ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོདཔ་ (%ld བཱ་འིཊིསི)"
@@ -561,8 +556,7 @@ msgstr "ལས་སྦྱོར་ཡན་ལག་ %s སླར་ལོག
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg:ཉེན་བརྡ: -  %s འདི་ བརྡ་རྟགས་ (%s)%s གིས་གསད་ཡོདཔ།\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", ནང་རྙིང་བཀོག་བཞག་ཡོདཔ།"
 
@@ -671,8 +665,7 @@ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ན
 msgid "error closing configuration file `%.255s'"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ `%.255s' ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "སི་ཨེཕ་ཇི་ཡིག་སྣོད་མིང་གི་དོན་ལུ་དྲན་ཚད་སྤྲོད་བཞག་ནིའི་འཛོལ་བ།"
 
@@ -754,7 +747,8 @@ msgstr "ས་སྒོ་མིང་ `%.*s' འདི་ཀོ་ལཱོན
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "ས་སྒོ་ `%.*s' གི་གནས་གོང་གི་ཧེ་མ་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
+msgstr ""
+"ས་སྒོ་ `%.*s' གི་གནས་གོང་གི་ཧེ་མ་ཨི་ཨོ་ཨེཕ་(མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།)"
 
 #: lib/parse.c:174
 #, c-format
@@ -891,159 +885,167 @@ msgstr "རྩ་སྒྲིག་ནང་ལུ་བརླག་སྟོར
 msgid "failed to realloc for variable buffer"
 msgstr "འགྱུར་ཅན་གནས་ཁོངས་ཀྱི་དོན་ལུ་རི་ཨ་ལོཀ་་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "ལས་སྦྱོར་ཡིག་མཛོད་... ཧེ་མ་ལས་ཡལ་ཡོདཔ !(_a)"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb རྒྱུད་དུང་ལས་ལྷག་ནི་འཛོལ་བ།"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "`%.255s' གི་དུས་བཀོད་གཞི་སྒྲིག་འབད་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' གི་བདག་པོ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' གི་གནང་བ་གཞི་སྒྲིག་གི་འཛོལ་བ།"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "`%.250s'%.10s%.100s%.10s གི་ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཐོན་རིམ་ཨིན་མི་ `%.250s' འདི་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"`%.250s'%.10s%.100s%.10s གི་ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཐོན་རིམ་ཨིན་མི་ `%.250s' འདི་ཚབ་སྲུང་འབད་"
+"ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr "(ཐུམ་སྒྲིལ:"
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "`%.255s' སི་ཊེཊི་འབད་མ་ཚུགས།(ང་གིས་གཞི་བཙུགས་འབད་ནི་འབད་མི་དེ)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
-msgstr "ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' མཐའ་འཁོར་ཁམས་ལོག་སི་སི་ཚུ་བསལ་གཏང་ནི་འབད་མ་ཚུགས།"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
+msgstr ""
+"ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' མཐའ་འཁོར་ཁམས་ལོག་སི་སི་ཚུ་བསལ་གཏང་ནི་"
+"འབད་མ་ཚུགས།"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ སོར་ཆུད་འབད་ཡོད་པའི་ `%.255s' འདི་སི་ཊེཊི་འབད་མ་ཚུགས།"
+msgstr ""
+"ཐོན་རིམ་གཞན་མི་ཅིག་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ སོར་ཆུད་འབད་ཡོད་པའི་ `%.255s' འདི་སི་ཊེཊི་འབད་མ་"
+"ཚུགས།"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "ཡིག་མཛོད་ཀྱི་ནང་ན་དངོས་པོ་ `%.255s' མ་ཤེས་པའི་དབྱེ་བ་ 0x%x འདུག"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "ཐུམ་སྒྲིལ་ %s རྙིངམ་ནང་ལུ་ཡིག་སྣོད་ཚུ་ཚབ་བཙུགས་དོ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱིས་ཚབ་བཙུགས་ཡོད...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "སྣོད་ཐོ་མིན་པ་དང་ཅིག་ཁར་ ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་སྣོད་ཐོ་ `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"སྣོད་ཐོ་མིན་པ་དང་ཅིག་ཁར་ ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་སྣོད་ཐོ་ `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་"
+"བསྐྱེད་དོ།"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "ཐུམ་སྒྲིལ་ %.250s ནང་ལུ་ཡང་ཡོད་མི་  `%.250s' ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "གོ་བཱལ་གྱི་ཡིག་སྣོད་ `%.255s' ཚབ་བཙུགས་ཡོད།"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' སྐབས་ dpkg-deb རྒྱབ་མཐའ་འབད།"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s' ཁ་བསྡམ་ནི་/འབྲི་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "ཐབས་འཕྲུལ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "བརྡ་མཚོན་འབྲེལ་ལམ་ `%.255s' གི་བདག་པོ་གཞི་སྒྲིག་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "སྣོད་ཐོ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་  `%.255s' ཟུར་ཁ་བཤུད་མ་ཚུགས།"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "འབྲེལ་ལམ་ `%.255s' ལྷག་མ་ཚུགས།"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s' གི་དོན་ལུ་རྒྱབ་ཐག་བརྡ་མཚོན་འབྲེལ་ལམ་ཅའུན་འབད་མ་ཚུགས།"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་མ་འབད་བའི་ཧེ་མ་ `%.255s' གི་རྒྱབ་ཐག་འབྲེལ་ལམ་བཟོ་མ་ཚུགས།"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' གི་ཐོན་རིམ་གསརཔ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1052,7 +1054,7 @@ msgstr ""
 "dpkg: ཉེན་བརྡ་ - %s གི་རྩ་བསྐྲད་དང་ཅིག་ཁར་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་སྣང་མེད་བཞགཔ་ད:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1061,7 +1063,7 @@ msgstr ""
 "dpkg: ཉེན་བརྡ་ - ཁག་ཆེ་བའི་ཐུམ་སྒྲིལ་ %s གི་རིམ་སྒྲིག་མི་འབད་ནི་ཆ་འཇོག་འབདཝ་དོ་\n"
 " %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1070,7 +1072,7 @@ msgstr ""
 "dpkg: མེད། %s འདི་ཁག་ཆེཝ་ཨིན། འདི་རིམ་སྒྲིག་འབད་འོང་\n"
 "  %s རྩབསྐྲད་གཏང་ནི་ལྕོགས་ཅན་བཟོ་ནིའི་དོན་ལས།\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1079,37 +1081,47 @@ msgstr ""
 "dpkg: མེད། %s རྩ་བསྐྲད་གཏང་མི་ཚུགས་ (--auto-deconfigure གི་གྲོགས་རམ་འབད་འོང་):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s གི་དོན་ལུ་ %s རྩ་བསྐྲད་གཏང་ནི་ཆ་འཇོག་འབད་དོ་ ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
-msgstr "%s འདི་ལེ་ཤོམ་སྦེ་གཞི་བཙུགས་མ་འབད་བས་ - འདི་གུའི་རྟེན་འབྲེལ་ག་ཅི་འབད་རུང་སྣང་མེད་བཞག་དོ།\n"
+msgstr ""
+"%s འདི་ལེ་ཤོམ་སྦེ་གཞི་བཙུགས་མ་འབད་བས་ - འདི་གུའི་རྟེན་འབྲེལ་ག་ཅི་འབད་རུང་སྣང་མེད་བཞག་དོ།\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: འདི་གིས་ %s བྱིནམ་ལས་ %s རྩ་བསྐྲད་གཏང་ནི་ལུ་དཀའ་ངལ་ཡོདཔ་འོང་ ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
-msgstr "dpkg: ཐུམ་སྒྲིལ་ %s ལུ་ལོག་གཞི་བཙུགས་འབད་ནི་དགོཔ་ཨིན་ དེ་འབདཝ་ད་ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རྩ་བསྐྲད་གཏང་།\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
+msgstr ""
+"dpkg: ཐུམ་སྒྲིལ་ %s ལུ་ལོག་གཞི་བཙུགས་འབད་ནི་དགོཔ་ཨིན་ དེ་འབདཝ་ད་ཁྱོད་ཀྱིས་ཞུ་བ་འབད་དོ་བཟུམ་སྦེ་རྩ་"
+"བསྐྲད་གཏང་།\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: ཐུམ་སྒྲིལ་ %s ལུ་དགོཔ་ཨིན་ རྩ་བསྐྲད་མི་གཏང་།\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ཨིན།  %sགི་དོན་ལུ་ %sརྩ་བསྐྲད་གཏང་འོང་།\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1118,80 +1130,84 @@ msgstr ""
 "dpkg:  %s ནང་ན་ %s ཡོད་མི་གི་སྐོར་ལས་:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "མི་མུན་པའི་ཐུམ་སྒྲིལ་ཚུ་ -  %.250s གཞི་བཙུགས་མི་འབད།"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: ཉེན་བརྡ་ - མི་མཐུན་པ་སྣང་མེད་བཞག་དོ། ག་དེ་སྦེ་རུང་འཕྲོ་མཐུད་འོང་ !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive ལུ་ཉུང་མཐའ་འགྲུལ་ལམ་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཨེཕ་ཌི་ཨོ་པཱན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "འཚོལ་ནིའི་རྒྱུད་དུང་ཁ་བསྡམ་ནིའི་འཛོལ་བ།"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive གི་དོན་ལུ་འཚོལ་ནི་གིས་ལེགས་སྐྱོང་མ་འཐབ་པའི་འཛོལ་བ་ %i སླར་ལོག་འབད་ནུག"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "འཚོལ་ཞིབ་འབད་ཡོད་ དེ་འབདཝ་ད་ཐུམ་སྒྲིག་ཚུ་འཚོལ་མ་འཐོབ་(*.deb མཐུན་མི་ཡིག་སྣོད་ཚུ་)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་ཡིག་མཛོད་ཡིག་སྣོད་ཀྱི་སྒྲུབ་རྟགས་གཅིག་དགོཔ་ཨིན།"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "ཧེ་མ་སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s སེལ་འཐུ་འབད་དོ།\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "སེལ་འཐུ་མ་འབད་བའི་ཐུམ་སྒྲིལ་ %s གོམ་འགྱོ་དོ།\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%.250s གི་ཐོན་རིམ་ %.250s ཧེ་མ་ལས་རང་ཡོད་ གོམ་འགྱོ་དོ།\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - ཉེན་བརྡ་:  %.250s འདི་  %.250s ལས་ %.250s ལུ་མར་སྐྱེད་འབད་དོ།\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.250s འདི་ཐོན་རིམ་ %.250s ལས་ %.250s ལུ་མར་སྐྱེད་མི་འབད་ གོམ་འགྱོ་དོ།\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད་པའི་ `%.250s' ཐོན་རིམ་འདི་རྒྱབ་ཐག་འདྲ་བཤུས་ཀྱི་ལོག་གཞི་བཙུགས་འབད་ནི་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད་པའི་ `%.250s' ཐོན་རིམ་འདི་རྒྱབ་ཐག་འདྲ་བཤུས་ཀྱི་ལོག་གཞི་བཙུགས་འབད་ནི་"
+"རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1267,8 +1283,7 @@ msgstr "%s (%s) གཞི་སྒྲིག་འབད་དོ་...\n"
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "བགོ་བཀྲམ་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
@@ -1292,7 +1307,8 @@ msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' རྒྱབ་ཐག་
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་བསྐྱར་མིང་བཏགས་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
+msgstr ""
+"dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་བསྐྱར་མིང་བཏགས་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1302,17 +1318,21 @@ msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' རྩ་བསྐྲད
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: ཉེན་བརྡ་ - བགོ་བཀྲམ་ཐོན་རིམ་ `%.250s' རྙིངམ་རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
+msgstr ""
+"dpkg: %s: ཉེན་བརྡ་ - བགོ་བཀྲམ་ཐོན་རིམ་ `%.250s' རྙིངམ་རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' (སླར་སྲུང་མ་འབད་བའི་ཧེ་མ་)རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
+msgstr ""
+"dpkg: %s: ཉེན་བརྡ་ -  `%.250s' (སླར་སྲུང་མ་འབད་བའི་ཧེ་མ་)རྩ་བསྐྲད་གཏང་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: "
+"%s\n"
 
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
+msgstr ""
+"dpkg: %s: ཉེན་བརྡ་ -  `%.250s' འདི་ `%.250s' ལུ་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་: %s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1357,13 +1377,18 @@ msgid ""
 "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
 " (`%s' is a symlink to `%s')\n"
 msgstr ""
-"dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' གིས་ཡིག་སྣོད་མིང་བཟོ་བཏོན་མི་འབད་ནི་ལུ་མོས་མཐུན་འབདཝ་ཨིན།\n"
+"dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' གིས་ཡིག་སྣོད་མིང་བཟོ་བཏོན་མི་འབད་ནི་ལུ་མོས་མཐུན་"
+"འབདཝ་ཨིན།\n"
 " (`%s' འདི་  `%s' ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་)\n"
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
-msgstr "dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཡང་ན་བརྡ་དོན་ (= `%s')ཨིན།\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་ `%.250s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཡང་ན་བརྡ་དོན་ (= `%s')"
+"ཨིན།\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1389,8 +1414,7 @@ msgstr "གྱང་ཚད་རིམ་སྒྲིག་ཡིག་སྣོ
 msgid "failed to run %s (%.250s)"
 msgstr "%s (%.250s) གཡོག་བཀོལ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "ཤལ་འཐུས་ཤོར་བྱུང་མིའི་དོན་ལུ་བསྒུག"
 
@@ -1543,118 +1567,122 @@ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་ས
 msgid "unable to check for existence of `%.250s'"
 msgstr "`%.250s' གི་གནས་སའི་དོན་ལུ་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr "ལུ་རྟེནམ་ཨིན།"
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr "གུ་སྔོན་-རྟེནམ་ཨིན།"
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr "བར་མཚམས་ཚུ།"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr "དང་གཅིག་ཁར་མི་མཐུནམ་ཨིན།"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr "གོང་སྤེལ་ཚུ།"
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན་། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ནམ་ཡང་རིམ་སྒྲིག་མ་འབད་བས།\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s འདི་བཤུབ་ཡོད། དེ་འབདཝ་ད་འདི་ཐོན་རིམ་ %.250s ཨིན།\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s གིས་མཐའ་མཇུག་རིམ་སྒྲིག་འབད་མི་ཐོན་རིམ་འདི་ %.250s ཨིན།\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s འདི་ %s ཨིན།\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་རྩ་བསྐྲད་གཏང་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་རིམ་སྒྲིག་མ་འབད་བར་བཞག་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་འབདཝ་ད་འདི་ %s ཨིན།\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s འདི་གཞུ་བཙུགས་མ་འབད་བས།\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (ཐོན་རིམ་ %.250s) འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན།\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (ཐོན་རིམ་ %.250s) འདི་ %sཨིན།\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s གིས་   %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་གཞི་བཙུགས་འབད་དགོ་ཨིན།\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "%.250s གིས་ %.250s བྱིནམ་ཨིན་ དེ་ལས་འདི་ %s ཨིན།\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
 
@@ -1676,7 +1704,8 @@ msgid ""
 msgstr ""
 "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་བཤུབ་སྟེ་ཡོད་ དེ་འབདཝ་ད་ད་ཚུན་རིམ་སྒྲིག་མ་འབད་བས།\n"
 "འདི་ཚུ་ ཁོང་ཚུའི་དོན་ལུ་ལཱ་འབད་བཅུག་ནིའི་དོན་ལུ་ \n"
-"dpkg --configure ཡང་ན་ སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆ་གདམ་ཁ་ ལག་ལེན་ཐའབ་ཐོག་རིམ་སྒྲིག་འབད་དགོ:\n"
+"dpkg --configure ཡང་ན་ སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆ་གདམ་ཁ་ ལག་ལེན་ཐའབ་ཐོག་རིམ་"
+"སྒྲིག་འབད་དགོ:\n"
 
 #: src/enquiry.c:91
 msgid ""
@@ -1686,7 +1715,8 @@ msgid ""
 msgstr ""
 "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ཕྱེད་ཀ་རྐྱངམ་ཅིག་རིམ་སྒྲིག་འབད་ཡོད་ དེ་ཡང་\n"
 "འདི་ཚུ་འགོ་དང་པ་རིམ་སྒྲིག་འབད་བའི་དཀའ་ངལ་ལུ་བརྟེན་ཨིནམ་འོང་། རིམ་སྒྲིག་འདི་ \n"
-"dpkg --configure <ཐུམ་སྒྲིལ་> ཡང་ན་ སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆག་གདམ་ཁ་འདི་ལག་ལེན་འཐབ་ཐོག་ལོག་འབད་རྩོལ་བསྐྱེད་དགོ:\n"
+"dpkg --configure <ཐུམ་སྒྲིལ་> ཡང་ན་ སེལ་འཐུ་མི་འབད་ནི་ནང་གི་རིམ་སྒྲིག་དཀར་ཆག་གདམ་ཁ་འདི་ལག་"
+"ལེན་འཐབ་ཐོག་ལོག་འབད་རྩོལ་བསྐྱེད་དགོ:\n"
 
 #: src/enquiry.c:96
 msgid ""
@@ -1694,7 +1724,8 @@ msgid ""
 "installation.  The installation can probably be completed by retrying it;\n"
 "the packages can be removed using dselect or dpkg --remove:\n"
 msgstr ""
-"འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ཕྱེད་ཀ་རྐྱངམ་ཅིག་གཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ འདི་ཡང་གཞི་བཙུགས་འབད་བའི་སྐབས་ཀྱི་དཀའ་ངལ་ཚུ་ལུ་བརྟེན།\n"
+"འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ཕྱེད་ཀ་རྐྱངམ་ཅིག་གཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ འདི་ཡང་གཞི་བཙུགས་འབད་བའི་སྐབས་ཀྱི་དཀའ་"
+"ངལ་ཚུ་ལུ་བརྟེན།\n"
 "གཞི་བཙུགས་འདི་ལོག་འབད་རྩོལ་བསྐྱེད་ཐོག་ལས་གཞི་བཙུགས་འབད་ཚུགས།\n"
 "ཐུམ་སྒྲིལ་ཚུ་སེལ་འཐུ་མི་འབད་ནི་ཡང་ན་dpkg --remove ལག་ལེན་འཐབ་ཐོག་རྩ་བསྐྲད་གཏང་ཚུགས་:\n"
 
@@ -1736,7 +1767,9 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg འདི་གཞི་བཙུགས་འབད་ཡོདཔ་སྦེ་དྲན་ཐོ་མ་བཀོད་ ཨི་པོཅ་རྒྱབ་སྐྱོར་རེ་རེའི་དོན་ལུ་ཞིབ་དཔྱད་འབད་མི་ཚུགས !\n"
+msgstr ""
+"dpkg འདི་གཞི་བཙུགས་འབད་ཡོདཔ་སྦེ་དྲན་ཐོ་མ་བཀོད་ ཨི་པོཅ་རྒྱབ་སྐྱོར་རེ་རེའི་དོན་ལུ་ཞིབ་དཔྱད་འབད་མི་"
+"ཚུགས !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1761,15 +1794,16 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture གིས་སྒྲུབ་རྟགས་ག་ནི་ཡང་མི་འབག"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "--compare-versions གིས་སྒྲུབ་རྟགས་གསུམ་འབགཔ་ཨིན་: <ཐོན་རིམ་> <མཐུན་འབྲེལ་> <ཐོན་རིམ་>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"--compare-versions གིས་སྒྲུབ་རྟགས་གསུམ་འབགཔ་ཨིན་: <ཐོན་རིམ་> <མཐུན་འབྲེལ་> <ཐོན་རིམ་>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions བྱང་ཉེས་མཐུན་འབྲེལ།"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: ཐོན་རིམ་'%s'ལུ་ཚིག་སྦྱོར་བྱང་ཉེས་འདུག་: %s\n"
@@ -1784,8 +1818,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: འཐུས་ཤོར་བྱུང་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུའི་ཐོ་ཡིག་ནང་གི་ཐོ་བཀོད་གསརཔ་གྱི་དོན་ལུ་དྲན་ཚད་སྤྲོད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: འཐུས་ཤོར་བྱུང་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུའི་ཐོ་ཡིག་ནང་གི་ཐོ་བཀོད་གསརཔ་གྱི་དོན་ལུ་དྲན་ཚད་སྤྲོད་ནི་འཐུས་ཤོར་"
+"བྱུང་ཡོད།"
 
 #: src/errors.c:91
 #, c-format
@@ -1807,15 +1844,19 @@ msgstr "ཐུམ་སྒྲིལ་ %s འདི་འཆང་སྟེ་
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "ཐུམ་སྒྲིལ་ %s འདི་འཆང་འདི་ཡོདཔ་ཨིན་  མ་སྤྲོག་པར་བཞག་དོ། ཟུར་བཞག་འབད་ནིའི་དོན་ལུ་ --force-hold ལག་ལེན་འཐབ།\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"ཐུམ་སྒྲིལ་ %s འདི་འཆང་འདི་ཡོདཔ་ཨིན་  མ་སྤྲོག་པར་བཞག་དོ། ཟུར་བཞག་འབད་ནིའི་དོན་ལུ་ --force-hold "
+"ལག་ལེན་འཐབ།\n"
 
 #: src/errors.c:125
 msgid ""
 "dpkg - warning, overriding problem because --force enabled:\n"
 " "
 msgstr ""
-"dpkg -གི་ཉེན་བརྡ་ དཀའ་ངལ་འདི་ཞུར་བཞག་འབད་དོ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ --forceའདི་ལྕོགས་ཅན་བཟོ་ནུག:\n"
+"dpkg -གི་ཉེན་བརྡ་ དཀའ་ངལ་འདི་ཞུར་བཞག་འབད་དོ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ --forceའདི་ལྕོགས་ཅན་བཟོ་"
+"ནུག:\n"
 " "
 
 #: src/filesdb.c:123
@@ -1825,8 +1866,12 @@ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
-msgstr "dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
+msgstr ""
+"dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་"
+"ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -1856,7 +1901,8 @@ msgstr "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་
 #: src/filesdb.c:240
 #, c-format
 msgid "unable to create updated files list file for package %s"
-msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་གསར་བསྐྲུན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgstr ""
+"ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་གསར་བསྐྲུན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: src/filesdb.c:250
 #, c-format
@@ -1871,7 +1917,8 @@ msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུ
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ མཉམ་བྱུང་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgstr ""
+"ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཐོ་ཡིག་ཡིག་སྣོད་ མཉམ་བྱུང་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: src/filesdb.c:257
 #, c-format
@@ -1881,7 +1928,9 @@ msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུ
 #: src/filesdb.c:259
 #, c-format
 msgid "failed to install updated files list file for package %s"
-msgstr "ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡདོ།"
+msgstr ""
+"ཐུམ་སྒྲིལ་ %s གི་དོན་ལུ་དུས་མཐུན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་གཞི་བཙུགས་འབད་ནི་ལུ་འཐུས་ཤོར་"
+"བྱུང་ཡདོ།"
 
 #: src/filesdb.c:323
 msgid "failed to open statoverride file"
@@ -1936,8 +1985,7 @@ msgstr "ཁ་སྒྱུར་ནང་ལུ་རེ་བ་མེད་པ
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "ཨེཕ་གེཊིསི་གིས་ཁ་སྒྱུར་ལས་ཡིག་རྒྱུན་སྟོངམ་ཅིག་བྱིན་ནུག [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ལུ་གནམ་མེད་ས་མེད་རིངམ་གྲལ་ཐིག་ཡང་ན་ཨི་ཨོ་ཨེཕ་འདུག [ii]"
 
@@ -2029,9 +2077,7 @@ msgstr "`%.250s' གུ་ལུ་ལག་ལེན་འཐབ་པའི་
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "%s ཡིག་ཚུགས་ `%.250s' གཞི་བཙུགས་འབད་ཡོད་མི་ སི་ཊེཊི་འབད་མ་ཚུགས།"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "%s ལག་ལེན་འཐབ་མ་ཚུགས།"
@@ -2088,8 +2134,7 @@ msgstr "འབྲེལ་མཐུད་མ་འབད།"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "བཏོན་གཏང་།"
 
@@ -2098,8 +2143,7 @@ msgstr "བཏོན་གཏང་།"
 msgid "failed to %s `%%.255s'"
 msgstr "%s `%%.255s' འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "གཙང་དག་བཟོ་ནིའི་དོན་ལུ་ཨར་ཨེམ་ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
@@ -2108,10 +2152,7 @@ msgstr "གཙང་དག་བཟོ་ནིའི་དོན་ལུ་ཨ
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་ལས་རིམ་གྱི་ཐོན་རིམ་ %s\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2122,10 +2163,7 @@ msgstr ""
 "ཤུལ་ལས་ཀྱི་ གནས་སྟངས་འདྲ་བཤུས་རྐྱབས་ནིའི་དོན་ལུ་ བལྟ། དེ་ནང་ལུ་ཉེན་ལེན་ག་ནི་ཡང་མེད།\n"
 "འདྲ་བཤུས་དབང་ཆ་དང་ཆོག་ཐམ་རྒྱས་བཤད་ཚུའི་དོན་ལུ་ %s --license བལྟ།\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2176,10 +2214,12 @@ msgstr ""
 "  --update-avail <Packages-file>   འཐོབ་ཚུགས་པའི་ཐུམ་སྒྲིལ་གྱི་བརྡ་དོན་ཚབ་བཙུགས།\n"
 "  --merge-avail <Packages-file>    ཡིག་སྣོད་ལས་བརྡ་དོན་དང་གཅིག་ཁར་མཉམ་བསྡོམས་འབད།\n"
 "  --clear-avail                    ཡོད་ཞིན་པའི་འཐོབ་ཚུགས་པའི་བརྡ་དོན་ཀྲེག་གཏང་།\n"
-"  --forget-old-unavail             གཞི་བཙུགས་མ་འབད་བའི་འཐོབ་ཚུགསཔ་མེད་པའི་ཐུམ་སྒྲིལ་ཚུ་བརྗེད།\n"
+"  --forget-old-unavail             གཞི་བཙུགས་མ་འབད་བའི་འཐོབ་ཚུགསཔ་མེད་པའི་ཐུམ་སྒྲིལ་ཚུ་"
+"བརྗེད།\n"
 "  -s|--status <package> ...        ཐུམ་སྒྲིལ་གནས་ཚད་ཀྱི་རྒྱས་བཤད་ཚུ་བཀྲམ་སྟོན་འབད།\n"
 "  -p|--print-avail <package> ...   འཐོབ་ཚུགས་པའི་ཐོན་རིམ་གྱི་རྒྱས་བཤད་ཚུ་བཀྲམ་སྟོན་འབད།\n"
-"  -L|--listfiles <package> ...     ཐུམ་སྒྲིལ་(ཚུ་)གྱིས་ `owned' འབད་མི་ཡིག་སྣོད་ཚུ་ཐོ་བཀོད་འབད།\n"
+"  -L|--listfiles <package> ...     ཐུམ་སྒྲིལ་(ཚུ་)གྱིས་ `owned' འབད་མི་ཡིག་སྣོད་ཚུ་ཐོ་བཀོད་"
+"འབད།\n"
 "  -l|--list [<pattern> ...]        ཐུམ་སྒྲིལ་ཚུ་བསྡུས་པ་སྦེ་ཐོ་བཀོད་འབད།\n"
 "  -S|--search <pattern> ...        ཡིག་སྣོད་(ཚུ་)བདག་དབང་བཟུང་མི་ཐུམ་སྒྲིལ་(ཚུ་)འཚོལ།\n"
 "  -C|--audit                       ཆད་ཡོད་པའི་ཐུམ་སྒྲིལ་(ཚུ་)གི་དོན་ལུ་ཞིབ་དཔྱད་འབད།\n"
@@ -2189,10 +2229,7 @@ msgstr ""
 "  -Dh|--debug=help                 རྐྱོན་སེལ་འབད་ནི་གུ་ལུ་གྲོགས་རམ་སྟོན།\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2213,7 +2250,8 @@ msgid ""
 "\n"
 msgstr ""
 "dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile  ཡིག་མཛོད་གུ་ལུ་ལག་ལེན་འཐབ་ (type %s --help).\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile  ཡིག་མཛོད་གུ་ལུ་ལག་ལེན་འཐབ་ (type %s --"
+"help).\n"
 "\n"
 
 #: src/main.c:99
@@ -2233,16 +2271,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2255,16 +2298,21 @@ msgstr ""
 "གདམ་ཁ་ཚུ་:\n"
 "  --admindir=<སྣོད་ཐོ་>     <སྣོད་ཐོ་> འདི་ %s གི་ཚབ་ལུ་ལག་ལེན་འཐབ།\n"
 "  --root=<སྣོད་ཐོ་>         རྩ་བའི་སྣོད་ཐོ་སོ་སོ་ལུ་གཞི་བཙུགས་འབད།\n"
-"  --instdir=<སྣོད་ཐོ་>      བདག་སྐྱོང་སྣོད་ཐོ་བསྒྱུར་བཅོས་མ་འབད་བར་གཞི་བཙུགས་འབད་ནིའི་སྣོད་ཐོ་བསྒྱུར་བཅོས་འབད།\n"
-"  -O|--selected-only         གཞི་བཙུགས་/ཡར་བསྐྱེད་ཀྱི་དོན་ལུ་སེལ་འཐུ་མ་འབད་མི་ཐུམ་སྒྲིལ་ཚུ་གོམ་འགྱོ།\n"
+"  --instdir=<སྣོད་ཐོ་>      བདག་སྐྱོང་སྣོད་ཐོ་བསྒྱུར་བཅོས་མ་འབད་བར་གཞི་བཙུགས་འབད་ནིའི་སྣོད་ཐོ་"
+"བསྒྱུར་བཅོས་འབད།\n"
+"  -O|--selected-only         གཞི་བཙུགས་/ཡར་བསྐྱེད་ཀྱི་དོན་ལུ་སེལ་འཐུ་མ་འབད་མི་ཐུམ་སྒྲིལ་ཚུ་གོམ་"
+"འགྱོ།\n"
 "  -E|--skip-same-version     ཐོན་རིམ་གཅིག་པ་གཞི་བཙུགས་འབད་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གོམ་འགྱོ།\n"
-"  -G|--refuse-downgrade      གཞི་བཙུགས་འབད་ཡོདམི་ལས་ཧེ་མའི་ཐོན་རིམ་དང་གཅིག་ཁར་ཐུམ་སྒྲིལ་ཚུ་གོམ་འགྱོ།\n"
+"  -G|--refuse-downgrade      གཞི་བཙུགས་འབད་ཡོདམི་ལས་ཧེ་མའི་ཐོན་རིམ་དང་གཅིག་ཁར་ཐུམ་སྒྲིལ་ཚུ་"
+"གོམ་འགྱོ།\n"
 "  -B|--auto-deconfigure      གཞན་མི་ཐུམ་སྒྲིལ་ཚུ་ཆད་རུང་ཡང་གཞི་བཙུགས་འབད།\n"
 "  --no-debsig                ཐུམ་སྒྲིལ་གྱི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་འབད་ནིའི་འབད་རྩོལ་མ་བསྐྱེད།\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             ག་ཅི་འབད་ནི་ཨིན་རྐྱངམ་ཅིག་སླབ་ - འདི་མ་འབད།\n"
-"  -D|--debug=<octal>         རྐྱེན་སེལ་ལྕོགས་ཅན་བཟོ་( -Dhelp ཡང་ན་ --debug=help བལྟ་).\n"
-"  --status-fd <n>            ཡིག་སྣོད་འགྲེལ་བཤདཔ་ལུ་གནས་ཚད་བསྒྱུར་བཅོས་དུས་མཐུན་ཚུ་གཏང་ <n>.\n"
+"  -D|--debug=<octal>         རྐྱེན་སེལ་ལྕོགས་ཅན་བཟོ་( -Dhelp ཡང་ན་ --debug=help "
+"བལྟ་).\n"
+"  --status-fd <n>            ཡིག་སྣོད་འགྲེལ་བཤདཔ་ལུ་གནས་ཚད་བསྒྱུར་བཅོས་དུས་མཐུན་ཚུ་གཏང་ "
+"<n>.\n"
 "  --log=<filename>           <ཡིག་སྣོད་མིང་> ལུ་གནས་བསྒྱུར་བཅོས་ཚུ་དང་བྱ་བ་ཚུ་ལོག་འབད།\n"
 "  --ignore-depends=<package>,...\n"
 "                             <ཐུམ་སྒྲིལ་>འབྲེལ་བ་ཡོད་མི་ རྟེན་འབྲེལ་ཚུ་སྣང་མེད་བཞག\n"
@@ -2278,21 +2326,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 " --compare-versions གྱི་དོན་ལུ་ག་བསྡུར་རྐྱབས་ནིའི་བཀོལ་སྤྱོད་པ་ཚུ་:\n"
-"  lt le eq ne ge gt       (ཐོན་རིམ་ག་ལས་ཡང་ཐོན་རིམ་སྟོངམ་འདི་ཧེ་མའི་བཟུམ་སྦེ་བརྩི་འཇོག་འབད།)\n"
-"  lt-nl le-nl ge-nl gt-nl (ཐོན་རིམ་ག་ལས་ཡང་ཐོན་རིལ་སྟོངམ་འདི་ཤུལ་མའི་བཟུམ་སྦེ་བརྩི་འཇོག་འབད།)\n"
-"  < << <= = >= >> >       (ཚད་འཛིན་ཡིག་སྣོད་ཚིག་སྦྱོར་དང་གཅིག་ཁར་ག་བསྡུར་རྐྱབས་བཏུབ་མིའི་དོན་ལུ་རྐྱངམ་ཅིག)\n"
+"  lt le eq ne ge gt       (ཐོན་རིམ་ག་ལས་ཡང་ཐོན་རིམ་སྟོངམ་འདི་ཧེ་མའི་བཟུམ་སྦེ་བརྩི་འཇོག་"
+"འབད།)\n"
+"  lt-nl le-nl ge-nl gt-nl (ཐོན་རིམ་ག་ལས་ཡང་ཐོན་རིལ་སྟོངམ་འདི་ཤུལ་མའི་བཟུམ་སྦེ་བརྩི་འཇོག་"
+"འབད།)\n"
+"  < << <= = >= >> >       (ཚད་འཛིན་ཡིག་སྣོད་ཚིག་སྦྱོར་དང་གཅིག་ཁར་ག་བསྡུར་རྐྱབས་བཏུབ་མིའི་དོན་"
+"ལུ་རྐྱངམ་ཅིག)\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "ལག་ལེན་པ་-མཛའ་གྲོགས་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་དོན་ལུ་`dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ།\n"
+msgstr ""
+"ལག་ལེན་པ་-མཛའ་གྲོགས་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་དོན་ལུ་`dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ།\n"
 
 #: src/main.c:141
 msgid ""
@@ -2301,23 +2355,24 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
 "ཐུམ་སྒྲིལ་  [*] ཚུ་གཞི་བཙུགས་འབད་ནི་དང་གཞི་བཙུགས་མི་འབད་ནིའི་དོན་ལུ་ དབྱེ་བ་ dpkg --help \n"
 "ལག་ལེན་པ-མཐུན་མི་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པ་གི་དོན་ལུ་ `dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ།\n"
 "dpkg རྐྱེན་སེལ་ཟུར་རྟགས་གནས་གོང་ཚུའི་ཐོ་ཡིག་གི་དོན་ལུ་ དབྱེ་བ་ dpkg -Dhelp \n"
 "བང་བཙོང་ནིའི་གདམ་ཁ་ཚུའི་ཐོ་ཡིག་གི་དོན་ལུ་ དབྱེ་བ་ dpkg --force-help \n"
 "*.deb ཡིག་སྣོད་ཚུ་མྱོང་འདྲིས་ཀྱིས་ལག་ལེན་འཐབ་སྐོར་གྲོགས་རམ་གྱི་དོན་ལུ་ དབྱེ་བ་ dpkg-deb --help \n"
-"འདྲ་བཤུས་དབང་ཆ་ཆོག་ཐམ་དང་ཉེན་ལེན་མེདཔ་ (ཇི་ཨེན་ཡུ་ ཇི་པི་ཨེལ་) [*] གི་དོན་ལུ་ དབྱེ་བ་ dpkg --license \n"
+"འདྲ་བཤུས་དབང་ཆ་ཆོག་ཐམ་དང་ཉེན་ལེན་མེདཔ་ (ཇི་ཨེན་ཡུ་ ཇི་པི་ཨེལ་) [*] གི་དོན་ལུ་ དབྱེ་བ་ dpkg --"
+"license \n"
 "\n"
-"གདམ་ཁ་ཚུ་ [*] སྦེ་རྟགས་བཀལ་ཡོད་མི་གིས་ ཨའུཊི་པུཊི་ལེ་ཤ་བཟོ་སྟོན་འབདཝ་ཨིན་ - འདི་ `less' ཡང་ན་ `more' བརྒྱུད་དེ་རྒྱུད་དུང་བཟོ !"
+"གདམ་ཁ་ཚུ་ [*] སྦེ་རྟགས་བཀལ་ཡོད་མི་གིས་ ཨའུཊི་པུཊི་ལེ་ཤ་བཟོ་སྟོན་འབདཝ་ཨིན་ - འདི་ `less' ཡང་ན་ "
+"`more' བརྒྱུད་དེ་རྒྱུད་དུང་བཟོ !"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "མི་མཐུན་པའི་བྱ་བ་-%c (--%s) and -%c (--%s)"
@@ -2354,7 +2409,8 @@ msgstr ""
 "      2   ཡིག་ཚུགས་           རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ཀྱི་ ལས་བཀོལ་དང་གནས་ཚད།\n"
 "     10   ཡིག་སྣོད་རེ་རེ་བཞིན་          ཡིག་སྣོད་རེ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི་ ལས་སྦྱོར་འབད་ཡོད།\n"
 "    100   ཡིག་སྣོད་རེ་རེའི་རྒྱས་བཤད་l    ཡིག་སྣོད་རེ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི་ལེ་ཤ་ལས་སྦྱོར་འབད་ཡོདཔ།\n"
-"     20   ཀོནཕི་ཨེཕ་             རིམ་སྒྲིག་ཡིག་སྣོད་རེ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི།Output for each configuration file\n"
+"     20   ཀོནཕི་ཨེཕ་             རིམ་སྒྲིག་ཡིག་སྣོད་རེ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི།Output for each "
+"configuration file\n"
 "    200   ཀོནཕི་ཨེཕ་རྒྱས་བཤདl       རིམ་སྒྲིག་ཡིག་སྣོད་རེ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི་ལེ་ཤ\n"
 "     40   ཌེཔ་ཀོན་            རྟེན་འབྲེལ་དང་མི་མཐུན་པ་ཚུ།\n"
 "    400   ཌེཔ་ཀོན་རྒྱས་བཤད་      རྟེན་འབྲེལ་/མི་མཐུན་པའི་ཨཡུཊི་པུཊི་ལེ་ཤ\n"
@@ -2371,15 +2427,15 @@ msgstr "--རྐྱེན་སེལ་ལུ་ཨོཀ་ཊཱལ་སྒ
 #: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr "སྟོང་ཆ་ཐུམ་སྒྲིལ་མིང་འདི་ --སྣང་མེད་-རྟེན་འབྲེལ་གྱི་ ལྷོད་རྟགས་-སོ་སོ་འཕྱལ་འཕྱལཝ་ཐོ་ཡིག་ `%.250s' ནང་།"
+msgstr ""
+"སྟོང་ཆ་ཐུམ་སྒྲིལ་མིང་འདི་ --སྣང་མེད་-རྟེན་འབྲེལ་གྱི་ ལྷོད་རྟགས་-སོ་སོ་འཕྱལ་འཕྱལཝ་ཐོ་ཡིག་ `%.250s' ནང་།"
 
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--སྣང་མེད་བཞག་- རྟེན་འབྲེལ་ལུ་ཁྲིམས་ལྡན་ཐུམ་སྒྲིལ་མིང་གཅིག་དགོ `%.250s' iའདི་; %sམེན།"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s: `%.250s' གི་དོན་ལུ་ནུས་མེད་ཧྲིལ་ཨང་།"
@@ -2395,23 +2451,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2420,23 +2481,32 @@ msgid ""
 msgstr ""
 "%s བང་བཙོང་ནིའི་གདམ་ཁ་ཚུ་ - དཀའ་ངལ་ཚུ་འཐོབ་པའི་སྐབས་ སྤྱོད་ལམ་ཚད་འཛིན་འབད་:\n"
 "  ཉེན་བརྡ་འབད་ དེ་འབདཝ་ད་འཕྲོ་མཐུད་:  --བང་བཙོང་ནི་-<thing>,<thing>,...\n"
-"  འཛོལབ་དང་གཅིག་ཁར་བཀག:    --ངོས་ལེན་མི་འབད་ནི་-<thing>,<thing>,... | --བང་བཙོང་ནི་-མེད་-<thing>,...\n"
+"  འཛོལབ་དང་གཅིག་ཁར་བཀག:    --ངོས་ལེན་མི་འབད་ནི་-<thing>,<thing>,... | --བང་བཙོང་ནི་-"
+"མེད་-<thing>,...\n"
 " བང་བཙོང་ནིའི་ཅ་ལ་ཚུ་:\n"
 "  གེ་ར་ [!]               བང་བཙོང་ནིའི་གདམ་ཁ་གེ་ར་གཞི་སྒྲིག་འབད་\n"
 "  དམའ་རིམ་ [*]          དམའ་མི་ཐོན་རིམ་དང་གཅིག་ཁར་ཐུམ་སྒྲིལ་གཅིག་ཚབ་བཙུགས།\n"
 "  ག་སྦེ་རུང་-རིམ་སྒྲིག་འབད་          འ་ནི་འདི་ལུ་ཕན་ཐོག་ནི་ཨིན་མི་ཐུམ་སྒྲིལ་ག་སྦེ་རུང་རིམ་སྒྲིག་འབད།\n"
-"  འཆང་                   ངེས་མེད་དུ་འབྱུང་བའི་ཐུམ་སྒྲིལ་ཚུ་འཆང་སྟེ་ཡོད་པའི་སྐབས་ཡང་ལས་སྦྱོར་འབད།\n"
-"  འགྲུལ་ལམ་-བྱང་ཉེས་               འགྲུལ་ལམ་འདི་གིས་གལ་ཅན་ལས་རིམ་ཚུ་བརླག་སྟོར་ཞུགས་ནུག དཀའ་ངལ་ཚུ་\n"
-"  རྩ་བ་-མེན་མི་               ཅ་ལ་ཚུ་རྩ་བ་མེན་པའི་སྐབས་ཡང་གཞི་བཙུགས་(མི་)འབད་ནིའི་འབད་རྩོལ་བསྐྱེད།\n"
-"  ཟུར་བཞག་              ཡིག་སྣོད་ཅིག་ཐུམ་སྒྲིལ་གཅིག་ལས་གཞན་མི་གཅིག་དང་གཅིག་ཁར་ཞུར་བཞག་འབད།\n"
-"  ཟུར་བཞག་-ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་     ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཡིག་སྣོད་ཅིག་ཁ་ཕྱོགས་མ་སྒྱུར་བར་ཡོད་པའི་ཐོན་རིམ་དང་གཅིག་ཁར་ཟུར་བཞག་འབད།\n"
-"  བདེན་སྦྱོར་-བྱང་ཉེས་             ཐུམ་སྒྲིལ་འདི་ བདེན་བཤད་ཀྱི་ཞིབ་དཔྱད་འཐུས་ཤོར་བྱུང་རུང་ཡང་གཞི་བཙུགས་འབད།\n"
+"  འཆང་                   ངེས་མེད་དུ་འབྱུང་བའི་ཐུམ་སྒྲིལ་ཚུ་འཆང་སྟེ་ཡོད་པའི་སྐབས་ཡང་ལས་སྦྱོར་"
+"འབད།\n"
+"  འགྲུལ་ལམ་-བྱང་ཉེས་               འགྲུལ་ལམ་འདི་གིས་གལ་ཅན་ལས་རིམ་ཚུ་བརླག་སྟོར་ཞུགས་ནུག དཀའ་"
+"ངལ་ཚུ་\n"
+"  རྩ་བ་-མེན་མི་               ཅ་ལ་ཚུ་རྩ་བ་མེན་པའི་སྐབས་ཡང་གཞི་བཙུགས་(མི་)འབད་ནིའི་འབད་རྩོལ་"
+"བསྐྱེད།\n"
+"  ཟུར་བཞག་              ཡིག་སྣོད་ཅིག་ཐུམ་སྒྲིལ་གཅིག་ལས་གཞན་མི་གཅིག་དང་གཅིག་ཁར་ཞུར་བཞག་"
+"འབད།\n"
+"  ཟུར་བཞག་-ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་     ཁ་ཕྱོགས་སྒྱུར་ཡོད་པའི་ཡིག་སྣོད་ཅིག་ཁ་ཕྱོགས་མ་སྒྱུར་བར་ཡོད་པའི་ཐོན་"
+"རིམ་དང་གཅིག་ཁར་ཟུར་བཞག་འབད།\n"
+"  བདེན་སྦྱོར་-བྱང་ཉེས་             ཐུམ་སྒྲིལ་འདི་ བདེན་བཤད་ཀྱི་ཞིབ་དཔྱད་འཐུས་ཤོར་བྱུང་རུང་ཡང་གཞི་"
+"བཙུགས་འབད།\n"
 "  རྟེན་འབྲེལ་གྱི་-ཐོན་རིམ་ [!]    རྟེན་འབྲེལ་ཐོན་རིམ་གྱི་དཀའ་ངལ་ཚུ་ཉེན་བརྡ་ནང་ལུ་བསྒྱིར།\n"
 "  རྟེན་འབྲེལ་ཚུ་ [!]            རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་ཚུ་ཉེན་བརྡ་ནང་ལུ་བསྒྱིར།\n"
 "  ཀཱོནཕ་ནིའུ་ [!]            ཨ་རྟག་རང་རིམ་སྒྲིག་ཡིག་སྣོད་གསརཔ་ལག་ལེན་འཐབ་ ནུས་སྤེལ་མ་འབད།\n"
 "  ཀཱོནཕ་ཨོལཌི་ [!]            ཨ་རྟག་རང་རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་ཚུ་ལག་ལེན་འཐབ་ ནུས་སྤེལ་མ་འབད།\n"
-"  ཀཱོནཕ་ཌེཕ་ [!]            རིམ་སྒྲིག་ཡིག་སྣོད་གསརཔ་ཚུའི་དོན་ལུ་སྔོན་སྒྲིག་འདི་ལག་ལེན་འཐབ་ ག་དེམ་ཅཆིག་སྦེ་ གཅིག་\n"
-"                         འཐོབ་ཚུགསཔ་ཡོདཔ་ཨིན་པ་ཅིན་ ནུས་སྤེལ་མ་འབད།. སྔོན་སྒྲིག་གཅིག་ཡང་མ་འཐོབ་ཨིན་པ་ཅིན་\n"
+"  ཀཱོནཕ་ཌེཕ་ [!]            རིམ་སྒྲིག་ཡིག་སྣོད་གསརཔ་ཚུའི་དོན་ལུ་སྔོན་སྒྲིག་འདི་ལག་ལེན་འཐབ་ ག་དེམ་"
+"ཅཆིག་སྦེ་ གཅིག་\n"
+"                         འཐོབ་ཚུགསཔ་ཡོདཔ་ཨིན་པ་ཅིན་ ནུས་སྤེལ་མ་འབད།. སྔོན་སྒྲིག་གཅིག་ཡང་མ་"
+"འཐོབ་ཨིན་པ་ཅིན་\n"
 "                         ཁྱོད་ལུ་ ནུས་སྤེལ་འབད་འོང་ ཀཱོནཕ་ཨོལཌི་ ཡང་ན\n"
 "                         ཀཱོནཕ་ནིའུ་ གདམ་ཁ་ཚུ་ཡང་མ་བྱིན་ཚུན།\n"
 "  ཀཱོནཕ་མིསི་ [!]           ཨ་རྟག་རང་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རིམ་སྒྲིག་ཡིག་སྣོད་ཚུ་གཞི་བཙུགས་འབད།\n"
@@ -2446,7 +2516,8 @@ msgstr ""
 "  རྩ་བསྐྲད་གཏང་-རི་ཨིནསིཊི་རེཀ [!]   གཞི་བཙུགས་དགོས་མཁོ་ཡོད་མི་ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད།\n"
 "  རྩ་བསྐྲད་གཏང་-ཁག་ཆེ་མི་ [!]   ཁག་ཅེ་བའི་ཐུམ་སྒྲིལ་གཅིག་རྩ་བསྐྲད་གཏང་།\n"
 "\n"
-"ཉེན་བརྡ་ - [!] རྟགས་བཀལ་ཡོད་པའི་གདམ་ཁའི་ལག་ལེན་གྱིས་ ཁྱོད་རའི་གཞི་བཙུགས་ འཚུབ་ཅན་སྦེ་མེདཔ་གཏང་འོང་།\n"
+"ཉེན་བརྡ་ - [!] རྟགས་བཀལ་ཡོད་པའི་གདམ་ཁའི་ལག་ལེན་གྱིས་ ཁྱོད་རའི་གཞི་བཙུགས་ འཚུབ་ཅན་སྦེ་མེདཔ་གཏང་"
+"འོང་།\n"
 "བང་བཙོང་ནིའི་གདམ་ཁ་ [*] རྟགས་བཀལ་ཡོད་མི་ཚུ་ སྔོན་སྒྲིག་གིས་སྦེ་ལྕོགས་ཅན་བཟོ།\n"
 
 #: src/main.c:363
@@ -2459,14 +2530,11 @@ msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོ
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "ལག་ལེན་འཐབ་ནིའི་རྒྱབ་ཐག་ནང་ལུ་མལ་ལོཀ་འབད་མ་ཚུགས།"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "ལག་ལེན་འཐབ་ནིའི་རྒྱབ་ཐག་ནང་ལུ་སི་ཊརཌི་་ཨཔ་འབད་མ་ཚུགས།"
 
@@ -2497,10 +2565,7 @@ msgstr "རྒྱུན་རིམ་གྱི་དོན་ལུ་ `%i' ཁ
 msgid "unexpected eof before end of line %d"
 msgstr "གྲལ་ཐིག་ %d གི་མཇུག་གི་ཧེ་མ་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
@@ -2510,20 +2575,24 @@ msgstr "བྱ་བའི་གདམ་ཁ་གཅིག་དགོ"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --བསྣར་ནི་འདི་གིས་གདམ་ཁ་-མིན་པའི་སྒྲུབ་རྟགས་ག་ནི་ཡང་མི་འབག"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s ལུ་ཉུང་མཐའ་ཐུམ་སྒྲིལ་མིང་གི་སྒྲུབ་རྟགས་གཅིག་དགོ"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
-msgstr "ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཚུ་ དེ་ཚུ་འོང་མི་ཡིག་སྣཽད་ཚུའི་མིང་ཚུ་འདྲེན་ཚིག་བཀོད་དེ་མེན་པར་ ཁོང་རའི་མིང་གིས་སྦེ་གསལ་བཀོད་འབད་དགོ "
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"ཁྱོད་ཀྱིས་ཐུམ་སྒྲིལ་ཚུ་ དེ་ཚུ་འོང་མི་ཡིག་སྣཽད་ཚུའི་མིང་ཚུ་འདྲེན་ཚིག་བཀོད་དེ་མེན་པར་ ཁོང་རའི་མིང་གིས་སྦེ་གསལ་"
+"བཀོད་འབད་དགོ "
 
 #: src/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
-msgstr "ཐུམ་སྒྲིལ་ %s གིས་ཚར་གཅིག་ལས་ལྷག་སྟེ་ཐོ་བཀོད་འབད་ནུག   ལས་སྦྱོར་ཚར་གཅིག་རྐྱངམ་ཅིག་འབདཝ་ཨིན།\n"
+msgstr ""
+"ཐུམ་སྒྲིལ་ %s གིས་ཚར་གཅིག་ལས་ལྷག་སྟེ་ཐོ་བཀོད་འབད་ནུག   ལས་སྦྱོར་ཚར་གཅིག་རྐྱངམ་ཅིག་འབདཝ་ཨིན།\n"
 
 #: src/packages.c:154
 #, c-format
@@ -2574,6 +2643,10 @@ msgstr "%s བྱིན་མི་ཐུམ་སྒྲིལ་ %s འདི
 msgid "  Package %s is not installed.\n"
 msgstr "ཐུམ་སྒྲིལ་ %s འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr "ལུ་རྟེནམ་ཨིན།"
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "གང་ལྟར་ཡང་:\n"
@@ -2589,7 +2662,8 @@ msgstr "`%.250s' མེདཔ་ངེས་བདེན་བཟོཝ་ད་
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "སྣ་མང་བགོ་མི་ཅིག་གི་ཡན་ལག་ཨིན་མེན་བལྟ ནིའི་དོན་ལས་dpkg-བཤག་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgstr ""
+"སྣ་མང་བགོ་མི་ཅིག་གི་ཡན་ལག་ཨིན་མེན་བལྟ ནིའི་དོན་ལས་dpkg-བཤག་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2633,7 +2707,8 @@ msgstr "ཚད་འཛིན་བརྡ་དོན་གྱི་དོན་
 
 #: src/processarc.c:188
 msgid "failed to exec dpkg-deb to extract control information"
-msgstr "ཚད་འཛིན་བརྡ་དོན་ཕྱིར་འདོན་འབད་ནིའི་དོན་ལས་ dpkg-deb ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
+msgstr ""
+"ཚད་འཛིན་བརྡ་དོན་ཕྱིར་འདོན་འབད་ནིའི་དོན་ལས་ dpkg-deb ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོད།"
 
 #: src/processarc.c:205
 #, c-format
@@ -2696,7 +2771,8 @@ msgstr "%s བཤུབ་དོ་(%s ལས་)...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ཀྱི་མིང་(`%.250s' འགོ་བཙུགས་དོ་) འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས་(>%d ཡིག་འབྲུ)"
+msgstr ""
+"རིམ་སྒྲིག་ཡིག་སྣོད་ཀྱི་མིང་(`%.250s' འགོ་བཙུགས་དོ་) འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས་(>%d ཡིག་འབྲུ)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2742,7 +2818,8 @@ msgstr "dpkg-deb: སྲིད་པའི་རྒྱབ་ལུས་ཀླ
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགསཔ་ལས་ འདི་བཏོན་མི་གཏང་: %s"
+msgstr ""
+"dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགསཔ་ལས་ འདི་བཏོན་མི་གཏང་: %s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2751,8 +2828,12 @@ msgstr "dpkg: ཉེན་བརྡ་ - སྣོད་ཐོ་རྙིངམ
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་སྣོད་ཐོ་སྟོངམ་ཅིག་ཨིན་(དེ་ལས་འདི་བཏོན་གཏང་ཡོད།)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg: ཉེན་བརྡ་ - རིམ་སྒྲིག་ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་སྣོད་ཐོ་སྟོངམ་ཅིག་ཨིན་(དེ་ལས་འདི་བཏོན་གཏང་"
+"ཡོད།)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2760,25 +2841,29 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "གཞན་མི་ཡིག་སྣོད་གསརཔ་ `%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
-msgstr "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་ཡིག་སྣོད་གསརཔ་ལེ་ཤ་ཅིག་དང་གཅིད་པ་ཨིན་པས་! (`%.250s' དང `%.250s' གཉིས་ཆ་རང་)"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%.250s' འདི་ཡིག་སྣོད་གསརཔ་ལེ་ཤ་ཅིག་དང་གཅིད་པ་ཨིན་པས་! (`"
+"%.250s' དང `%.250s' གཉིས་ཆ་རང་)"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: ཉེན་བརྡ་ - ཡིག་སྣོད་རྙིངམ་ `%%.250s': %%s   %s འབད་མ་ཚུགས།\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "`%.250s' འགོ་བཙུགས་པའི་སྐབས་ ཐུམ་སྒྲིལ་གི་ཐོན་རིམ་རྙིངམ་འདི་ལུ་གནམ་མེད་ས་མེད་རིངམ་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག"
+msgstr ""
+"`%.250s' འགོ་བཙུགས་པའི་སྐབས་ ཐུམ་སྒྲིལ་གི་ཐོན་རིམ་རྙིངམ་འདི་ལུ་གནམ་མེད་ས་མེད་རིངམ་བརྡ་དོན་ཡིག་སྣོད་"
+"མིང་འདུག"
 
 #: src/processarc.c:766
 #, c-format
@@ -2797,7 +2882,8 @@ msgstr "གནས་སྐབས་ཚད་འཛིན་སྣོད་ཐོ
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "ཐུམ་སྒྲིལ་གྱི་ནང་ན་ གནམ་མེད་ས་མེད་རིངམ་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག་(`%.50s' འགོ་བཙུགས་དོ།)"
+msgstr ""
+"ཐུམ་སྒྲིལ་གྱི་ནང་ན་ གནམ་མེད་ས་མེད་རིངམ་ཚད་འཛིན་བརྡ་དོན་ཡིག་སྣོད་མིང་འདུག་(`%.50s' འགོ་བཙུགས་དོ།)"
 
 #: src/processarc.c:790
 #, c-format
@@ -2833,11 +2919,14 @@ msgstr "ཡལ་འགྱོ་མི་ཚད་འཛིན་བརྡ་ད
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "རེ་འདུན་ཡོདཔ་=མ་ཤེསཔ་/གཞི་བཙུགས་/རྩ་བསྐྲད་/ཕྱིར་བསྐྲད་/འཆང་\n"
-"| གནས་ཚད་=མེན་/གཞི་བཙུགས་འབད་ཡོདཔ་/རིམ་སྒྲིག་-ཡིག་སྣོད་ཚུ་/བཤུབ་ཡོདཔ་/འཐུས་ཤོར་བྱུང་མི་-རིམ་སྒྲིག་/ཕྱེད་ཀ་-གཞི་བཙུགས་འབད་ཡོདཔ\n"
-"|/ Err?=(ཅི་མེད་)/འཆང་/ལོག་གཞི་བཙུགས་/དགོ་མི་/X=གཉིས་ཆ་ར་-དཀའ་ངལ་(གནས་ཚད་ ཨི་ཨར་ཨར་:ཚུགས་ཡིག་-བྱང་ཉེས་)\n"
+"| གནས་ཚད་=མེན་/གཞི་བཙུགས་འབད་ཡོདཔ་/རིམ་སྒྲིག་-ཡིག་སྣོད་ཚུ་/བཤུབ་ཡོདཔ་/འཐུས་ཤོར་བྱུང་མི་-རིམ་སྒྲིག་/"
+"ཕྱེད་ཀ་-གཞི་བཙུགས་འབད་ཡོདཔ\n"
+"|/ Err?=(ཅི་མེད་)/འཆང་/ལོག་གཞི་བཙུགས་/དགོ་མི་/X=གཉིས་ཆ་ར་-དཀའ་ངལ་(གནས་ཚད་ ཨི་ཨར་ཨར་:"
+"ཚུགས་ཡིག་-བྱང་ཉེས་)\n"
 
 #: src/query.c:164
 msgid "Name"
@@ -2851,9 +2940,7 @@ msgstr "ཐོན་རིམ།"
 msgid "Description"
 msgstr "འགྲེལ་བཤད།"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "%s ལུ་མཐུན་མི་ཐུམ་སྒྲིལ་ཚུ་མ་འཐོབ།\n"
@@ -2925,8 +3012,10 @@ msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
-"dpkg --བརྡ་དོན་(= dpkg-deb --བརྡ་དོན་) འདི་ ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་བརྟག་དཔྱད་འབད་ནིའི་དོན་ལས་ལག་ལེན་འཐབ།\n"
-"དེ་ལས་  dpkg -- ནང་དོན་ཚུ་ (= dpkg-deb --ནང་དོན་ཚུ་) འདི་དེའི་ནང་དོན་ཛཚུ་ཐོ་བཀོད་འབད་ནིའི་དོན་ལས་ཐོ་བཀོད་འབད།\n"
+"dpkg --བརྡ་དོན་(= dpkg-deb --བརྡ་དོན་) འདི་ ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་བརྟག་དཔྱད་འབད་ནིའི་དོན་ལས་"
+"ལག་ལེན་འཐབ།\n"
+"དེ་ལས་  dpkg -- ནང་དོན་ཚུ་ (= dpkg-deb --ནང་དོན་ཚུ་) འདི་དེའི་ནང་དོན་ཛཚུ་ཐོ་བཀོད་འབད་ནིའི་"
+"དོན་ལས་ཐོ་བཀོད་འབད།\n"
 
 #: src/query.c:465
 #, c-format
@@ -2947,8 +3036,10 @@ msgid ""
 msgstr ""
 "བརྡ་བཀོད་ཚུ་:\n"
 "  -s|--གནས་ཚད་ <package> ...        ཐུམ་སྒྲིལ་གནས་ཚད་ཀྱི་རྒྱས་བཤད་ཚུ་བཀྲམ་སྟོན་འབད།\n"
-"  -p|--དཔར་བསྐྲུན་-འཐོབ་ཚུགསཔ་ <package> ...   འཐོབ་ཚུགསཔ་ཐོན་རིམ་གྱི་རྒྱས་བཤད་ཚུ་བཀྲམ་སྟོན་འབད།\n"
-"  -L|--ཐོ་ཡིག་ཡིག་སྣོད་ཚུ་ <package> ...     ཐོ་ཡིག་ཡིག་སྣོད་ཚུ་  ཐུམ་སྒྲིལ་(ཚུ་)གིས་ `owned' འབད་ཡོད།\n"
+"  -p|--དཔར་བསྐྲུན་-འཐོབ་ཚུགསཔ་ <package> ...   འཐོབ་ཚུགསཔ་ཐོན་རིམ་གྱི་རྒྱས་བཤད་ཚུ་བཀྲམ་སྟོན་"
+"འབད།\n"
+"  -L|--ཐོ་ཡིག་ཡིག་སྣོད་ཚུ་ <package> ...     ཐོ་ཡིག་ཡིག་སྣོད་ཚུ་  ཐུམ་སྒྲིལ་(ཚུ་)གིས་ `owned' "
+"འབད་ཡོད།\n"
 "  -l|--ཐོ་ཡིག་ [<pattern> ...]        ཐུམ་སྒྲིལ་ཚུ་སྙིང་བསྡུས་སྦེ་ཐོ་བཀོད་འབད།\n"
 "  -W|--སྟོན་ <pattern> ...          ཐུམ་སྒྲིལ་(ཚུ་)གུ་བརྡ་དོན་སྟོན།\n"
 "  -S|--འཚོལ་ཞིབ་ <pattern> ...        ཡིག་སྣོད་(ཚུ་)བདག་དབང་བཟུང་མི་ཐུམ་སྒྲིལ་(ཚུ་)འཚོལ།\n"
@@ -2967,25 +3058,25 @@ msgstr ""
 "  -f|--རྩ་སྒྲིག་སྟོན་=<format>         --སྟོན་ ནིའི་དོན་ལུ་རྩ་སྒྲིག་སྤེལ་མ་ལག་ལེན་འཐབ།\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "རྩ་སྒྲིག་ཚིག་སྦྱོར་:\n"
 "  རྩ་སྒྲིག་འདི་ ཐུམ་སྒྲིལ་རེའི་དོན་ལུ་ཨའུཊི་པུཊི་ ཨིན་མི་ཡིག་རྒྱུན་ཅིག་ཨིན། རྩ་སྒྲིག་འདི་གིས་\n"
-"  ཚད་ལྡན་ཐར་འབྱུང་རིམ་ཚུ་ གྲངས་སུ་བཙུགས་འོང་ \\n"
-" (གྲལ་ཐིག་གསརཔ་), \\r (སྐྱེལ་འདྲེན་\n"
+"  ཚད་ལྡན་ཐར་འབྱུང་རིམ་ཚུ་ གྲངས་སུ་བཙུགས་འོང་ \\n (གྲལ་ཐིག་གསརཔ་), \\r (སྐྱེལ་འདྲེན་\n"
 "  སླར་ལོག་) ཡང་ན་ \\\\ (ཉག་རྐྱང་གཡོ་ཤད་ལོག་པ་)། ཐུམ་སྒྲིལ་བརྡ་དོན་འདི་\n"
-"  ${var[;width]}ཚིག་སྦྱོར་ལག་ལེན་འཐབ་ ཐུམ་སྒྲིལ་གྱི་ས་སྒོ་ཚུ་ལུ་ འགྱུར་ཅན་གཞི་བསྟུན་ཚུ་བཙུགས་ཞིནམ་ལས་གྲངས་སུ་བཙུགས་ཚུགས།\n"
+"  ${var[;width]}ཚིག་སྦྱོར་ལག་ལེན་འཐབ་ ཐུམ་སྒྲིལ་གྱི་ས་སྒོ་ཚུ་ལུ་ འགྱུར་ཅན་གཞི་བསྟུན་ཚུ་བཙུགས་ཞིནམ་"
+"ལས་གྲངས་སུ་བཙུགས་ཚུགས།\n"
 "  རྒྱ་ཚད་འདི་མེད་ཆ་མེན་ཚུན་ས་སྒོ་འདི་ གཡས་-ཕྲང་འབད་འོང་\n"
 "  གཡོན་ཕྲང་སྒྲིག་ལག་ལེན་འཐབ་མི་གནད་དོན་ནང་ལུ།\n"
 
@@ -2996,13 +3087,17 @@ msgid ""
 "\n"
 msgstr ""
 "ཐུམ་སྒྲིལ་ཚུ་འདྲི་དཔྱད་འབད་ནིའི་སྐོར་ལས་གྲོགས་རམ་གྱི་དོན་ལུ་ --གྲོགས་རམ་ ལག་ལེན་འཐབ།\n"
-"འདྲ་བཤུས་དབང་ཆའི་ཆོག་ཐམ་དང་ཉེན་ལེན་མེད་མི་(ཇི་ཨེན་ཡུ་ ཇི་པི་ཨེལ་)གི་དོན་ལུ་ -ཆོག་ཐམ་ ལག་ལེན་འཐབ།\n"
+"འདྲ་བཤུས་དབང་ཆའི་ཆོག་ཐམ་དང་ཉེན་ལེན་མེད་མི་(ཇི་ཨེན་ཡུ་ ཇི་པི་ཨེལ་)གི་དོན་ལུ་ -ཆོག་ཐམ་ ལག་ལེན་"
+"འཐབ།\n"
 "\n"
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - ཉེན་བརྡ་: གཞི་བཙུགས་མ་འབད་བར་ཡོད་མི་ %.250s རྩ བསྐྲད་གཏང་ནིའི་ཞུ་བ་འདི་སྣང་མེད་བཞག་དོ།\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - ཉེན་བརྡ་: གཞི་བཙུགས་མ་འབད་བར་ཡོད་མི་ %.250s རྩ བསྐྲད་གཏང་ནིའི་ཞུ་བ་འདི་སྣང་མེད་བཞག་"
+"དོ།\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3011,7 +3106,8 @@ msgid ""
 " files of which are on the system.  Use --purge to remove them too.\n"
 msgstr ""
 "dpkg - ཉེན་བརྡ་:  %.250s རྩ བསྐྲད་གཏང་ནིའི་ཞུ་བ་འདི་སྣང་མེད་བཞག་དོ་   རིམ་སྒྲིག་\n"
-"ཡིག་སྣོད་ རིམ་ལུགས་ལུགས་གུ་ལུ་ཡོད་མི་རྐྱངམ་ཅིག   --དེ་ཚུ་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལས་--ཕྱིར་བསྐྲད་ ལག་ལེན་འཐབ།\n"
+"ཡིག་སྣོད་ རིམ་ལུགས་ལུགས་གུ་ལུ་ཡོད་མི་རྐྱངམ་ཅིག   --དེ་ཚུ་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལས་--ཕྱིར་བསྐྲད་ ལག་ལེན་"
+"འཐབ།\n"
 
 #: src/remove.c:109
 msgid "This is an essential package - it should not be removed."
@@ -3057,14 +3153,16 @@ msgstr "%s རྩ་བསྐྲད་ཡང་ན་ཕྱིར་བསྐྲ
 msgid "Removing %s ...\n"
 msgstr "%s རྩ་བསྐྲད་གཏང་དོ་...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་:  %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་  སྣོད་ཐོ་ `%.250s' རྩ་བསྐྲད་གཏང་མ་ཚུགས་: %s - སྣོད་ཐོ་འདི་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ཅིག་ཨིནམ་འོང་?\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་:  %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་  སྣོད་ཐོ་ `%.250s' རྩ་བསྐྲད་གཏང་མ་"
+"ཚུགས་: %s - སྣོད་ཐོ་འདི་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ཅིག་ཨིནམ་འོང་?\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
@@ -3081,8 +3179,12 @@ msgstr "ཚད་འཛིན་བརྡ དོན་ཡིག་སྣོད
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་: %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་ སྣོད་ཐོ་ `%.250s' སྟོངམ་མེནམ་ལས་རྩ་བསྐྲད་མ་གཏང་།\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"ཌི་པི་ཀེ་ཇི་ - ཉེན་བརྡ་: %.250s རྩ་བསྐྲད་གཏང་པའི་སྐབས་ སྣོད་ཐོ་ `%.250s' སྟོངམ་མེནམ་ལས་རྩ་བསྐྲད་"
+"མ་གཏང་།\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3176,11 +3278,15 @@ msgstr "--%s ལུ་ཐུམ་སྒྲིལ་གྱི་ཡིག་ས
 
 #: src/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
-msgstr "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
+msgstr ""
+"སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་"
+"སྤྱོད་འབད་མ་ཚུགས།"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་ནིའི་འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
+msgstr ""
+"སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་ནིའི་"
+"འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
 
 #: src/update.c:66
 #, c-format
@@ -3206,24 +3312,29 @@ msgstr "--བརྗེད་ནི་-རྙིངམ་-མི་འཐོབ
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་ - འཛོལ་བ་: %s (`%s') གི་ནང་ན་ཨང་ཡིག་ག་ནི་ཡང་མེད།\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--བཟོ་བརྩིགས་ལུ་སྣོད་ཐོའི་སྒྲུབ་རྟགས་གཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--བཟོ་བརྩིགས་འདི་གིས་མང་མཐའ་སྒྲུབ་རྟགས་གཉིས་འབགཔ་ཨིན།"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "ཡིག་མཛོད་ `%.250s' གི་གནས་སའི་དོན་ལུ་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "དམིགས་གཏད་འདི་སྣོད་ཐོ་ཨིན་ - ཚད་འཛིན་ཡིག་སྣོད་ཞིབ་དཔྱད་ གོམ་འགྱོ་མི་ཚུགས།"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3232,178 +3343,179 @@ msgstr ""
 "ཌི་པི་ཀེ་ཇི་-ཌེབ་: ཉེན་བརྡ་ ཚད་འཛིན་མངའ་ཁོངས་ཀྱི་ནང་དོན་ཚུ་ཞིབ་དཔྱད་མི་འབད་བས།\n"
 "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%s' ནང་ལུ་མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གཅིག་བཟོ་བརྩིགས་འབད་དོ།\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "ཐུམ་སྒྲིལ་གྱི་མིང་འདི་ལུ་ མགྱོགས་ཡིག་ཀ་ཁའི་ཨང་ཡིག་ཡང་ན་ `-+.' མེན་མི་ཡིག་འབྲུ་ཚུ་ཡོད།"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr "ཉེན་བརྡ་  `%s' གི་ནང་ན་ ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་གཙོ་རིམ་གནས་གོང་ `%s' ཡོད།\n"
+msgstr ""
+"ཉེན་བརྡ་  `%s' གི་ནང་ན་ ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་གཙོ་རིམ་གནས་གོང་ `%s' ཡོད།\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "ཉེན་བརྡ་  `%s' གི་ནང་ན་ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོ་ `%s' ཡོད།\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "ཚད་འཛིན་ཡིག་སྣོད་ནང་ %d འཛོལ་བ་ཚུ།"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%s' ནང་ལུ་ཐུམ་སྒྲིལ་ `%s' བཟོ་བརྩིགས་འབད་དོ།\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "ཚད་འཛིན་སྣོད་ཐོ་ལུ་བྱང་ཉེས་གནང་བ་ %03lo (>=0755 དང་ <=0775 ཨིན་དགོ་) འདུག"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་ཡང་ན་བརྡ་མཚོན་འབྲེལ་ལམ་མེན།"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' ལུ་བྱང་ཉེས་གནང་བ་ %03lo ( >=0555 དང་ <=0775 ཨིན་དགོ་) འདུག"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' ལུ་བྱང་ཉེས་གནང་བ་ %03lo ( >=0555 དང་ <=0775 ཨིན་དགོ་) འདུག"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "རྒྱུན་སྐྱོང་པའི་ཡིག་ཚུགས་ `%.50s' འདི་སི་ཊེཊི་འབད་བཏུབ་མེན།"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "ཨེཕ་གེཊིསི་ལྷག་ནིའི་ཀཱོན་ཕ་ཡིལསི་ལས་ཡིག་རྒྱུན་སྟོངམ།"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "ཉེན་བརྡ་  ཀཱོན་ཕ་ཡིལ་མིང་ `%.50s...' འདི་སྣ་མེད་ས་མེད་རིངམོ་ཨིན་པས་ ཡང་ན་མཐའ་མཇུག་གི་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ནུག\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"ཉེན་བརྡ་  ཀཱོན་ཕ་ཡིལ་མིང་ `%.50s...' འདི་སྣ་མེད་ས་མེད་རིངམོ་ཨིན་པས་ ཡང་ན་མཐའ་མཇུག་གི་གྲལ་ཐིག་"
+"གསརཔ་བརླག་སྟོར་ཞུགས་ནུག\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "ཉེན་བརྡ་  ཀཱོན་ཕ་ཡིལ་ཡིག་སྣོད་མིང་ `%s' གི་ནང་ན་ རྒྱབ་ལུས་བར་སྟོང་དཀརཔོ་འདུག\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "ཀཱོན་ཕ་ཡིལ་`%.250s' འདི་ ཐུམ་སྒྲིལ་ནང་མི་འབྱུང་།"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "ཀཱོན་ཕཡིལ་ `%.250s' འདི་སི་ཊེཊི་འབད་བཏུབ་མེན།"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "ཉེན་བརྡ་ ཀཱོནཕ་ཕ་ཡིལ་ `%s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་མེན།\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "ཀཱོནཕ་ཕ་ཡིལསི་ ཡིག་སྣོད་ལྷགཔ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "ཀཱོནཕ་ཕ་ཡིལསི་ ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་འཛོལ་བ།"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: ཚད་འཛིན་ཡིག་སྣོད་(ཚུ་)གི་སྐོར་ལས་ %d ཉེན་བརྡ་ཚུ་སྣང་མེད་བཞག་དོ།\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "`%.255s' གནས་ཁོངས་མིན་པ་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ".../DEBIAN ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "ཊར་ -སི་ཨེཕ་ ལག་ལེན་འཐབ་ནི་ཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(ཚད་འཛིན་)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(ཚད་འཛིན་)   %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(ཚད་འཛིན་)  %s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "ཚད་འཛིན།"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(ཚད་འཛིན་)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ལོག་བསྒྱིར་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(ཚད་འཛིན་)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་བཟོ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)   %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ལུ་འབྲེལ་མཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད་(གནད་སྡུད་)   %s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "གནད་སྡུད།"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "འཚོལ་ནི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "ཊར་རྒྱུད་དུང་ལུ་ཡིག་སྣོད་མིང་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ་(གནད་སྡུད)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "ནང་འཁོད་ཟཛོལ་བ་ ཨེབ་བཙུགས་དབྱེ་བ་ `%i' མ་ཤེསཔ་!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "གནས་སྐབས་ཡིག་སྣོད་ལོག་བསྒྱིར་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ་(གནད་སྡུད་)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "ཀེཊི་(གནད་སྡུད་)"
 
@@ -3421,14 +3533,12 @@ msgstr "ཡིག་སྣོད་ %.255s ལས་ %s ལྷགཔ་ད་འ
 msgid "unexpected end of file in %s in %.255s"
 msgstr "%.255s ནང་གི་ %s ནང་ལུ་ཡིག་སྣོད་ཀྱི་རེ་བ་མེད་པའི་མཇུག"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ -  `%.250s' རིང་ཚད་ཀྱི་ནང་ན་སྟོང་ཆ་ཚུ་ཡོད།"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ - བྱང་ཉེས་ཨང་ཡིག་(ཨང་རྟགས་ %d) %s ནང་ཡོད་མི་འདི་ཨིན།"
@@ -3450,11 +3560,11 @@ msgstr "ཐོན་རིམ་ཨང་།"
 msgid "between members"
 msgstr "འཐུས་མི་ཚུའི་བར་ན།"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ - བྱང་ཉེས་མིག་འཕྲུལ་ མགོ་ཡིག་གི་མཇུག་ཡང་ན་དང་པ་ཡོད་མི་འདི་ཨིན།"
+msgstr ""
+"ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ - བྱང་ཉེས་མིག་འཕྲུལ་ མགོ་ཡིག་གི་མཇུག་ཡང་ན་དང་པ་ཡོད་མི་འདི་ཨིན།"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3483,23 +3593,22 @@ msgstr "ཡིག་མཛོད་ལུ་ཐོན་རིམ་ཨང་ན
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "ཡིག་མཛོད་ཐོན་རིམ་ %.250s ཧ་མ་དགོ་  ཌི་པི་ཀེ་ཇི་-ཌེབ་ གསརཔ་ལེན།"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "%s ལས་གོམ་འགྱོ་ཡོད་པའི་འཐུས་མི་གནད་སྡུད།"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "ཡིག་སྣོད་ `%.250s' གི་ནང་ན་ཧ་མ་དགོ་བའི་གནད་སྡུད་འཐུས་མི་ %.*s འདུག་ བཀོག་བཀག་དོ་"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "ཡིག་སྣོད་ `%.250s' ནང་ན་ཚད་འཛིན་གྱི་འཐུས་མི་གཉིས་འདུག་ བཀོག་བཞག་དོ་"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3508,16 +3617,16 @@ msgstr ""
 "ཌི་བི་ཡཱན་ཐུམ་སྒྲིལ་གསརཔ་ ཐོན་རིམ་ %s\n"
 "ཚད་ %ld བཱ་འིཊིསི་: ཚད་འཛིན་ཡིག་མཛོད་= %zi བཱ་འིཊིསི།\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "ཚད་འཛིན་བརྡ་དོན་རིང་ཚད།"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "ཡིག་མཛོད་ཀྱིས་ཚད་འཛིན་རིང་ཚད་ `%s' བཟོ་ཉེས་གྱུར་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3526,84 +3635,83 @@ msgstr ""
 "ཌི་བི་ཡཱན་ཐུམ་སྒྲིལ་རྙིངམ་ ཐོན་རིམ་ %s.\n"
 "ཚད་ %ld བཱ་འིཊིསི་: ཚད་འཛིན་ཡིག་མཛོད་= %zi  ཡིག་མཛོད་གཙོ་བོ་= %ld\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "འགྱུར་ཅན་ `ctrlarea' དོན་ལུ་དྲན་ཚད་སྤྲོདཔ་ད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "ཚད་འཛིན་མངའ་ཁོངས།"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 "ཌི་པི་ཀེ་ཇི་-ཌེབ: ཡིག་སྣོད་འདི་ ཡིག་མཛོད་\n"
-"ཌི་པི་ཀེ་ཇི་-ཌེབ:   ཨེ་ཨེསི་སི་ཨའི་ཨའི་ཐབས་ལམ་ནང་ཕབ་ལེན་འབད་ཡོད་མི་གིས་ངན་ཅན་བཟོ་ཡོདཔ་བཟུམ་སབེ་མཐོངམ་མས།\n"
+"ཌི་པི་ཀེ་ཇི་-ཌེབ:   ཨེ་ཨེསི་སི་ཨའི་ཨའི་ཐབས་ལམ་ནང་ཕབ་ལེན་འབད་ཡོད་མི་གིས་ངན་ཅན་བཟོ་ཡོདཔ་བཟུམ་སབེ་"
+"མཐོངམ་མས།\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' འདི་ ཌི་བི་ཡཱན་རྩ་སྒྲིག་ཡིག་མཛོད་མེན་པས།"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "ད་ལྟོའི་ཡིག་སྣོད་གནས་ས་ལེནམ་ད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "ད་ལྟོའི་ཡིག་སྣོད་ཀྱི་གནས་ས་གཞི་སྒྲིག་འབདཝ་ད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "སྦྱར་ནི་ནང་རྒྱུད་དུང་འགྲེལ་བཤདཔ་ `1' ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡདོཔ།"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "ཇི་ཟིཔ་ -ཌི་སི་ ལུ་འབྲི་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "ཇི་ཟིཔ་ -ཌི་སི་ ཁ་བསྡམ་ནི་ལུ་འཐུས་ཤོར་བྱིང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "ཡིག་སྣོད་ཚུའི་ཡིག་མཛོད་ཆ་ཤས་ལུ་་ཨེསི་ཝའི་ཨེསི་བོད་བརྡ་ ཨེལ་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "འདྲ་བཤུས་ནང་ལུ་རྒྱུད་དུང་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "འདྲ་བཤུས་ནང་ལུ་རྒྱུད་དུང་ཁ་བསྡམ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "ཊར་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ལུ་ .deb ཡིག་སྣོད་མིང་གི་སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3612,12 +3720,12 @@ msgstr ""
 "--%s ལུ་དམིགས་གཏད་ཀྱི་སྣོད་ཐོ་ཅིག་དགོ\n"
 "ཁྱོད་ཀྱིས་ ཌི་པི་ཀེ་ཇི་ --གཞི་བཙུགས་ ལག་ལེན་འཐབ་དགོཔ་འོང་?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s གིས་མང་མཐའ་སྒྲུབ་རྟགས་གཉིས་འབགཔ་ཨིན།(.deb དང་སྣོད་ཐོ་)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s གིས་སྒྲུབ་རྟགས་གཅིག་རྐྱངམ་ཅིག་འབགཔ་ཨིན།(.deb ཡིག་སྣོད་མིང་)"
@@ -3659,7 +3767,9 @@ msgstr "ཌི་པི་ཀེ་ཇི་-ཌེབ་: `%.255s' ནང་ལ
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "ཁ་ཕྱེ་ཡོད་མི་ཆ་ཤས་ `%.255s' (%.255s ནང་ལུ་) འདི་ རེ་བ་མེད་པའི་ཐབས་ལམ་ཅིག་ནང་ལུ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
+msgstr ""
+"ཁ་ཕྱེ་ཡོད་མི་ཆ་ཤས་ `%.255s' (%.255s ནང་ལུ་) འདི་ རེ་བ་མེད་པའི་ཐབས་ལམ་ཅིག་ནང་ལུ་འཐུས་ཤོར་"
+"འབྱུང་ཡོདཔ།"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3771,7 +3881,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3780,19 +3890,25 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "གདམ་ཁ་ཚུ་:\n"
 "  --རྩ་སྒྲིག་སྟོན་=<format>            --སྟོན་ནིའི་དོན་ལུ་ སྤེལ་མ་རྩ སྒྲིག་ལག་ལེན་འཐབ།\n"
 "  -D                               རྐྱེན་སེལ་འབད་ནིའི་ཨའུཊི་པུཊི་ལྕོགས་ཅན་བཟོ།\n"
 "  --རྙིངམ། --གསརཔ                     ཡིག་མཛོད་རྩ་སྒྲིག་སེལ་འཐུ་འབད།\n"
-"  --ཞིབ་དཔྱད་འབད་མི་མེད་                       ཚད་འཛིན་ཡིག་སྣོད་ཞིབ་དཔྱད་མར་མནོན་ (བྱང་ཉེས་འབད་བཟོ་བརྩིགས་འབད་ཡོད་པའི་\n"
+"  --ཞིབ་དཔྱད་འབད་མི་མེད་                       ཚད་འཛིན་ཡིག་སྣོད་ཞིབ་དཔྱད་མར་མནོན་ (བྱང་"
+"ཉེས་འབད་བཟོ་བརྩིགས་འབད་ཡོད་པའི་\n"
 "                                     ཐུམ་སྒྲིལ་ཚུ་)\n"
-"  -z#                              བཟོ་བརྩིགས་འབད་བའི་སྐབས་ ཨེབ་བཙུགས་ཀྱི་གནས་རིམ་འདི་གཞི་སྒྲིག་འབད།\n"
-"  -Z<type>                         བཟོ་བརྩིགས་འབད་བའི་སྐབས་ལག་ལེན་འཐབ་ཡོད་པའི་ཨེབ་བཙུགས་ཀྱི་དབྱེ་བ་འདི་གཞི་སྒྲིག་འབད།\n"
-"                                     འབད་ཆོག་པའི་གནས་གོང་ཚུ་: ཇི་ཟིཔ་ བི་ཟིཔ་༢ ཅི་མེད་\n"
+"  -z#                              བཟོ་བརྩིགས་འབད་བའི་སྐབས་ ཨེབ་བཙུགས་ཀྱི་གནས་རིམ་འདི་"
+"གཞི་སྒྲིག་འབད།\n"
+"  -Z<type>                         བཟོ་བརྩིགས་འབད་བའི་སྐབས་ལག་ལེན་འཐབ་ཡོད་པའི་ཨེབ་"
+"བཙུགས་ཀྱི་དབྱེ་བ་འདི་གཞི་སྒྲིག་འབད།\n"
+"                                     འབད་ཆོག་པའི་གནས་གོང་ཚུ་: ཇི་ཟིཔ་ བི་ཟིཔ་༢ ཅི་"
+"མེད་\n"
 "\n"
 
 #: dpkg-deb/main.c:106
@@ -3804,19 +3920,24 @@ msgid ""
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "\n"
-"`dpkg' འདི་ཁྱོད་རའི་རིམ་ལུགས་ལས་ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལས་ལག་ལེན་འཐབ་ ཡང་ན་\n"
-"ལག་ལེན་པ་-མཐུན་སྒྲིག་གི་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་དོན་ལུ་`dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ། ཐུམ་སྒྲིལ་\n"
-"བཤུབ་ནི་ཚུ་  `dpkg-deb --extract' ལག་ལེན་འཐབ་ཐོག་འབད་མི་འདི་གིས་ བདེན་མེད་སྦེ་གཞི་བཙུགས་འབད་འོང་!\n"
+"`dpkg' འདི་ཁྱོད་རའི་རིམ་ལུགས་ལས་ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལས་ལག་ལེན་འཐབ་ "
+"ཡང་ན་\n"
+"ལག་ལེན་པ་-མཐུན་སྒྲིག་གི་ཐུམ་སྒྲིལ་འཛིན་སྐྱོང་པའི་དོན་ལུ་`dselect' ཡང་ན་ `aptitude' ལག་ལེན་འཐབ། "
+"ཐུམ་སྒྲིལ་\n"
+"བཤུབ་ནི་ཚུ་  `dpkg-deb --extract' ལག་ལེན་འཐབ་ཐོག་འབད་མི་འདི་གིས་ བདེན་མེད་སྦེ་གཞི་བཙུགས་"
+"འབད་འོང་!\n"
 
 #: dpkg-deb/main.c:115
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
-"དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་ - ཌེབ་--གྲོགས་རམ་ འདི་ *.deb ཡིག་སྣོད་ཚུ་ སྒྱུར་བཅོས་གཏང་ནིའི་སྐོར་ལས་གྲོགས་རམ་གྱི་དོན་ལུ།\n"
-"དབྱེ་བ་ཌི་པི་ཀེ་ཇི་--གྲོགས་རམ་འདི་ ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་དང་གཞི་བཙུགས་མི་འབད་ནིའི་སྐོར་ལས་གྲོགས་རམ་གྱི་དོན་ལུ།"
+"དབྱེ་བ་ ཌི་པི་ཀེ་ཇི་ - ཌེབ་--གྲོགས་རམ་ འདི་ *.deb ཡིག་སྣོད་ཚུ་ སྒྱུར་བཅོས་གཏང་ནིའི་སྐོར་ལས་གྲོགས་རམ་"
+"གྱི་དོན་ལུ།\n"
+"དབྱེ་བ་ཌི་པི་ཀེ་ཇི་--གྲོགས་རམ་འདི་ ཐུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནི་དང་གཞི་བཙུགས་མི་འབད་ནིའི་སྐོར་ལས་"
+"གྲོགས་རམ་གྱི་དོན་ལུ།"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "མ་ཤེས་པའི་ཨེབ་བཙུགས་ཀྱི་དབྱེ་བ་ `%s'!"
@@ -3829,7 +3950,8 @@ msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨ
 #: dpkg-split/info.c:67
 #, c-format
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
-msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - `%.250s' གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
+msgstr ""
+"ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - `%.250s' གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
 #: dpkg-split/info.c:91
 msgid "unable to seek back"
@@ -3848,7 +3970,9 @@ msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨ
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "ཡིག་སྣོད་  `%.250s' འདི་རྩ སྒྲིག་ཐོན་རིམ་  `%.250s' ཨིན་ - ཁྱོད་ལུ་ ཌི་པི་ཀེ་ཇི་-བཤག་ནི་གསརཔ་ཅིག་དགོ"
+msgstr ""
+"ཡིག་སྣོད་  `%.250s' འདི་རྩ སྒྲིག་ཐོན་རིམ་  `%.250s' ཨིན་ - ཁྱོད་ལུ་ ཌི་པི་ཀེ་ཇི་-བཤག་ནི་གསརཔ་ཅིག་"
+"དགོ"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3878,12 +4002,16 @@ msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨ
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཚད་ཚུའི་དོན་ལུ་ཡན་ལག་གི་ཨང་ཕྱི་འགྱུར།"
+msgstr ""
+"ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཚད་ཚུའི་དོན་ལུ་ཡན་ལག་གི་ཨང་ཕྱི་"
+"འགྱུར།"
 
 #: dpkg-split/info.c:157
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
-msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཚད་འདི་ འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཡན་ལག་ཨང་གི་དོན་ལུ་ཕྱི་འགྱུར་ཨིན།"
+msgstr ""
+"ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་ - ཚད་འདི་ འདྲེན་རྟགས་ནང་བཙུགས་ཡོད་པའི་ཡན་ལག་ཨང་གི་དོན་ལུ་"
+"ཕྱི་འགྱུར་ཨིན།"
 
 #: dpkg-split/info.c:163
 #, c-format
@@ -3895,8 +4023,7 @@ msgstr "ཡན་ལག་ཡིག་སྣོད་ `%.250s' ཨེཕ་ས
 msgid "file `%.250s' is corrupt - too short"
 msgstr "ཡིག་སྣོད་ `%.250s' འདི་ངན་ཅན་ཨིན་པས་ -སྣ་མེད་ས་མེད་ཐུང་ཀུ།"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "ཡིག་མཛོད་ཡན་ལག་ཡིག་སྣོད་ `%.250s'  ཁ་ཕྱེ་མི་ཚུགས།"
@@ -4015,16 +4142,19 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"
 msgstr ""
 "གདམ་ཁ་ཚུ་:\n"
-"  --དོས་ཁང་སྣོད་ཐོ་ <directory>            <directory> འདི་ %s/%s གི་ཚབ་ལུ་ལག་ལེན་འཐབ།\n"
+"  --དོས་ཁང་སྣོད་ཐོ་ <directory>            <directory> འདི་ %s/%s གི་ཚབ་ལུ་ལག་ལེན་"
+"འཐབ།\n"
 "  -S|--ཡན་ལག་ཚད་ <size>             KiB ནང་  -s (སྔོན་སྒྲིག་འདི་ ༤༥༠ ཨིན་)གི་དོན་ལུ་.\n"
-"  -o|--ཨའུཏི་པུཊི་ <file>               -j (སྔོན་སྒྲིག་འདི་ <package>-<version>.deb ཨིན་)གི་དོན་ལུ།\n"
+"  -o|--ཨའུཏི་པུཊི་ <file>               -j (སྔོན་སྒྲིག་འདི་ <package>-<version>.deb "
+"ཨིན་)གི་དོན་ལུ།\n"
 "  -Q|--ཨེན་པི་ཀོཡིཊི་                     -ཨེ་འདི་ཡན་ལག་མེན་པའི་སྐབས་ ཁུ་སིམ་སིམ་སྦེ་སྡོད།\n"
 "  --ཨེམ་ཨེསི་ཌོསི་                          ༨.༣ ཡིག་སྣོད་མིང་ཚུ་ བཟོ་བཏོན་འབད།\n"
 "\n"
@@ -4123,8 +4253,7 @@ msgstr "--ཐོ་ཡིག་ཀིའུ་ལུ་སྒྲུབ་རྟ
 msgid "Junk files left around in the depot directory:\n"
 msgstr "དོས་ཁང་སྣོད་ཐོ་ནང་གི་མཐའ་འཁོར་ལུ་བཞག་མི་མཁོ་མེད་ཡིག་སྣོད་ཚུ་:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "`%.250s' སི་ཊེཊི་འབད་མ་ཚུགས།"
@@ -4189,11 +4318,9 @@ msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' 
 msgid "unable to exec mksplit"
 msgstr "ཨེམ་ཀེ་སི་པི་ལིཊི་ལག་ལེན་འཐབ་མ་ཚུགས།"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "ཌེ་བི་ཡཱན་ %s ཐོན་རིམ་ %s\n"
@@ -4206,11 +4333,9 @@ msgstr ""
 "\n"
 "འདྲ་བཤུས་དབང་ཆ་ (C) ༡༩༩༦ ཀིམ་-མིན་ ཀ་པ་ལཱན།"
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4235,30 +4360,27 @@ msgstr ""
 "\n"
 "གདམ་ཁ་ཚུ་:\n"
 "  --ཉེན་ཅན་     ཕན་ཐོགས་ཅད་ཨིནམ་སྲིད་པའི་གདམ་ཁ་ ཁ་སྐོང་ལ་ལུ་གཞི་སྒྲིག་འབད།\n"
-"               ཉེན་བརྡ་: འ་ནི་གདམ་ཁ་འདི་གིས་ ཡང་ཅིན་ངེས་བདེན་ཨིན་མི་ཡིག་སྣོད་ཅིག་ གོ་བ་ཕྱི་འགྱུར་འབད་ལེན་འོང་། \n"
+"               ཉེན་བརྡ་: འ་ནི་གདམ་ཁ་འདི་གིས་ ཡང་ཅིན་ངེས་བདེན་ཨིན་མི་ཡིག་སྣོད་ཅིག་ གོ་བ་ཕྱི་"
+"འགྱུར་འབད་ལེན་འོང་། \n"
 "  --གྲོགས་རམ་       འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་སྟོན།\n"
 "  --ཐོན་རིམ་    ཐོན་རིམ་འདི་སྟོན།\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: ཉེན་བརྡ་ - %s ལྡེ་མིག་ཕྱེ་མ་ཚུགས་: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: སྒྲུབ་རྟགས་ལེ་ཤ།"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: %s ཞུན་དག་འབད་ནིའི་! དོན་ལུ་སྣོད་ཐོ་ལྡེ་མིག་རྐྱབས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -4268,48 +4390,40 @@ msgstr "%s: %s ཞུན་དག་འབད་ནིའི་! དོན་ལ
 msgid "try deleting %s"
 msgstr "%s བཏོན་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད།"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "རྩ་བསྐྲད་གཏང་མ་ཚུགས:%s: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "རྩ་བསྐྲད་གཏང་མ་ཚུགས %s: %s "
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "རྩ་བསྐྲད་གཏང་མ་ཚུགས %s: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr " %sལྷག་ཚར་བའི་ཤུལ་མ་ %s ཁ་བསྡམས་མ་ཚུགས།"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "%s་ རྙིངམ་རྒྱབ་ཐག་འབད་མ་ཚུགས་ བཀོག་བཞག་དོ་: %s"
@@ -4324,13 +4438,12 @@ msgstr "%s གཞི་བཙུགས་འབད་ནི་ལུ་འཐུ
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s:  ལྡེ་མིག་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།%s: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "ཨི་ཨེན་ཨོ་ཨི་ཨེན་ཊི་ གནས་གོང་འདི་ %s ལས་ལེན་མི་ཚུགས་: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4340,7 +4453,7 @@ msgstr ""
 "འདྲ་བཤུས་དབང་ཆ་ (C) ༡༩༩༥ ཨི་ཡན་ ཇེཀ་ཤན།\n"
 "འདྲ་བཤུས་དབང་ཆ་ (C) ༢༠༠༠ ༢༠༠༡ ཝི་ཅརཊི་ ཨཀ་ཀར་མཱན།"
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4352,7 +4465,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4365,7 +4479,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "ལག་ལེན་: %s [<option> ...] <command>\n"
 "\n"
@@ -4387,101 +4502,96 @@ msgstr ""
 "  --གྲོགས་རམ་                   འ་ནི་གྲོགས་འཕྲིན་དོན་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 "\n"
-"ཁ་སྐོང་རྐྱབས་པའི་སྐབས་ སྔོན་སྒྲིག་འདི་ --ཉེ་གནས་དང་ --ཁ་ཕྱོགས་སྒྱུར་བ་ཨིན། <original>.བགོ་བཀྲམ་འབད།\n"
-"རྩ་བསྐྲད་གཏང་པའི་སྐབས་ --ཐུམ་སྒྲིལ་ཡང་ན་ --ཉེ་གནས་དང་ --ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ གསལ་བཀོད་འབད་ཡོདཔ་ཨིན་པ་ཅིན་ མཐུན་དགོ\n"
-"ཐུམ་སྒྲིལ་ པི་རིནསིཊི་/པོསི་ཊིརམ་ ཡིག་ཚུགས་ཚུ་གིས་ཨ་རྟག་རང་ --ཐུམ་སྒྲིལ་དང་ and --ཁ་ཕྱོགས་སྒྱུར་བ་ གསལ་བཀོད་འབད་དགོ།\n"
+"ཁ་སྐོང་རྐྱབས་པའི་སྐབས་ སྔོན་སྒྲིག་འདི་ --ཉེ་གནས་དང་ --ཁ་ཕྱོགས་སྒྱུར་བ་ཨིན། <original>.བགོ་བཀྲམ་"
+"འབད།\n"
+"རྩ་བསྐྲད་གཏང་པའི་སྐབས་ --ཐུམ་སྒྲིལ་ཡང་ན་ --ཉེ་གནས་དང་ --ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ གསལ་བཀོད་འབད་ཡོདཔ་"
+"ཨིན་པ་ཅིན་ མཐུན་དགོ\n"
+"ཐུམ་སྒྲིལ་ པི་རིནསིཊི་/པོསི་ཊིརམ་ ཡིག་ཚུགས་ཚུ་གིས་ཨ་རྟག་རང་ --ཐུམ་སྒྲིལ་དང་ and --ཁ་ཕྱོགས་སྒྱུར་བ་ "
+"གསལ་བཀོད་འབད་དགོ།\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "ཐབས་ལམ་གཉིས་གསལ་བཀོད་འབད་ཡོདཔ: %s དང་ --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "སྒྲུབ་རྟགས་སྟོན་ནི་ལུ་--%s ལུ་ཁ་ཕྱོགས་བསྒྱུར་བ་ཅིག་དགོཔ་ཨིན།"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "ལུ་-ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s་ལུ་ <ཐུམ་སྒྲིལ་>སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསརཔ་མེདཔ་འོང་།"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ་ལུ་ <སྣོད་ཐོ་> སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "ཁ་སྒྱུར་ཁ་ཕྱེ་མ་ཚུགས: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་གདམ་ལྡེ་མིང་།"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ།"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s་ལུ་སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོཔ་འདུག"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ཡིག་སྣོད་མིང་ \"%s\" འདི་ཡང་དག་མེན།"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "ཡིག་སྣོད་ཚུ་ནང་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "སྣོད་ཐོ་ཚུ་ཁ་ཕྱོགས་སྒྱུར་མི་ཚུགས།"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "`%s' བཀོག་བཞག་དོ།"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' འདི་ `%s' དང་ཅིག་ཁར་རྡབ་འཁྲུག་བྱུངམ་ཨིན།"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' ཁ་སྐོང་རྐྱབས་དོ།"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4492,7 +4602,7 @@ msgstr ""
 "   `%s'རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "   `%s' འཐོབ་ཡོད།"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4503,37 +4613,37 @@ msgstr ""
 "  `%s' རྩ་བསྐྲད་གཏང་པའི་སྐབས་\n"
 "  `%s' འཐོབ་ཡོད།"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "`%s' རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "ཁ་སྒྱུར་ `%s' མེད། གཅིག་ཡང་རྩ་བསྐྲད་མ་གཏང་།"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "ནང་འཁོད་འཛོལ་བ་ - ཐབས་ལམ་བྱང་ཉེས་ `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "མིང་གསརཔ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' ཞིབ་དཔྱད་འབད་ནིའི་འཛོལ་བ: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4542,53 +4652,52 @@ msgstr ""
 "བསྐྱར་མིང་བཏགས་ནི་འདི་ `%s' \n"
 "  ཡིག་སྣོད་ `%s' སོ་སོ་དང་དང་ཅིག་ཁར་ཚབ་སྲུང་འབད་ནི་དང་འབྲེལ་བ་འབདཝ་ཨིན། འབད་མི་ཆོག"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "བསྐྱར་མིང་བཏགས་: འབྲེལ་ལམ་ `%s' རྙིངམ་རྫུན་མ་རྩ་བསྐྲད་གཏང་: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "བསྐྱར་མིང་བཏགས་:  `%s' འདི་ `%s' ལུ་བསྐྱར་མིང་བཏགས་: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་གསར་བསྐྲུན་འབད: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་འབྲི: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་ཁ་བསྡམ: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ཁ་སྒྱུར་རྙིངམ་-རྙིངམ་ རྩ་བསྐྲད་གཏང་: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "ཁ་སྒྱུར་གསརཔ་-རྙིངམ་གསར་བསྐྲུན་འབད: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "ཁ་སྒྱུར་གསརཔ་གཞི་བཙུགས་འབད: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ: %s ངན་ཅན་བཟོ་ནི་: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4596,7 +4705,7 @@ msgstr ""
 "\n"
 "འདྲ་བཤུས་དབང་ཆ་© ༢༠༠༠ ཝི་ཅརཊི་ ཨཀ་ཀར་མཱན།"
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4626,112 +4735,112 @@ msgstr ""
 "གདམ་ཁ་ཚུ:\n"
 "  --བདག་སྐྱོང་སྣོད་ཐོ་ <directory>   སི་ཊེཊི་ཡིག་སྣོད་དང་ཅིག་ཁར་སྣོད་ཐོ་གཞི་སྒྲིག་འབད།\n"
 "  --དུས་མཐུན་བཟོ་ནི་               ཡིག་སྣོད་གནང་བ་ཚུ་དེ་འཕྲལ་ལས་དུས་མཐུན་བཟོ།\n"
-"  --བང་བཙོང་ནི་                  དྲན་ཤེས་ཀྱི་ཞིབ་དཔྱད་འཐུས་ཤོར་བྱུང་རུང་ཡང་ བྱ་བ་གཅིག་བང་བཙོང་།\n"
+"  --བང་བཙོང་ནི་                  དྲན་ཤེས་ཀྱི་ཞིབ་དཔྱད་འཐུས་ཤོར་བྱུང་རུང་ཡང་ བྱ་བ་གཅིག་བང་"
+"བཙོང་།\n"
 "  --ཁུ་སིམ་སིམ་                  བཀོལ་སྤྱོད་པ་ཁུ་སིམ་སིམ། ཨའུཊི་པུཊི་ཆུང་ཀུ།\n"
 "  --གྲོགས་རམ་                   འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་འདི་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "ཐབས་ལམ་གཅིག་ཡང་གསལ་བཀོད་མ་འབད་བས།"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--ཁ་སྐོང་རྐྱབས་ནི་ལུ་ སྒྲུབ་རྟགས་བཞི་དགོ"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ཁྲིམས་འགལ་ལག་ལེན་པ་ %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "གནས་པ་མིན་པའི་ལག་ལེན་པ་ %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ཁྲིམས་འགལ་སྡེ་ཚན་ %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "གནས་པ་མིན་པའི་སྡེ་ཚན་ %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "ཁྲིམས་འགལ་ཐབས་ལམ་ %s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "བཤུབ་ནི་རྒྱབ་ལུས་/"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\" གི་དོན་ལུ་ཟུར་བཞག་འད་ཧེ་མ་ལས་རང་ཡོདཔ་ཨིན།"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "དེ་འབདཝ་ད་ --བང་བཙོང་འདི་གསལ་བཀོད་འབད་ཡོདཔ་ལས་ སྣང་མེད་བཞག་འོང་།"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "བར་བཤོལ་འབད་དོ།"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "ཉེན་བརྡ་: --དུས་མཐུན་བྱིན་ཡོད་ དེ་འབདཝ་ད་  %s འདི་མེད།"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "%s སི་ཨེཆ་ཨོན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད་:་%s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "%s སི་ཨེཆ་མོཌི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད་: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "ཟུར་བཞག་གཅིག་ཡང་མེད།"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "ཉེན་བརྡ: --དུས་མཐུན་འདི་ --རྩ་བསྐྲད་ཀྱི་དོན་ལུ་ཁུངས་མེདཔ་ཨིན།"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཁ་ཕྱེ་མ་ཚུགས: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "\"%s\" གི་དོན་ལུ་སྣ་མང་ཟུར་བཞག་ཚུ་ བར་བཤོལ་འབད་དོ།"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་གསརཔ་ཁ་ཕྱེ་མ་ཚུགས་: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་-རྙིངམ་རྩ་བསྐྲད་གཏངམ་ད་འཛོལ་བ་: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་-རྙིངམ་ གསརཔ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ་: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་གསརཔ་གཞི་བཙུགས་འབདཝ་ད་འཛོལ་བ་: %s"
@@ -4752,15 +4861,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4773,18 +4885,24 @@ msgstr ""
 "གདམ་ཁ་ཚུ་:\n"
 "  --དབྱེ་ཚན་ <regexp> <title>\n"
 "                           ཐོ་བཀོད་གསརཔ་འདི་ <regex> མཐུན་མི་དབྱེ་ཚན་ནང་ལུ་བཙུགས་\n"
-"                           ཡང་ན་གསརཔ་ཅིག་ གནས་པ་-མེནམ་ཨིན་པ་ཅིན་ <title> དང་ཅིག་ཁར་གསར་བསྐྲུན་འབད།\n"
+"                           ཡང་ན་གསརཔ་ཅིག་ གནས་པ་-མེནམ་ཨིན་པ་ཅིན་ <title> དང་ཅིག་"
+"ཁར་གསར་བསྐྲུན་འབད།\n"
 "  --དཀར་ཆག་ཐོ་བཀོད་=<text>       དཀར་ཆག་ཐོ་བཀོད་འདི་གཞི་སྒྲིག་འབད།\n"
-"  --འགྲེལ་བཤད་=<text>     དཀར་ཆག་ཐོ་བཀོད་ནང་ལུ་ལག་ལེན་འཐབ་ནི་ཨིན་མི་འགྲེལ་བཤད་འདི་གཞི་སྒྲིག་འབད།\n"
-"  --བརྡ་དོན་-ཡིག་སྣོད་=<path>       སྣོད་ཐོ་ནང་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་བརྡ་དོན་ཡིག་སྣོད་གསལ་བཀོད་འབད།\n"
+"  --འགྲེལ་བཤད་=<text>     དཀར་ཆག་ཐོ་བཀོད་ནང་ལུ་ལག་ལེན་འཐབ་ནི་ཨིན་མི་འགྲེལ་བཤད་འདི་གཞི་སྒྲིག་"
+"འབད།\n"
+"  --བརྡ་དོན་-ཡིག་སྣོད་=<path>       སྣོད་ཐོ་ནང་གཞི་བཙུགས་འབད་ནིའི་དོན་ལས་བརྡ་དོན་ཡིག་སྣོད་གསལ་"
+"བཀོད་འབད།\n"
 "  --སྣོད་ཐོ་-ཡིག་སྣོད་=<path>        བརྡ་དོན་སྣོད་ཐོའི་ཡིག་སྣོད་ཀྱི་ཡིག་སྣོད་མིང་གསལ་བཀོད་འབད།\n"
 "  --བརྡ་དོན་སྣོད་ཐོ་=<directory>     '--dir-file=<directory>/dir' དང་གཅིག་པ་\n"
 "  --བརྡ་དོན་-སྣོད་ཐོ་=<directory>   བཟུམ་སྦེ་\n"
 "  --རྙིངམ་-བཞག་               ཐོ་བཀོད་ཚུ་ཚབ་མ་བཙུགས་ ཡང་ན་སྟོངམ་འདི་ཚུ་རྩ་བསྐྲད་མ་གཏང་།\n"
-"  --རྩ་བསྐྲད་གཏང་                 <filename> གཞི་རྟེན་མིང་གིས་གསལ་བཀོད་འབད་མི་ཐོ་བཀོད་འདི་རྩ་བསྐྲད་གཏང་།\n"
+"  --རྩ་བསྐྲད་གཏང་                 <filename> གཞི་རྟེན་མིང་གིས་གསལ་བཀོད་འབད་མི་ཐོ་བཀོད་འདི་"
+"རྩ་བསྐྲད་གཏང་།\n"
 "  --རྦ བསྐྲད་གཏང་-ཏག་ཏག་འབད་         <filename> ཐོ་བཀོད་ཏག་ཏག་འདི་རྩ་བསྐྲད་གཏང་།\n"
-"  --བརྟག་ཞིབ་                   ཚིག་ཡིག་ཐབས་ལམ་ལྕོགས་ཅན་བཟོཝ་ཨིན་ (བྱ་བ་ག་ཅི་ཡང་མ་འབད་)\n"
-"  --རྐྱེན་སེལ།                  རྐྱེན་སེལ་གྱི་ཐབས་ལམ་ལྕོགས་ཅན་བཟོཝ་ཨིན་ (བརྡ་དོན་ཧེང་བཀལ་སྟོན་)\n"
+"  --བརྟག་ཞིབ་                   ཚིག་ཡིག་ཐབས་ལམ་ལྕོགས་ཅན་བཟོཝ་ཨིན་ (བྱ་བ་ག་ཅི་ཡང་མ་"
+"འབད་)\n"
+"  --རྐྱེན་སེལ།                  རྐྱེན་སེལ་གྱི་ཐབས་ལམ་ལྕོགས་ཅན་བཟོཝ་ཨིན་ (བརྡ་དོན་ཧེང་བཀལ་"
+"སྟོན་)\n"
 "  --ཁུ་སིམ་སིམ་                  ཨའུཊི་པུཊི་འཕྲིན་དོན་ཚུ་མ་སྟོན་\n"
 "  --གྲོགས་རམ                   འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་འདི་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
@@ -4844,8 +4962,7 @@ msgstr ""
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: ཡིག་སྣོད་ %s མེད། རྒྱབ་ཐག་ཡིག་སྣོད་ %s སླར་འདྲེན་འབད་དོ།"
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: %s འདི་ %s ལུ་འདྲ་བཤུས་རྐྱབས་ནི་འཐུས་ཤོར་འབྱུང་ཡོད། བཀོག་བཞག་དོ: %s "
@@ -4945,7 +5062,7 @@ msgstr "%s: %d་འདི་རྩ་བསྐྲད་གཏང་མ་ཚུ
 msgid "dbg: %s"
 msgstr "ཌི་བི་ཇི: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4955,8 +5072,8 @@ msgstr ""
 "འདྲ་བཤུས་དབང་ཆ་© ༡༩༩༥ ཨིཡན་ ཇེཀ་ཤན།\n"
 "འདྲ་བཤུས་དབང་ཆ་© ༢༠༠༠-༢༠༠༢ ཝི་ཅརཊི་ཨཀ་ཀར་མན།"
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4965,22 +5082,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -4999,8 +5119,10 @@ msgstr ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           རིམ་ལུགས་ལུ་སྤེལ་མ་ཚུའི་སྡེ་ཚན་ཅིག་ཁ་སྐོང་རྐྱབས།\n"
 "  --རྩ་བསྐྲད་གཏང་ <name> <path> <path> འདི་ <name> སྡེ་ཚན་སྤེལ་མ་འདི་ལས་རྩ་བསྐྲད་གཏང་།\n"
-"  --གེ་ར་-རྩ་བསྐྲད་གཏང་ <name>       <name> སྡེ་ཚན་འདི་  སྤེལ་མ་ཚུའི་རིམ་ལུགས་ལས་རྩ་བསྐྲད་གཏང་།\n"
-"  --རང་བཞིན་ <name>            འབྲེལ་ལམ་ཨམ་ <name> འདི་ རང་བཞིན་གྱི་ཐབས་ལམ་ལུ་སོར་བསྒྱུར་འབད།\n"
+"  --གེ་ར་-རྩ་བསྐྲད་གཏང་ <name>       <name> སྡེ་ཚན་འདི་  སྤེལ་མ་ཚུའི་རིམ་ལུགས་ལས་རྩ་བསྐྲད་"
+"གཏང་།\n"
+"  --རང་བཞིན་ <name>            འབྲེལ་ལམ་ཨམ་ <name> འདི་ རང་བཞིན་གྱི་ཐབས་ལམ་ལུ་སོར་བསྒྱུར་"
+"འབད།\n"
 "  --བཀྲམ་སྟོན་འབད་ <name>          <name> སྡེ་ཚན་གྱི་སྐོར་ལས་བརྡ་དོན་བཀྲམ་སྟོན་འབད།\n"
 "--ཐོ་ཡིག་ <name>             <name> སྡེ་ཚན་གྱི་དམིགས་གཏད་གེ་ར་རྩ་བསྐྲད་གཏང་།\n"
 "  --རིམ་སྒྲིག་ <name>          <name> སྡེ་ཚན་གྱི་དོན་ལུ་སྤེལ་མ་ཚུ་སྟོན་ དེ་ལས་\n"
@@ -5011,7 +5133,8 @@ msgstr ""
 "<name> འདི་ /ལ་སོགས་པ་/སྤེལ་མ་ཚུ་ནང་གི་མིང་འདི་ཨིན།\n"
 "<path> འདི་ གཞི་བསྟུན་འབད་ཡོད་པའི་མིང་འདི་ཨིན།\n"
 "<link> འདི་ འབྲེལ་ལམ་  /ལ་སོགས་པ་/སྤེལ་མ་ཚུ་/<name> ལུ་དཔག་མི་འདི་ཨིན།\n"
-"<priority> འདི་ཧྲིལ་ཨང་ཅིག་ཨིན། ཨང་གྲངས་མཐོ་ཤོས་དང་ཅིག་ཁར་འབད་མི་གདམ་ཁ་ཚུ་གདམ་ཁ་རྐྱབས་ཨིན།\n"
+"<priority> འདི་ཧྲིལ་ཨང་ཅིག་ཨིན། ཨང་གྲངས་མཐོ་ཤོས་དང་ཅིག་ཁར་འབད་མི་གདམ་ཁ་ཚུ་གདམ་ཁ་རྐྱབས་"
+"ཨིན།\n"
 "\n"
 "གདམ་ཁ་:\n"
 "  --གདམ་ལྡེ་སྣོད་ཐོ་ <directory>     སྤེལ་མའི་སྣོད་ཐོ་འདི་བསྒྱུར་བཅོས་འབད།\n"
@@ -5022,162 +5145,161 @@ msgstr ""
 "  --གྲོགས་རམ་                  འ་ནི་གྲོགས་རམ་འཕྲིན་དོན་འདི་སྟོན།\n"
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "བྲན་གཡོག་མིང་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
-
-#: scripts/update-alternatives.pl:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "--བཀྲམ་སྟོན་ --རིམ་སྒྲིག་ --གཞི་སྒྲིག་ --གཞི་བཙུགས་ --རྩ་བསྐྲད་ --གེ་ར་ --གེ་ར་-རྩ་བསྐྲད་གཏང་ ཡང་ན་ --རང་བཞིན་ དགོཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "ལག་ཐོག་ཟུར་རྟགས།"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "བྲན་གཡོག་ %s རྫུན་མ།"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "འབྲན་གཡོག་འབྲེལ་ལམ་འདི་འབྲེལ་ལམ་གཙོ་བོ་ %s དང་ལྕོགས་རང་ཐད།"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ།"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "འགྲུལ་ལམ་རྫུན་མ་ %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "གཙོ་རིམ་ %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "%s གི་དོན་ལུ་སྤེལ་མ་གིས་ འཚོལ་མ་འཐོབ་མི་ - %s ལུ་དཔགཔ་ཨིན། སྤེལ་མ་ཚུའི་ཐོ་ཡིག་ལས་རྩ་བསྐྲད་གཏང་དོ།"
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"%s གི་དོན་ལུ་སྤེལ་མ་གིས་ འཚོལ་མ་འཐོབ་མི་ - %s ལུ་དཔགཔ་ཨིན། སྤེལ་མ་ཚུའི་ཐོ་ཡིག་ལས་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ཚུ་མེད།"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - གནས་ཚད་འདི་ %s ཨིན།"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ %s ལུ་དཔགཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ཆད་ཨིན་པས།"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "འབྲེལ་ལམ་ལྷག་མ་བཏུབ་ - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - གཙོ་རིམ་ %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr "བྲན་གཡོག་ %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "ཐོན་རིམ་ཚུ་ཐོབ་ཚུགསཔ་མེད།"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "ད་ལྟོའི་ཐོན་རིམ་`དྲག་ཤོས་'འདི་ %s ཨིན།"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "བྲན་གཡོག་མིང་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"--བཀྲམ་སྟོན་ --རིམ་སྒྲིག་ --གཞི་སྒྲིག་ --གཞི་བཙུགས་ --རྩ་བསྐྲད་ --གེ་ར་ --གེ་ར་-རྩ་བསྐྲད་གཏང་ ཡང་"
+"ན་ --རང་བཞིན་ དགོཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s གི་རང་བཞིན་སེལ་འཐུ་གཞི་སྒྲིག་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s རྩ་བསྐྲད་གཏང་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5186,78 +5308,78 @@ msgstr ""
 "%s འདི་བསྐྱུར་བཅོས་འབད་ཡོདཔ་ཨིན།(ལག་ཐོག་ལས་ཡང་ན་ཡགི་ཚུགས་ཅིག་གིས་སྦེ་)\n"
 "ལག་དེབ་ཀྱི་དུས་མཐུན་ཚུ་ལུ་རྐྱངམ་ཅིག་སུ་ཡུ་ཅིང་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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 ""
 "%s གི་ཐོབ་ཚུགས་པའི་ཐོན་རིམ་ཚུ་ཞིབ་དཔྱད་འབད་དོ་  %s ནང་གི་འབྲེལ་ལམ་ཚུ་དུས་མཐུན་བཟོ་དོ...\n"
-"(རེ་འདོད་ཡོདཔ་ཨིན་པ་ཅིན་ ཁྱོད་ཀྱིས་ཁྱོད་རང་གིས་ཕི་ནང་ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་ལེགས་བཅོས་འབད་ཚུགས། -`man ln' བལྟ།)"
+"(རེ་འདོད་ཡོདཔ་ཨིན་པ་ཅིན་ ཁྱོད་ཀྱིས་ཁྱོད་རང་གིས་ཕི་ནང་ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་ལེགས་བཅོས་འབད་ཚུགས། -"
+"`man ln' བལྟ།)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s འབྲེལ་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s འདི་ %s ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་མིང་ %s འདི་རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s བྲན་གཡོག་བྲན་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
-msgstr "ལག་ཐོག་ལས་སེལ་འཐུ་འབད་ཡོད་པའི་སྤེལ་མ་ - སུ་ཡི་ཅིང་འདི་རང་བཞིན་ཐབས་ལམ་ལུ་རྩ་བསྐྲད་གཏང་དོ།"
+msgstr ""
+"ལག་ཐོག་ལས་སེལ་འཐུ་འབད་ཡོད་པའི་སྤེལ་མ་ - སུ་ཡི་ཅིང་འདི་རང་བཞིན་ཐབས་ལམ་ལུ་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ %s འདི་ཐོ་བཀོད་མ་འབད་བས། རྩ་བསྐྲད་མི་གཏང་།"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "ཕན་མེད་བྲན་གཡོག་འབྲེལ་ལམ་ %s (%s) བཏོན་བཀོག་དོ།"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s གི་རང་བཞིན་དུས་མཐུན་ཚུ་ལྕོགས་མིན་བཟོ་ཡོད། ཁོ་རང་རྐྱངམ་ཅིག་བཞག་པའི་སྐབས།"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "རང་བཞིན་ཚུ་ལུ་སླར་ལོག་ནིའི་དོན་ལས་  `དུས་མཐུན་-སྤེལ་མ་ --རང་བཞིན %s' ལག་ལེན་འཐབ།"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "ཧེ་མའི་ %s གི་འཐུས་ཤོར་འབྱུང་མི་དུས་མཐུན་ལས་སླར་གསོ་འབད་དོ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "འབྲི་ནིའི་དོན་ལུ་ %s ཁ་ཕྱེ་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "མཇུག་གི་ཐུམ་སྒྲིལ་ %s (%s) བྱིན་མིའདི་རྩ་ཙསྐྲད་གཏང་ཡོདཔ་ དེ་བཏོན་གཏངམ་ད་ལུ།"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5266,64 +5388,54 @@ msgstr ""
 "ཉེན་བརྡ་: %s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་ཨིན་དགོཔ་ཨིན་\n"
 "(ཡང་ན་གནས་པ་མིན་པ་) གང་ལྟར་ཡང་ རིཌི་ལིངཀ་ འཐུས་ཤོར་འབྱུང་ཡོདཔ: %s"
 
-#: scripts/update-alternatives.pl:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s འདི་གནས་པ་མེནམ་སྦེ་ངེས་ཏིག་བཟོ་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s ལུ་དཔག་མི་ %s (%s) འདི་བཀོག་བཞག་དོ།"
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) འདི་ %s ལུ་དཔག་ནིའི་དོན་ལས་དུས་མཐུན་བཟོ་དོ།"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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"
+"%s ཡང་ན གནས་པ་མིན་པ་ གི་བྲན་གཡོག་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་དགོ་ གང་ལྟར་ཡང་ ལྷག་ནིའི་འབྲེལ་ལམ་འཐུས་"
+"ཤོར་འབྱོང་ཡོདཔ: %s"
 
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s)    %s དང་ཅིག་ཁར་འོས་ལྡན་མེན་མི་ རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5332,7 +5444,7 @@ msgstr ""
 "%s བྱིན་མི་ལས་རིམ་ ༡ རྐྱངམ་ཅིག་ཡོད།\n"
 "(%s)། རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5345,105 +5457,140 @@ msgstr ""
 "   སེལ་འཐུ་   སྤེལ་མ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "སྔོན་སྒྲིག་[*]བཞག་ནིའི་དོན་ལས་ལོག་ལྡེ་ཨེབ་ ཡང་ན་སེལ་འཐུའི་ཨང་ཡིག་དཔར་རྐྱབས:"
 
-#: scripts/update-alternatives.pl:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' བྱིན་ནིའི་དོན་ལས་ `%s' ལག་ལེན་འཐབ་དོ།"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "སྤེལ་མ་ `%s' འཚོལ་མ་འཐོབ།"
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout འབྲིཝ་ད་འཛོལ་བ: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "དུས་མཐུན་-སྤེལ་མའི་ཡིག་སྣོད་ཚུ་ (%s) ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་བཀག་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) གི་དོན་ལུ་ %s ལྷགཔ་ད་འཛོལ་བ་ཡང་ན་ཨི་ཨོ་ཨེཕ།"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "འཚུབ་ཅན་དཀའ་ངལ: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: gzip -dc ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: bzip2 -dc ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: bzip2 %s ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "%.250s གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
 #~ msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་ནང་ན་ ` ' ཡོད།"
+
 #~ msgid "version a has bad syntax: %s\n"
 #~ msgstr "ཐོན་རིམ་ ཨེ་ ལུ་ཚིག་སྦྱོར་བྱང་ཉེས་འདུག་: %s\n"
+
 #~ msgid "%s: can't open %s: %s"
 #~ msgstr "%s: %s ཁ་ཕྱེ་མི་ཚུགས་: %s"
+
 #~ msgid "%s: can't create %s: %s"
 #~ msgstr "%s:  %s གསར་བསྐྲུན་འབད་མི་ཚུགས་: %s"
+
 #~ msgid "%s: error writing %s: %s"
 #~ msgstr "%s:  %s འབྲིཝ་ད་འཛོལ་བ་: %s"
+
 #~ msgid "%s: read %s: %s"
 #~ msgstr "%s: %s ལྷག: %s"
+
 #~ msgid "%s: close %s after read: %s"
 #~ msgstr "%s: ལྷག་པའི་ཤུལ་མ་ %s ཁ་བསྡམ་: %s"
+
 #~ msgid "%s: error closing %s: %s"
 #~ msgstr "%s: %s ཁ་བསྡམ་ནིའི་འཛོལ་བ: %s"
+
 #~ msgid "%s: can't backup old %s, giving up: %s"
 #~ msgstr "%s: %s རྙིངམ་རྒྱབ་ཐག་འབད་མི་ཚུགས། བཀོག་བཞག་དོ་: %s"
+
 #~ msgid "--admindir needs a directory argument"
 #~ msgstr "--བདག་སྐྱོང་སྣོད་ཐོ་ལུ་སྣོད་ཐོའི་སྒྲུབ་རྟགས་ཅིག་དགོ"
+
 #~ msgid "--remove needs a single argument"
 #~ msgstr "-- རྩ་བསྐྲད་གཏང་ནི་ལུ་སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོཔ་ཨིན།"
+
 #~ msgid "--truename needs a single argument"
 #~ msgstr "--མིང་བདེན་པ་ལུ་ སྒྲུབ་རྟགས་རྐྱང་པ་ཅིག་དགོ"
+
 #~ msgid "dpkg-divert: %s"
 #~ msgstr "ཌི་པི་ཀེ་ཇི་-ཁ་ཕྱོགས་སྒྱུར་བ: %s"
+
 #~ msgid "You need --help"
 #~ msgstr "ཁྱོད་ལུ་--གྲོགས་རམ་དགོ"
+
 #~ msgid "--remove needs one arguments"
 #~ msgstr "--རྩ་བསྐྲད་གཏང་ནི་ལུ་སྒྲུབ་རྟགས་གཅིག་དགོ"
+
 #~ msgid "dpkg-statoverride: %s"
 #~ msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
+
 #~ msgid "You need --help."
 #~ msgstr "ཁྱོད་ལུ་--གྲོགས་རམ་དགོ"
+
 #~ msgid "open %s: %s"
 #~ msgstr "%s ཁ་ཕྱེ: %s"
+
 #~ msgid "read %s: %s"
 #~ msgstr "%s ལྷག: %s"
+
 #~ msgid "create %s: %s"
 #~ msgstr "%s: %s གསར་བསྐྲུན་འབད།"
+
 #~ msgid "write %s: %s"
 #~ msgstr "%s: %s འབྲི།"
+
 #~ msgid "close %s: %s"
 #~ msgstr "%s ཁ་བསྡམ་དོ: %s"
+
 #~ msgid "install new %s: %s"
 #~ msgstr "%s གསརཔ་གཞི་བཙུགས་འབད་: %s"
+
 #~ msgid "%s: unlock %s: %s"
 #~ msgstr "%s:  %s ལྡེ་མིག་ཕྱེ་: %s"
+
 #~ msgid "%s: read %s: %d"
 #~ msgstr "%s: ལྷག་ %s: %d"
+
 #~ msgid "update-alternatives: %s"
 #~ msgstr "དུས་མཐུན་བཟོ་ནིའི་-སྤེལ་མ་ཚུ: %s"
+
 #~ msgid "--admindir needs a <directory> argument"
 #~ msgstr "--བདག་སྐྱོང་སྣོད་ཐོ་ལུ་  <directory>  སྒྲུབ་རྟགས་ཅིག་དགོཔ་ཨིན།"
+
 #~ msgid "failed to open %s: %s"
 #~ msgstr "%s ཁ་ཕྱེ་ནི་འཐུས་ཤོར་འབྱུང་ཡོད: %s"
+
 #~ msgid "unable to install %s as %s"
 #~ msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས།"
-
diff --git a/po/el.po b/po/el.po
index b8fe2421..ef2e8493 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -68,72 +68,57 @@ msgstr "Σφάλμα συστήματος αρ.%d"
 msgid "Signal no.%d"
 msgstr "Σήμα αρ.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: αποτυχία εκτέλεσης του gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: εσωτερικό σφάλμα gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: αποτυχία εκτέλεσης του gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: εσωτερικό σφάλμα bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: αποτυχία εκτέλεσης του gzip -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: αποσυμπίεση"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: εσωτερικό σφάλμα gzipr: ανάγνωση: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: εσωτερικό σφάλμα gzip: εγγραφή: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: εσωτερικό σφάλμα gzip: ανάγνωση(%i) != εγγραφή(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: αποτυχία εκτέλεσης του gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: εσωτερικό σφάλμα bzip2: ανάγνωση: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: εσωτερικό σφάλμα bzip2: εγγραφή: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: εσωτερικό σφάλμα bzip2: ανάγνωση(%i) != εγγραφή(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: αποτυχία εκτέλεσης του bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: συμπίεση"
@@ -179,7 +164,7 @@ msgstr "αδύνατη η σάρωση του καταλόγου ενημερώ
 msgid "failed to remove incorporated update file %.255s"
 msgstr "αποτυχία αφαίρεσης του συγχωνευμένου αρχείου ενημέρωσης %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "αδύνατη η δημιουργία `%.255s'"
@@ -922,30 +907,30 @@ msgstr "Λείπει η παρένθεση τερματισμού από τη δ
 msgid "failed to realloc for variable buffer"
 msgstr "αποτυχία επανεκχώρησης μνήμης για το ενδιάμεσο μεταβλητών"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  ήδη εξαφανίστηκε !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "σφάλμα από την ανάγνωση της σωλήνωσης του dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "σφάλμα ορισμού της χρονοσήμανσης του `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "σφάλμα ορισμού  των δικαιωμάτων του `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -954,17 +939,17 @@ msgstr ""
 "προσπάθεια αντικατάστασης του `%.250s', που είναι παράκαμψη του `%.250s'%.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (πακέτο: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 "αδύνατη η εύρεση κατάστασης του `%.255s' (που προσπάθησα να εγκαταστήσω)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -973,29 +958,29 @@ msgstr ""
 "αδύνατος ο καθαρισμός της σαβούρας γύρω από το `%.255s' πριν την εγκατάσταση "
 "άλλης έκδοσης"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "αδύνατη η εύρεση κατάστασης του επαναφερθέντος `%.255s' προτού εγκατασταθεί "
 "νέα έκδοση"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "το αρχείο περιείχε το αντικείμενο `%.255s' άγνωστου τύπου 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Αντικατάσταση αρχείων στο παλιό πακέτο %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Αντικατάσταση από αρχεία στο εγκατεστημένο πακέτο %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -1003,91 +988,91 @@ msgstr ""
 "προσπάθεια αντικατάστασης του καταλόγου `%.250s' στο πακέτο %.250s με μη "
 "κατάλογο"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "προσπάθεια αντικατάστασης του `%.250s', που είναι επίσης στο πακέτο %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "αναγνώστηκε και αγνοήθηκε το αρχείο `%.250s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb κατά το `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "σφάλμα κλεισίματος/εγγραφής `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "σφάλμα δημιουργίας σωλήνωσης `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "σφάλμα κατά τη δημιουργία συσκευής `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "σφάλμα δημιουργίας συνδέσμου `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "σφάλμα δημιουργίας συμβολικού δεσμού `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "σφάλμα ρύθμισης ιδιοκτησίας του `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "σφάλμα κατά τη δημιουργία καταλόγου `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "αδύνατη η μετακίνηση του `%.255s' κατά μέρους για εγκατάσταση νέας έκδοσης"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "αδύνατη η ανάγνωση δεσμού `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "αδύνατη η αλλαγή ιδιοκτήτη του εφεδρικού δεσμού για το `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "αδυναμία δημιουργίας εφεδρικού δεσμού του `%.255s' πριν την εγκατάσταση νέας "
 "έκδοσης"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1097,7 +1082,7 @@ msgstr ""
 "εξάρτησης:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1106,7 +1091,7 @@ msgstr ""
 "dpkg: προειδοποίηση - θεωρώντας την απορρύθμιση του βασικού \n"
 " πακέτου %s, για ενεργοποίηση αφαίρεσης του %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1115,7 +1100,7 @@ msgstr ""
 "dpkg: όχι,το %s είναι βασικό, δε θα απορρυθμιστεί\n"
 " για να ενεργοποιηθεί η αφαίρεση του %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1124,26 +1109,26 @@ msgstr ""
 "dpkg: δε γίνεται η αφαίρεση %s (το --auto-deconfigure θα βοηθήσει):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: θεωρώντας την αφαίρεση του %s για χάρη του %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "το %s δεν είναι κατάλληλα εγκατεστημένο - αγνοώντας όλες τις εξαρτήσεις "
 "του.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: η αφαίρεση του %s μπορεί να δημιουργήσει προβλήματα καθώς παρέχει %"
 "s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1151,17 +1136,22 @@ msgid ""
 msgstr ""
 "dpkg: το πακέτο %s απαιτεί επανεγκατάσταση αλλά θα αφαιρεθεί όπως ζητήσατε.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: το πακέτο %s απαιτεί επανεγκατάσταση, δε θα αφαιρεθεί.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: θα μετακινηθεί το %s για χάρη του %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1170,73 +1160,73 @@ msgstr ""
 "dpkg: σχετικά με το %s που περιέχει το %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "συγκρουόμενα πακέτα - δε γίνεται εγκατάσταση %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: προειδοποίηση - θα αγνοηθεί η σύγκρουση, μπορεί να συνεχίσει !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive χρειάζεται τουλάχιστον ένα όρισμα μονοπατιού"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "αδύνατη η εκτέλεση της find με --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "αδύνατο το άνοιγμα της σωλήνωσης της find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "αδύνατη η ανάγνωση από τη σωλήνωση της find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "αδύνατο το κλείσιμο της σωλήνωσης της find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "η εκτέλεση της find με --recursive επέστρεψε απρόσμενο σφάλμα %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "έγινε αναζήτηση, δε βρέθηκε κανένα πακέτα (αρχεία που ταιριάζουν *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s χρειάζεται τουλάχιστον ένα αρχείο πακέτου ως παράμετρο"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Επιλογή προηγούμενου απεπιλεγμένου πακέτου %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Παράλειψη απόεπιλεγμένου πακέτου %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Έκδοση %.250s του %.250s είναι ήδη εγκατεστημένη, παράβλεψη.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - προειδοποίηση: υποβάθμιση του %.250s από %.250s σε %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1621,110 +1611,117 @@ msgstr "Τέλος αρχείου στην stdin κατά την προτροπ
 msgid "unable to check for existence of `%.250s'"
 msgstr "αδύνατος ο έλεγχος ύπαρξης του `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " εξαρτάται από "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " προεξαρτάται από "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " συστήνει "
 
-#: src/depcon.c:156
-msgid " breaks "
-msgstr ""
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " προτείνει "
 
-#: src/depcon.c:157
-msgid " conflicts with "
-msgstr " συγκρούεται με "
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
+msgstr "%s (υποδιεργασία): %s\n"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " προτείνει "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " συγκρούεται με "
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " επαυξάνει "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s πρόκειται να αφαιρεθεί.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s πρόκειται να απορρυθμιστεί.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s πρόκειται να εγκατασταθεί, αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s είναι εγκατεστημένο, αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s είναι αποσυμπιεσμένο αλλά δεν έχει ρυθμιστεί.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s είναι αποσυμπιεσμένο αλλά είναι έκδοση %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s τελευταία ρυθμισμένη έκδοση είναι %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s είναι %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να αφαιρεθεί.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να απορρυθμιστεί.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s παρέχει %.250s αλλά είναι %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s δεν έχει εγκατασταθεί.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (έκδοση %.250s) πρόκειται να εγκατασταθεί.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (έκδοση %.250s) είναι %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s παρέχει %.250s και είναι προς εγκατάσταση.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s παρέχει %.250s και είναι %s.\n"
@@ -2551,7 +2548,7 @@ msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "χρειάζεται μια επιλογή ενέργειας"
@@ -2630,6 +2627,10 @@ msgstr "Το πακέτο `%s' δεν είναι εγκατεστημένο.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "Το πακέτο `%s' δεν είναι εγκατεστημένο.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " εξαρτάται από "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ". Ωστόσο:\n"
@@ -2830,7 +2831,7 @@ msgstr "αδύνατη η εκτέλεση της fstat στο αρχείο τμ
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: %s: προειδοποίηση - το αρχείο ρυθμίσεων `%.250s' δεν είναι κοινό "
 "αρχείο ή δεσμός (= `%s')\n"
@@ -3314,25 +3315,30 @@ msgstr "η --forget-old-unavail δεν παίρνει ορίσματα"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - σφάλμα: το %s (`%s') δεν περιέχει ψηφία\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "η --build παίρνει το πολύ δύο ορίσματα"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "αδύνατος ο έλεγχος ύπαρξης της αρχειοθήκης `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "ο προορισμός είναι κατάλογος - αδύνατη η παράλειψη ελέγχου αρχείου control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3342,45 +3348,45 @@ msgstr ""
 "control.\n"
 "dpkg-deb: κατασκευή αγνώστου πακέτου `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "το όνομα του αρχείου περιέχει χαρακτήρες που δεν είναι πεζοί αλφαριθμητικοί "
 "ή `-+'."
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "προειδοποίηση, το `%s' περιέχει ορισμένη από το χρήστη τιμή Priority `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "προειδοποίηση, το `%s' περιέχει ορισμένο από το χρήστη πεδίο `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d σφάλματα στο αρχείο ελέγχου (control)"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: δημιουργία πακέτου `%s' στο `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "ο κατάλογος control έχει λάθος άδειες %03lo (χρειάζεται >=0755 και <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "το σενάριο `%.50s' δεν είναι απλό αρχείο ή δεσμός"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3388,16 +3394,16 @@ msgid ""
 msgstr ""
 "το σενάριο `%.50s' έχει λάθος άδειες %03lo (χρειάζεται >=0755 και <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "αδύνατη η εύρεση της κατάστασης (stat) του σεναρίου `%.50s'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "κενή συμβολοσειρά από την fgets κατά την ανάγνωση αρχείων ρυθμίσεων"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3405,120 +3411,120 @@ msgstr ""
 "προειδοποίηση, το όνομα του αρχείου ρυθμίσεων `%.50s...' είναι πολύ μεγάλο,\n"
 " ή λείπει ο τελικός χαρακτήρας newline\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, fuzzy, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "προειδοποίηση, το αρχείο ρυθμίσεων `%s' δεν είναι κοινό αρχείο\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "το conffile `%.250s' δεν εμφανίζεται στο πακέτο"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "αδύνατη η εύρεση της κατάστασης (stat) του αρχείου ρυθμίσεων `%.50s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "προειδοποίηση, το αρχείο ρυθμίσεων `%s' δεν είναι κοινό αρχείο\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "σφάλμα ανάγνωσης αρχείου conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "σφάλμα ανοίγματος αρχείου conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 "dpkg-deb: παραλείπονται %d προειδοποιητικά μηνύματα για τα αρχεία control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "αδύνατη η αποδέσμευση `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "αποτυχία αλλαγής καταλόγου (chdir) στο `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "αποτυχία αλλαγής καταλόγου (chdir) στο .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "απέτυχε η εκτέλεση της εντολής tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "απέτυχε η δημιουργία του προσωρινού αρχείου tmpfile (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "απέτυχε το άνοιγμα του προσωρινού αρχείου tmpfile (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "απέτυχε η διαγραφή του προσωρινού αρχείου tmpfile (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "έλεγχος"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "απέτυχε η fstat στο προσωρινό αρχείο tmpfile (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "απέτυχε η επαναφορά στην αρχή στο προσωρινό αρχείο tmpfile (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "απέτυχε η δημιουργία του προσωρινού αρχείου tmpfile (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "απέτυχε το άνοιγμα του προσωρινού αρχείου tmpfile (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "απέτυχε η διαγραφή του προσωρινού αρχείου tmpfile (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "δεδομένα"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "απέτυχε η εκτέλεση της find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "απέτυχε η εγγραφή του ονόματος αρχείου στη σωλήνωση της tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "εσωτερικό σφάλμα, άγνωστο compress_type '%i'!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "απέτυχε η επαναφορά στην αρχή στο προσωρινό αρχείο tmpfile (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (δεδομένα)"
 
@@ -3602,22 +3608,22 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "μη κατανοητή η έκδοση της αρχειοθήκης %.250s, χρειάζεστε νεώτερο dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "παραλείφθηκε μέλος δεδομένων από %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "το αρχείο `%.250s' περιέχει μη κατανοητά δεδομένα %.*s, εγκατάλειψη"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "το αρχείο `%.250s' περιέχει δύο μέλη control, εγκατάλειψη"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3626,17 +3632,17 @@ msgstr ""
 " νέο πακέτο debian, έκδοση %s.\n"
 " μέγεθος %ld bytes: αρχειοθήκη control = %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 #, fuzzy
 msgid "control information length"
 msgstr "μήκος πληροφοριών ctrl"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, fuzzy, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "η αρχειοθήκη έχει κακοδιατυπωμένο ctrl len `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3645,17 +3651,17 @@ msgstr ""
 " παλιό πακέτο debian, έκδοση %s.\n"
 " μέγεθος %ld bytes: αρχειοθήκη control = %zi bytes, κυρίως αρχειοθήκη= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 #, fuzzy
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Σφάλμα εκχώρησης μνήμης για το cfgfilename"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 #, fuzzy
 msgid "control area"
 msgstr "ctrlarea"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3664,66 +3670,66 @@ msgstr ""
 "dpkg-deb: το αρχείο φαίνεται ως αρχειοθήκη που πιθανόν να έχει καταστραφεί\n"
 "dpkg-deb:    από μεταφόρτωση σε κατάσταση ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "το `%.255s' δεν είναι μια αρχειοθήκη debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 #, fuzzy
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "απέτυχε η fdopen p 1 κατά την επικόλληση"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "απέτυχε η εγγραφή στο gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "απέτυχε το κλείσιμο του gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "απέτυχε η κλήση συστήματος της lseek στην αρχειοθήκη"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "απέτυχε η εγγραφή στη σωλήνωση της copy"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "απέτυχε το κλείσιμο της σωλήνωσης της copy"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "απέτυχε η δημιουργία καταλόγου"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "απέτυχε η αλλαγή καταλόγου (chdir)"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "απέτυχε η εκτέλεση της tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3732,12 +3738,12 @@ msgstr ""
 "η --%s χρειάζεται έναν κατάλογο στόχο.\n"
 "Ίσως πρέπει να χρησιμοποιήσετε dpkg --install ;"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "η --%s παίρνει το πολύ δύο ορίσματα (.deb και κατάλογο)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "η --%s παίρνει μόνο ένα όρισμα (όνομα αρχείου .deb)"
@@ -3888,7 +3894,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3910,7 +3917,7 @@ msgstr ""
 "*.deb. Πληκτρολογήστε dpkg --help για βοήθεια σχετικά με εγκατάσταση και\n"
 "απεγκατάσταση πακέτων."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
@@ -4285,9 +4292,9 @@ msgstr "το αρχείο πηγής `%.250s' δεν είναι κοινό αρ
 msgid "unable to exec mksplit"
 msgstr "αδύνατη η εκτέλεση της mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr " έκδοση υποδομής αρχειοθήκης πακέτου"
@@ -4298,9 +4305,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 #, fuzzy
 msgid ""
 "\n"
@@ -4351,7 +4358,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, fuzzy, perl-format
 msgid "unable to open %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
@@ -4378,7 +4385,7 @@ msgid "unable to close %s after read: %s"
 msgstr "αποτυχία κλεισίματος μετά την ανάγνωση: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
@@ -4398,19 +4405,19 @@ msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: αποτυχία εκτέλεσης του gzip %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4440,93 +4447,93 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, fuzzy, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, fuzzy, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s χρειάζεται τουλάχιστον ένα όρισμα ονόματος πακέτου"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Το πακέτο `%s' δεν περιέχει κανένα αρχείο (!)\n"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "άγνωστη επιλογή --%s"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, fuzzy, perl-format
 msgid "cannot open diversions: %s"
 msgstr "αποτυχία κατά το άνοιγμα του αρχείου diversions"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 #, fuzzy
 msgid "missing altname"
 msgstr "λείπει %s"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 #, fuzzy
 msgid "missing package"
 msgstr "λείπει %s"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, fuzzy, perl-format
 msgid "--%s needs a single argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, fuzzy, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "αδύνατη η εύρεση της κατάστασης (stat) του αρχείου ρυθμίσεων `%.50s'"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, fuzzy, perl-format
 msgid "Leaving `%s'"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4534,7 +4541,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4542,97 +4549,97 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, fuzzy, perl-format
 msgid "Removing `%s'"
 msgstr "Αφαίρεση του %s ...\n"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, fuzzy, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "%s: εσωτερικό σφάλμα gzipr: ανάγνωση: `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, fuzzy, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "αδύνατη η εύρεση κατάστασης (stat) του `%.255s' (στο `%.255s')"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, fuzzy, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "αδύνατη η εύρεση κατάστασης (stat) του `%.255s' (στο `%.255s')"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, fuzzy, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία μετονομασίας του `%.250s' σε `%.250s': %"
 "s\n"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "σφάλμα ανάγνωσης στο αρχείο diversions [i]"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "παράκαμψη από %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "παράκαμψη από %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "σφάλμα ανάγνωσης στο αρχείο diversions [i]"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: εσωτερικό σφάλμα gzip: εγγραφή: `%s'"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4652,108 +4659,108 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 #, fuzzy
 msgid "aborting"
 msgstr "προειδοποίηση"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, fuzzy, perl-format
 msgid "failed to chown %s: %s"
 msgstr "αποτυχία εκτέλεσης %s (%.250s)"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, fuzzy, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "αδύνατη η εκτέλεση του %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, fuzzy, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, fuzzy, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, fuzzy, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "σφάλμα κατά τη δημιουργία συσκευής `%.255s'"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4944,14 +4951,14 @@ msgstr "αδύνατη η εκτέλεση %s"
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4972,7 +4979,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4992,292 +4999,291 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, fuzzy, perl-format
-msgid "unknown argument `%s'"
-msgstr "άγνωστος τύπος συμπίεσης '%s'!"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr ""
-
-#: scripts/update-alternatives.pl:136
-#, fuzzy, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
-
-#: scripts/update-alternatives.pl:141
-#, fuzzy, perl-format
-msgid "--%s needs <name>"
-msgstr "η --%s δεν παίρνει ορίσματα"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr ""
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, fuzzy, perl-format
 msgid "duplicate slave %s"
 msgstr "διπλή τιμή για το πεδίο `%s'"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, fuzzy, perl-format
 msgid "duplicate slave link %s"
 msgstr "διπλή τιμή για το πεδίο `%s'"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 #, fuzzy
 msgid "No versions available."
 msgstr "(χωρίς διαθέσιμη περιγραφή)"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, fuzzy, perl-format
+msgid "unknown argument `%s'"
+msgstr "άγνωστος τύπος συμπίεσης '%s'!"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
+
+#: scripts/update-alternatives.pl:261
+#, fuzzy, perl-format
+msgid "--%s needs <name>"
+msgstr "η --%s δεν παίρνει ορίσματα"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr ""
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "αδύνατη η εκτέλεση νέου %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5286,46 +5292,55 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "σφάλμα ανάγνωσης του %s από %.255s"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - αγνοείται newline μετά το %.250s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: αποτυχία εκτέλεσης του gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: αποτυχία εκτέλεσης του gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: αποτυχία εκτέλεσης του bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "αδύνατη η δημιουργία %.250s"
 
diff --git a/po/es.po b/po/es.po
index 4fea8d99..5f4a9014 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-09-14 02:25+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -61,72 +61,57 @@ msgstr "Error del sistema n
 msgid "Signal no.%d"
 msgstr "Señal nº%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: fallo al ejecutar gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: error interno de gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: fallo al ejecutar gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: error interno de bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: fallo al ejecutar bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompresión"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: error interno de gzip: lectura: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: error interno de gzip: escritura `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: error interno de gzip: lectura(%i) != escritura(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: fallo al ejecutar gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: error interno de bzip2: lectura: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: error interno de bzip2: escritura `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: error interno de bzip2: lectura(%i) != escritura(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: fallo al ejecutar bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresión"
@@ -175,7 +160,7 @@ msgstr "no se puede examinar el directorio de actualizaciones `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "fallo al borrar el fichero de actualización incorporado %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "no se puede crear `%.255s'"
@@ -933,30 +918,30 @@ msgstr "Falta una llave de cierre en el formato\n"
 msgid "failed to realloc for variable buffer"
 msgstr "fallo al efectuar `realloc' para un búfer de una variable"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  ¡ya ha desaparecido!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "error al leer de una tubería de dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "error al establecer las fechas de `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error al establecer el propietario de `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error al establecer los permisos de `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -965,18 +950,18 @@ msgstr ""
 "intentando sobreescribir `%.250s', que es la versión desviada de `"
 "%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paquete: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 "no se puede efectuar `stat' sobre `%.255s' (que es lo que se iba a instalar)"
 
 # Tinguaro puso "deshacer el lío". Se admiten ideas. sv
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -985,29 +970,29 @@ msgstr ""
 "no se puede arreglar el desaguisado de `%.255s' antes de instalar otra "
 "versión"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "no se puede efectuar `stat' sobre el `%.255s' restablecido antes\n"
 "de instalar otra versión"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "el archivo contiene el objeto `%.255s' de tipo 0x%x desconocido"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Reemplazando ficheros del paquete antiguo %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Reemplazado por ficheros en el paquete instalado %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -1015,93 +1000,93 @@ msgstr ""
 "intentando sobreescribir el directorio `%.250s' del paquete %.250s con un\n"
 "no directorio"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "intentando sobreescribir `%.250s', que está también en el paquete %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "fichero reemplazado por consumo `%.255s'"
 
 # FIXME: It is not clear enough what the `%.255s' is about. sv
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "error en dpkg-deb durante `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error al cerrar/escribir `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error al crear la tubería `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error al crear el dispositivo `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error al crear el enlace duro `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error al crear el enlace simbólico `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error al establecer la propiedad del enlace simbólico `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error al crear el directorio `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "no se puede apartar `%.255s' para instalar una nueva versión"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "no se puede leer el enlace `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "no se puede respaldar enlace simbólico para `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "no se puede efectuar `chown' sobre el enlace simbólico de respaldo de `"
 "%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "no se puede crear un enlace de seguridad de `%.255s' antes de instalar\n"
 "la nueva versión"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "no se puede instalar una nueva versión de `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1111,7 +1096,7 @@ msgstr ""
 "al desinstalar %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1120,7 +1105,7 @@ msgstr ""
 "dpkg: aviso - considerando la desconfiguración del paquete\n"
 " esencial %s, para permitir la desinstalación de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1129,7 +1114,7 @@ msgstr ""
 "dpkg: no, %s es esencial, no será desconfigurado\n"
 " para permitir la desinstalación de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1138,12 +1123,12 @@ msgstr ""
 "dpkg: no, no se puede desinstalar %s (--auto-deconfigure ayudará):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: considerando desinstalar %s en favor de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
@@ -1151,12 +1136,12 @@ msgstr ""
 " dependencia de él.\n"
 
 # provee/proporciona. ¿cuál es la diferencia? sv
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: puede haber problemas al desinstalar %s, ya que provee %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1165,17 +1150,22 @@ msgstr ""
 "dpkg: el paquete %s requiere ser reinstalado, pero se desinstalará de todas\n"
 " formas tal como se solicita.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: el paquete %s requiere ser reinstalado, no se desinstalará.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: sí, se desinstalará %s en favor de %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1184,65 +1174,65 @@ msgstr ""
 "dpkg: acerca de %s que contiene %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquetes en conflicto - no se instalará %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 "dpkg: aviso - no se tiene en cuenta el conflicto,\n"
 " ¡se puede proceder de todas maneras!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necesita al menos una ruta como argumento"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "fallo al ejecutar `find' para --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "fallo al efectuar `fdopen' en la tubería de find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "error al leer la tubería de find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "error al cerrar la tubería de find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "La búsqueda usando --recursive devolvió el error no manejado %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "se buscó, pero no se encontraron paquetes (ficheros que encajen con *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s necesita al menos un archivo de paquete como argumento"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Seleccionando el paquete %s previamente no seleccionado.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Omitiendo el paquete no seleccionado %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versión %.250s de %.250s ya instalada, omitiendo.\n"
@@ -1254,12 +1244,12 @@ msgstr "Versi
 # buscar una que sea mínimamente razonable, aunque no sea tan común.
 # El prefijo "des" nos ayuda en este caso a construir
 # una palabra que significa lo contrario que actualizar. sv
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - atención: desactualizando %.250s de %.250s a %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1646,110 +1636,117 @@ msgstr "EOF en la entrada est
 msgid "unable to check for existence of `%.250s'"
 msgstr "no se puede comprobar la existencia de `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depende de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " predepende de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomienda "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " sugiere "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " rompe "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " entra en conflicto con "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " sugiere "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " mejora "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va a ser desinstalado.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va a ser desconfigurado.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s va a ser instalado, pero tiene versión %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero tiene versión %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempaquetado, pero no ha sido configurado.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero tiene versión %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la última versión configurada de %.250s es la %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s es %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s provee %.250s pero va a ser desinstalado.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s provee %.250s pero va a ser desconfigurado.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proporciona %.250s pero es %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no está instalado.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) va a ser instalado.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versión %.250s) es %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s proporciona %.250s y va a ser instalado.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s proporciona %.250s y es %s.\n"
@@ -2695,7 +2692,7 @@ msgstr "no se pudo abrir `%i' para un flujo"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
@@ -2773,6 +2770,10 @@ msgstr "  El paquete `%s' que provee %s no est
 msgid "  Package %s is not installed.\n"
 msgstr "  El paquete `%s' no está instalado.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depende de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; sin embargo:\n"
@@ -2972,10 +2973,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "no se puede efectuar `stat' otro fichero nuevo `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: atención - el fichero antiguo `%.250s' es el mismo que varios de los  "
 "nuevos ficheros (tanto `%.250s' como `%.250s')"
@@ -3465,27 +3466,32 @@ msgstr "--forget-old-unavail no lleva par
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - error: %s (`%s') no contiene ningún dígito\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build necesita un directorio como parámetro"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build lleva a lo sumo dos parámetros"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "no se puede comprobar la existencia del archivo `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "el objetivo es un directorio - no se puede omitir la comprobación del "
 "fichero\n"
 "de control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3494,46 +3500,46 @@ msgstr ""
 "dpkg-deb: atención, no se comprueba el contenido del área de control.\n"
 "dpkg-deb: se construye un paquete desconocido en `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "el nombre del paquete tiene caracteres que no son minúsculas, alfanuméricos\n"
 "o `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "atención, `%s' contiene un valor Priority `%s' definido por el usuario\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "atención, `%s' contiene un campo `%s' definido por el usuario\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d errores en el fichero de control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construyendo el paquete `%s' en `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "el directorio de control tiene permisos erróneos %03lo\n"
 "(debe ser >=0755 y <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "el script `%.50s' no es un fichero normal o un enlace simbólico"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3542,16 +3548,16 @@ msgstr ""
 "el script `%.50s' tiene permisos erróneos %03lo\n"
 "(debe ser >=0555 y <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "no se puede efectuar `stat' sobre el script `%.50s'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "cadena vacía de fgets al leer conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3559,121 +3565,121 @@ msgstr ""
 "atención, el nombre de conffile `%.50s...' es demasiado largo, o le falta\n"
 "el carácter de nueva línea final\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 "atención, el conffile `%s' contiene espacios en blanco al final de linea\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "el conffile `%.250s' no aparece dentro del paquete"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "no se puede efectuar `stat' sobre el conffile `%.250s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "atención, el conffile `%s' no es un fichero normal\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "error al leer el fichero de conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "error al abrir el fichero de conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 "dpkg-deb: no se tendrán en cuenta %d avisos sobre los ficheros de control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "no se puede deshacer el búfer `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "fallo al cambiar al directorio `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "fallo al cambiar al directorio .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "fallo al ejecutar tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "fallo al crear un fichero temporal (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "fallo al abrir un fichero temporal (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "fallo al borrar con unlink el fichero temporal (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "fallo al efectuar `fstat' sobre el fichero temporal (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "fallo al efectuar `rewind' sobre el fichero temporal (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "fallo al crear el fichero temporal (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "fallo al abrir el fichero temporal (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "fallo al borrar el fichero temporal (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "fallo al ejecutar find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "fallo al escribir el nombre del fichero en la tubería de tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Error interno, ¡tipo de compresión `%i' desconocido!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "fallo al efectuar `rewind' sobre el fichero temporal (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (datos)"
 
@@ -3755,22 +3761,22 @@ msgstr ""
 "no se entiende la versión %.250s del archivo, consiga un\n"
 "dpkg-deb más moderno"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "se salta el elemento de %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "el fichero `%.250s' contiene un miembro %.*s ininteligible, abandono"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "el fichero `%.250s' contiene dos miembros de control, abandono"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3779,17 +3785,17 @@ msgstr ""
 " paquete debian nuevo, versión %s.\n"
 " tamaño %ld bytes: archivo de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "longitud de la información de control"
 
 # FIXME: ctrl is the same as `control'? sv
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "el archivo tiene una longitud de control mal formada `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3798,15 +3804,15 @@ msgstr ""
 " paquete debian antiguo, versión %s.\n"
 " tamaño %ld bytes: archivo de control= %zi, archivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "error al asignar memoria para la variable `ctralarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "área de control"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3815,66 +3821,66 @@ msgstr ""
 "dpkg-deb: el fichero tiene pinta de ser un archivo que ha sido dañado\n"
 "dpkg-deb     al ser transferido en modo ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' no es un archivo en formato debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "se produjo un fallo al obtener la posición actual en el fichero"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "se produjo un fallo al guardar la posición actual en el fichero"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "fallo al efectuar `fdopen' sobre el descriptor `1' en `paste'"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "fallo al escribir a gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "fallo al cerrar gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 "fallo en la llamada al sistema lseek en los ficheros porción de archivo"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "fallo al escribir a la tubería en la copia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "fallo al cerrar la tubería en la copia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "fallo al crear directorio"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "fallo al cambiar a un directorio después de crearlo"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "fallo al cambiar al directorio"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "fallo al ejecutar tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necesita un nombre de fichero .deb como argumento"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3883,12 +3889,12 @@ msgstr ""
 "--%s necesita un directorio de destino.\n"
 "¿A lo mejor lo que quiere hacer es dpkg --install?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s toma como mucho dos argumentos (.deb y directorio)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma solamente un argumento (fichero .deb)"
@@ -4047,7 +4053,7 @@ msgstr ""
 "<ccampo> es el nombre de un campo en el fichero de `control' principal.\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -4058,7 +4064,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opciones:\n"
@@ -4097,7 +4104,7 @@ msgstr ""
 "deb;\n"
 "Escriba dpkg --help para obtener ayuda sobre instalar y desinstalar paquetes."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "¡tipo de compresión `%s' desconocido!"
@@ -4490,9 +4497,9 @@ msgstr "el fichero fuente `%.250s' no es un fichero normal"
 msgid "unable to exec mksplit"
 msgstr "no se puede ejecutar mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versión %s.\n"
@@ -4505,9 +4512,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4562,7 +4569,7 @@ msgid "try deleting %s"
 msgstr "intente borrar %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "no se puede abrir %s: %s"
@@ -4589,7 +4596,7 @@ msgid "unable to close %s after read: %s"
 msgstr "fallo al cerrar %s después de la lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no se puede cerrar %s: %s"
@@ -4609,12 +4616,12 @@ msgstr "no se puede instalar `%s'; se dejar
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: fallo al desbloquear %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "No puede obtenerse valor ENOENT de %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4624,7 +4631,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4682,89 +4689,89 @@ msgstr ""
 "Los scripts preinst o postrm de los paquetes deberían siempre especificar\n"
 "--package y --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "se han especificado dos modos: %s y --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s necesita un parámetro indicando a donde desviar"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "«divert-to» no puede tener saltos de línea"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s necesita un nombre de paquete como argumento"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "el nombre de paquete no puede tener saltos de línea"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesita un directorio como parámetro"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "fallo al abrir fichero de desvíos: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "falta el nombre alternativo"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "falta el paquete"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s necesita un parámetro"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "el nombre de fichero «%s» no es una ubicación absoluta"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "el nombre de fichero no puede contener caracteres de línea"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "No se pueden desviar directorios"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Dejando `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' entra en conflicto con `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Añadiendo `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4775,7 +4782,7 @@ msgstr ""
 "  cuando se eliminaba `%s'\n"
 "  se encontró `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4786,38 +4793,38 @@ msgstr ""
 "  cuando se eliminaba `%s'\n"
 "  se encontró `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Eliminando `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "No hay un desvío para `%s', no se ha eliminado ninguno"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "error interno - modo inválido `%s'"
 
 # FIXME: Traducción de 'stat'
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "no se puede efectuar `stat' sobre el nombre antiguo `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "no se puede efectuar `stat' sobre el nombre nuevo `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "error al comprobar `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4826,52 +4833,52 @@ msgstr ""
 "renombrar obliga a sobreescribir `%s' con\n"
 "  un fichero distinto `%s', no está permitido."
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: eliminado enlace antiguo duplicado `%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: se renombró `%s' a `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creado diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escribiendo diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "cerrando diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "eliminar diversions-old antiguo: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "«diversions-old» nuevo creado: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalados nuevos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "error interno: %s dañado: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4881,7 +4888,7 @@ msgstr ""
 
 # NOTE: `override' se traduce como redefinición porque no se "anula" o
 # "hace caso omiso" de los valores de dpkg, se reemplazan por otros.
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4920,106 +4927,106 @@ msgstr ""
 "  --help                    muestra este mensaje de ayuda.\n"
 "  --version                 muestra la versión.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "no se ha especificado un modo"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add necesita cuatro parámetros"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "usuario inválido `%s'"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "usuario inexistente `%s'"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "grupo inválido `%s'"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "group no existente `%s'"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "modo inválido `%s'"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "omitiendo «/» final"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Ya existe una redefinición para «%s», "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "pero se ha especificado --force con lo que se ignorará."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "cancelando"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "aviso: se ha utilizado --update pero no existe %s"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "fallo al cambiar el usuario de %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "fallo al cambiar los permisos de %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "No existe una redefinición."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "aviso: es inútil utilizar --update con --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "fallo al abrir el fichero statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Abortando porque existen multiples redefiniciones para «%s»"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "fallo al abrir el nuevo fichero statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "error al eliminar statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "error al crear el nuevo fichero statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "error al instalar el nuevo statoverride: %s"
@@ -5254,7 +5261,7 @@ msgstr "no se puede leer %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5264,8 +5271,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5285,7 +5292,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5344,95 +5351,36 @@ msgstr ""
 "  --help                   muestra este mensaje de ayuda.\n"
 "  --version                muestra la versión.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "argumento `%s' desconocido"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install necesita <enlace> <nombre> <ruta> <prioridad>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "el valor de prioridad debe ser un entero"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s necesita <nombre> <ruta>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s necesita <nombre>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave necesita <enlace> <nombre> <ruta>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "el nombre esclavo %s está duplicado"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "el enlace esclavo %s está duplicado"
-
-#: scripts/update-alternatives.pl:164
-#, 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:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"necesito --display, --config, --set, --install, --remove, --all, --remove-"
-"all o --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "sólo se puede utilizar --slave con --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "esclavo duplicado `%s'"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "el enlace esclavo es el mismo que el principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "enlace esclavo duplicado `%s'"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "ruta duplicada %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioridad %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5441,66 +5389,124 @@ msgstr ""
 "La alternativa para %s apunta a %s, pero no se encontró. Eliminándolo de la "
 "lista de alternativas."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hay alternativas para %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - el estado es %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " el enlace apunta actualmente a %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " no hay enlace"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " no se puede leer el enlace - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridad %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " esclavo %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "No hay ninguna versión disponible."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Actualmente la «mejor» versión es %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "argumento `%s' desconocido"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install necesita <enlace> <nombre> <ruta> <prioridad>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "el valor de prioridad debe ser un entero"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s necesita <nombre> <ruta>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s necesita <nombre>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave necesita <enlace> <nombre> <ruta>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "el nombre esclavo %s está duplicado"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "el enlace esclavo %s está duplicado"
+
+#: scripts/update-alternatives.pl:284
+#, 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:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"necesito --display, --config, --set, --install, --remove, --all, --remove-"
+"all o --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "sólo se puede utilizar --slave con --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando la selección automática de %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "no se puede eliminar %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5509,7 +5515,7 @@ msgstr ""
 "Se ha cambiado %s (manualmente o por un programa).\n"
 "Cambiando para realizar sólo actualizaciones manuales."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5519,72 +5525,72 @@ msgstr ""
 "s ...\n"
 "(Puede modificar los enlaces allí si lo desea - consulte «man ln».)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renombrando el enlace %s de %s a %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no se puede renombrar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "el nombre del enlace esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Eliminando la alternativa seleccionada manualmente, cambiando a modo "
 "automático"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando el enlace esclavo obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Restaurando de una actualización previa fallida de %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, 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:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5593,38 +5599,38 @@ msgstr ""
 "aviso: se supone que %s es un enlace simbólico a %s\n"
 " (o no existe), sin embargo ha fallado «readlink»: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "no es posible asegurar que %s no exista: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "no se puede instalar %s como %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Dejando %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Actualizando %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5633,13 +5639,13 @@ msgstr ""
 "aviso: se supone que %s es un enlace simbólico a\n"
 " %s, o no existe; pero «readlink» ha fallado: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Eliminando %s (%s), no es apropiado para %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5648,7 +5654,7 @@ msgstr ""
 "Sólo hay un programa que provee %s\n"
 "(%s). No se configurará nada.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5661,49 +5667,58 @@ msgstr ""
 "  Selección     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Se utiliza `%s' para proveer `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No se encuentra una alternativa `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "error al escribir a salida estándar: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta una nueva línea después de %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: fallo al ejecutar gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: fallo al ejecutar bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: fallo al ejecutar bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "no se puede crear %.250s"
 
diff --git a/po/eu.po b/po/eu.po
index e9a6dfb3..22b91633 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-09-27 13:55+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -60,72 +60,57 @@ msgstr "%d. sistema errorea"
 msgid "Signal no.%d"
 msgstr "%d. seinalea"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: huts egin du gzip %s exekutatzean"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: barneko gzip errorea: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: huts egin du exekutatzean: gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: barneko bzip2 errorea: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: huts egin du exekutatzean: bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: deskonpresioa"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: barneko gzip errorea: irakurtzean: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: barneko gzip errorea: idaztean: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: barneko gzip errorea: irakurri (%i) != idatzi (%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: huts egin du gzip %s exekutatzean"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: barneko bzip2 errorea: irakurtzean: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: barneko bzip2 errorea: idaztean: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: barneko bzip2 errorea: irakurri (%i) != idatzi (%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: huts egin du bzip2 %s exekutatzean"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: konpresioa"
@@ -155,7 +140,8 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "eguneratzeen direktorioak luzera desberdineko izenak dituzten fitxategiak "
 "dauzka (%d eta %d)"
@@ -170,7 +156,7 @@ msgstr "ezin da aztertu `%.255s' eguneratzeen direktorioa"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "huts egin du %.255s eguneratze fitxategi inkorporatua kentzean"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "ezin da`%.255s' sortu"
@@ -357,12 +343,14 @@ msgstr "fitxategi-xehetasunen `%s' eremua ez da onartzen egoera-fitxategian"
 #: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
-msgstr "fitxategi-xehetasunen `%s' eremuan balio gehiegi (beste batzuen aldean)"
+msgstr ""
+"fitxategi-xehetasunen `%s' eremuan balio gehiegi (beste batzuen aldean)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "fitxategi-xehetasunen `%s' eremuan balio gutxiegi (beste batzuen aldean)"
+msgstr ""
+"fitxategi-xehetasunen `%s' eremuan balio gutxiegi (beste batzuen aldean)"
 
 #: lib/fields.c:133
 msgid "yes/no in boolean field"
@@ -414,7 +402,8 @@ msgstr "`conffiles' balioak `%.*s' lerroa gaizki formateatua dauka"
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "`conffiles' balioko lerroa zuriunea ez den `%c' karakterearekin hasten da"
+msgstr ""
+"`conffiles' balioko lerroa zuriunea ez den `%c' karakterearekin hasten da"
 
 #: lib/fields.c:281
 msgid "root or null directory is listed as a conffile"
@@ -422,8 +411,10 @@ msgstr "erro-direktorioa edo direktorio nulua conffile gisa zerrendatu da"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "`%s' eremua, pakete-izena falta, edo zaborra pakete-izena espero zen lekuan"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"`%s' eremua, pakete-izena falta, edo zaborra pakete-izena espero zen lekuan"
 
 #: lib/fields.c:340
 #, c-format
@@ -711,7 +702,8 @@ msgstr "-%c aukerak ez du baliorik hartzen"
 #: lib/parse.c:106
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
-msgstr "huts egin du `%.255s' paketearen informazio-fitxategia irakurtzeko irekitzean"
+msgstr ""
+"huts egin du `%.255s' paketearen informazio-fitxategia irakurtzeko irekitzean"
 
 #: lib/parse.c:111
 #, c-format
@@ -795,7 +787,8 @@ msgstr "Paketearen 'Configured-Version' egoera desegokiarekin"
 
 #: lib/parse.c:274
 msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Instalatu gabeko egoeran conffile-ak dituen paketea: ahaztu egingo dira"
+msgstr ""
+"Instalatu gabeko egoeran conffile-ak dituen paketea: ahaztu egingo dira"
 
 #: lib/parse.c:331
 #, c-format
@@ -895,46 +888,47 @@ msgstr "Itxierako giltza falta da formatuan\n"
 msgid "failed to realloc for variable buffer"
 msgstr "realloc-ek huts egin du aldagaiaren bufferrean"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  desagertu da !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "errorea dpkg-deb kanalizaziotik irakurtzean"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "errorea data-zigiluak ezartzean: `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "errorea jabetza ezartzean: `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "errorea baimenak ezartzean: `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
-msgstr "`%.250s' (`%.250s'%.10s%.100s%.10s bertsio desbideratua) gainidazten saiatzen"
+msgstr ""
+"`%.250s' (`%.250s'%.10s%.100s%.10s bertsio desbideratua) gainidazten saiatzen"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paketea: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "ezin da `%.255s' atzitu (eta instalatzera nindoan)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -943,114 +937,117 @@ msgstr ""
 "ezin da garbitu `%.255s' inguruko nahastea, beste bertsio bat instalatu "
 "aurretik"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "ezin da atzitu leheneratutako `%.255s' beste bertsio bat instalatu aurretik"
+msgstr ""
+"ezin da atzitu leheneratutako `%.255s' beste bertsio bat instalatu aurretik"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "artxiboko `%.255s' objektua mota ezezagunekoa da: 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "%s pakete zaharreko fitxategiak ordezten...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Instalaturiko %s paketeak ordezturiko fitxategiak...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 "%2$.250s paketeko `%1$.250s' direktorioa direktorioa ez den batekin "
 "gainidazten saiatzen ari da"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "`%.250s' gainidazten saiatzen ari da; %.250s paketean ere badago"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "Irakurri eta alde batetara utzi ordezturiko `%.255s' fitxategia"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "atzealdeko dpkg-deb-en iraupena: `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "errorea `%.255s' ixtean/idaztean"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "errorea `%.255s' kanalizazioa sortzean"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "errorea `%.255s' gailua sortzean"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "errorea `%.255s' esteka fisikoa sortzean"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "errorea `%.255s' esteka sinbolikoa sortzean"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "errorea `%.255s' esteka sinbolikoaren jabetza ezartzean"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "errorea `%.255s' direktorioa sortzean"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "ezin da joan `%.255s'(e)ra bertsio berria instalatzeko"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "ezin da irakurri `%.255s' esteka"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "ezin da esteka sinbolikoaren babeskopia egin: `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "ezin da esteka sinbolikoaren babeskopiaren 'chown' egin: `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "bertsio berria instalatu aurretik ezin da estekaren babeskopia egin: `%.255s'"
+msgstr ""
+"bertsio berria instalatu aurretik ezin da estekaren babeskopia egin: `%.255s'"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "ezin da `%.255s' bertsio berria instalatu"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1060,7 +1057,7 @@ msgstr ""
 "zaio:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1069,7 +1066,7 @@ msgstr ""
 "dpkg: abisua - %s funtsezko paketea deskonfiguratzea\n"
 " aztertzen, %s kendu ahal izateko.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1078,7 +1075,7 @@ msgstr ""
 "dpkg: ez, %s funtsezkoa da, ez da deskonfiguratuko\n"
 " %s kendu ahal izateko.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1087,26 +1084,26 @@ msgstr ""
 "dpkg: ez, ezin da %s kendu (ikus --auto-deconfigure):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s kentzea aztertzen, %s jartzeko...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s ez dago ondo instalatuta - mendekotasunei ez ikusi egingo\n"
 " zaie.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: beharbada arazoak egongo dira %s kentzeko, %s hornitzen\n"
 " baitu...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1115,17 +1112,22 @@ msgstr ""
 "dpkg: %s paketea berriro instalatu behar da, baina kendu egingo da eskatu "
 "bezala.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: %s paketea berriro instalatu behar da, ez da kenduko.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: bai, %s kenduko da, eta %s jarri.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1134,75 +1136,76 @@ msgstr ""
 "dpkg: %2$s daukan %1$s(r)i dagokionez:\n"
 "%3$s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "gatazkan dauden paketeak - %.250s ez da instalatuko"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: abisua - gatazkari ez ikusi egin zaio, jarrai daiteke !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive: bide-izenaren argumentu bat behar du gutxienez"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "--recursive: huts egin du bilaketa exekutatzean"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "fdopen-ek huts egin du find-en kanalizazioarekin"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "errorea find-en kanalizazioa irakurtzean"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "errorea find-en kanalizazioa ixtean"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive bilaketak maneiatu gabeko %i errorea itzuli du"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "bilatu bai, baina ez da paketerik aurkitu (*.deb fitxategiak)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s: pakete-artxiboaren fitxategi-argumentu bat behar du gutxienez"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Aurrez desautatutako %s paketea hautatzen.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Desautatutako %s paketea saltatzen.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%2$.250s %1$.250s bertsioa instalatuta dago, saltatu egingo da.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - abisua: %.250s aurreko bertsiora itzultzen (%.250s -> %.250s).\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "%.250s ez da aurreko bertsiora itzuliko (%.250s -> %.250s), saltatzen.\n"
+msgstr ""
+"%.250s ez da aurreko bertsiora itzuliko (%.250s -> %.250s), saltatzen.\n"
 
 #: src/cleanup.c:83
 #, c-format
@@ -1306,12 +1309,14 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: abisua - huts egin du `%.250s' babeskopia zaharra kentzean : %s\n"
+msgstr ""
+"dpkg: %s: abisua - huts egin du `%.250s' babeskopia zaharra kentzean : %s\n"
 
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: abisua - huts egin du `%.250s' -> `%.250s' izena aldatzean: %s\n"
+msgstr ""
+"dpkg: %s: abisua - huts egin du `%.250s' -> `%.250s' izena aldatzean: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1321,12 +1326,14 @@ msgstr "dpkg: %s: abisua - huts egin du `%.250s' kentzean: %s\n"
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: abisua - huts egin du `%.250s' banaketa zaharra kentzean: %s\n"
+msgstr ""
+"dpkg: %s: abisua - huts egin du `%.250s' banaketa zaharra kentzean: %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: abisua - huts egin du `%.250s' kentzean (gainidatzi aurretik): %s\n"
+msgstr ""
+"dpkg: %s: abisua - huts egin du `%.250s' kentzean (gainidatzi aurretik): %s\n"
 
 #: src/configure.c:267
 #, c-format
@@ -1409,7 +1416,8 @@ msgstr "ezin da aldatu `%.250s' konfigurazio-fitxategi berriaren jabetza"
 #: src/configure.c:438
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr "ezin da ezarri banaketa berriaren `%.250s' konfigurazio-fitxategiaren modua"
+msgstr ""
+"ezin da ezarri banaketa berriaren `%.250s' konfigurazio-fitxategiaren modua"
 
 #: src/configure.c:468
 #, c-format
@@ -1571,110 +1579,117 @@ msgstr "EOF stdin-en konfigurazio-fitxategiaren gonbitean"
 msgid "unable to check for existence of `%.250s'"
 msgstr "ezin da begiratu `%.250s' dagoen"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " honen mendekoa da: "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " honen aurremendekoa da: "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " hau gomendatzen du: "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " hau iradokitzen du: "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " hausturak"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " gatazkan dago honekin: "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " hau iradokitzen du: "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " hau hobetzen du: "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s kendu behar da.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s deskonfiruatu behar da.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s instalatu behar da, baina bertsioa %.250s da.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s instalatuta dago, baina bertsioa %.250s da.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s deskonprimituta dago, baina oraindik ez da konfiguratu.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s deskonprimituta dago, baina bertsioa %.250s da.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s: azken konfiguratutako bertsioa %.250s da.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s da.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina kendu egin behar da.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina deskonfiguratu egin behar da.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina %s da.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ez dago instalatuta.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (%.250s bertsioa) instalatu behar da.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (%.250s bertsioa) %s da.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s: %.250s hornitzen du, baina instalatu egin behar da.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s: %.250s hornitzen du, eta %s da.\n"
@@ -1762,7 +1777,8 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "badirudi dpkg ez dagoela instalatuta, ezin da bilatu aroaren euskarria !\n"
+msgstr ""
+"badirudi dpkg ez dagoela instalatuta, ezin da bilatu aroaren euskarria !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1780,14 +1796,16 @@ msgstr ""
 #: src/enquiry.c:360
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "%.250s: ezin dira aurremendekotasunak bete (hau dela-eta behar dira: %.250s)"
+msgstr ""
+"%.250s: ezin dira aurremendekotasunak bete (hau dela-eta behar dira: %.250s)"
 
 #: src/enquiry.c:377
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture: ez du argumenturik hartzen"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--compare-versions: hiru argumentu hartzen ditu: <version> <relation> "
 "<version>"
@@ -1811,7 +1829,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: ezin izan da memoriarik esleitu huts egindako paketeen zerrendan "
 "sarrera berria gehitzeko."
@@ -1836,7 +1855,8 @@ msgstr "%s paketea atxikitzekoa zen, baina zuk eskatu bezala prozesatuko da\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 "%s paketea atxikita dago, ez da ukituko.  Erabili --force-hold\n"
 "gainidazteko.\n"
@@ -1909,7 +1929,8 @@ msgstr "ezin da hustu %s paketearen fitxategi-zerrendako eguneratua"
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "ezin da sinkronizatu %s paketearen fitxategi-zerrendaren fitxategi eguneratua"
+msgstr ""
+"ezin da sinkronizatu %s paketearen fitxategi-zerrendaren fitxategi eguneratua"
 
 #: src/filesdb.c:257
 #, c-format
@@ -2437,7 +2458,8 @@ msgstr "--debug: octal argumentu bat behar du"
 #: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr "pakete-izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
+msgstr ""
+"pakete-izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
 
 #: src/main.c:271
 #, c-format
@@ -2572,7 +2594,7 @@ msgstr "ezin izan da `%i' ireki korronterako"
 msgid "unexpected eof before end of line %d"
 msgstr "ustekabeko eof %d lerroa amaitu aurretik"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "ekintza-aukera bat behar da"
@@ -2591,7 +2613,8 @@ msgstr "--%s: pakete-izenaren argumentu bat behar du gutxienez"
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
-msgstr "paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
+msgstr ""
+"paketeen izenak zehaztu behar dituzu, ez paketeen barruko fitxategien izenak"
 
 #: src/packages.c:150
 #, c-format
@@ -2649,6 +2672,10 @@ msgstr "  %s paketea, %s hornitzen duena ez dago instalaturik.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  %s paketea ez dago instalatuta.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " honen mendekoa da: "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; nolanahi ere:\n"
@@ -2773,7 +2800,8 @@ msgstr "%s (%s) deskonprimitzen...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "konf. fitxategiaren izena (`%.250s' hasten dena) luzeegia da (>%d karaktere)"
+msgstr ""
+"konf. fitxategiaren izena (`%.250s' hasten dena) luzeegia da (>%d karaktere)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2845,10 +2873,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "ezin da `%.250s' zati-fitxategian egoera eskuratu"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: abisua - `%.250s' konf. fitxategi zaharra zenbait fitxategi berrien "
 "berdina da! (bai `%.250s' eta bai `%.250s')"
@@ -3097,7 +3125,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 "dpkg - abisua: %.250s kentzeko eskaerari ez ikusi egingo zaio, ez dagoelako "
 "instalatuta.\n"
@@ -3285,7 +3314,8 @@ msgstr "ezin da sartu dpkg egoera-arean eguneratze masiboa egiteko"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "eguneratze masiboa egiteko dpkg egoera-arean idazteko baimena eduki behar da"
+msgstr ""
+"eguneratze masiboa egiteko dpkg egoera-arean idazteko baimena eduki behar da"
 
 #: src/update.c:66
 #, c-format
@@ -3311,24 +3341,30 @@ msgstr "--forget-old-unavail: ez du argumenturik hartzen"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - errorea: %s (`%s'): ez dauka digiturik\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build: direktorio-argumentu bat behar du"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build: gehienez bi argumentu hartzen ditu"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "ezin da begiratu `%.250s' artxiboa badagoen"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
-msgstr "helburua direktorioa da - ezin da saltatu kontrol-fitxategiaren egiaztapena"
+msgstr ""
+"helburua direktorioa da - ezin da saltatu kontrol-fitxategiaren egiaztapena"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3337,45 +3373,47 @@ msgstr ""
 "dpkg-deb: abisua, ez da egiaztatuko kontrol-areako edukia.\n"
 "dpkg-deb: pakete ezezagun bat eraikitzen: `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "pakete-izenak minuskula alfanumerikoak edo `-+.' ez diren karaktereak dauzka"
+msgstr ""
+"pakete-izenak minuskula alfanumerikoak edo `-+.' ez diren karaktereak dauzka"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr "abisua, `%s'(e)k erabiltzaileak definitutako `%s' lehentasun-balioa dauka\n"
+msgstr ""
+"abisua, `%s'(e)k erabiltzaileak definitutako `%s' lehentasun-balioa dauka\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "abisua, `%s'(e)k erabiltzaileak definitutako `%s' eremua dauka\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d errore kontrol-fitxategian"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%s' paketea eraikitzen: `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "kontrol-direktorioak okerreko baimenak ditu: %03lo (>=0755 eta <=0775 izan "
 "behar dute)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "mantentzailearen `%.50s' script-a ez da fitxategi arrunta edo esteka "
 "sinbolikoa"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3384,135 +3422,136 @@ msgstr ""
 "mantentzailearen `%.50s' script-ak okerreko baimenak ditu: %03lo (>=0555 eta "
 "<=0775 izan behar dute)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "mantentzailearen `%.50s' script-ean ezin da stat egin"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "fgets: kate huts bat bidali du konfigurazio-fitxategiak irakurtzean"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 "abisua, `%.50s...' konf. fitxategiaren izena luzeegia da, edo amaierako "
 "lerro-jauzia falta du\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "abisua, `%s' konfigurazio fitxategiak amaieraz zuriuneak ditu\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "`%.250s' konf. fitxategia ez da paketean azaltzen"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "`%.250s' konfigurazio-fitxategian ezin da stat egin"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "abisua, `%s' konfigurazio-fitxategia ez da fitxategi arrunta\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "errorea konfigurazio-fitxategien fitxategia irakurtzean"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "errorea konfigurazio-fitxategien fitxategia irekitzean"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: kontrol-fitxategiei buruzko %d abisuri ez ikusi egiten\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "ezin da`%.255s' bufferretik atera"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "huts egin du chdir egitean: `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "huts egin du chdir egitean: .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "huts egin du tar -cf exekutatzean"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "huts egin du aldi baterako fitxategi bat sortzean (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "huts egin du aldi baterako fitxategi bat irekitzean (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "huts egin du aldi baterako fitxategi bat desestekatzean (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "fstat: huts egin du aldi baterako fitxategi batekin (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "huts egin du aldi baterako fitxategiaren hasierara joatean (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "huts egin du aldi baterako fitxategia sortzean (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "huts egin du aldi baterako fitxategia irekitzean (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "huts egin du aldi baterako fitxategia desestekatzean (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "datua"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "huts egin du find exekutatzean"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "huts egin du fitxategi-izena tar kanalizazioan idaztean (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "barne-errorea, '%i' konpresio mota ezezaguna!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "huts egin du aldi baterako fitxategiaren hasierara joatean (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3538,7 +3577,8 @@ msgstr "`%.250s' fitxategia hondatuta dago - %.250s luzerak nuluak dauzka"
 #: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
-msgstr "`%.250s' fitxategia hondatuta dago - okerreko digitua (%d kodea) %s(e)n"
+msgstr ""
+"`%.250s' fitxategia hondatuta dago - okerreko digitua (%d kodea) %s(e)n"
 
 #: dpkg-deb/extract.c:104
 #, c-format
@@ -3593,22 +3633,22 @@ msgstr "artxiboak ez du punturik bertsio-zenbakian"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "%.250s artxibo-bertsioa ez da ulertzen, lortu dpkg-deb berriago bat"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "%s: kide-datuak saltatu dira"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "`%.250s' fitxategiak %.*s datu-kide ulertezina dauka, utzi egingo da"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "`%.250s' fitxategiak bi kontrol-kide dauzka, utzi egingo da"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3617,16 +3657,16 @@ msgstr ""
 " debian pakete berria, %s bertsioa.\n"
 " tamaina: %ld byte; kontrol-artxiboa= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "kontrol-informazio luzera"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "artxiboak gaizki osatutako `%s' kontrol luzera dauka"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3635,15 +3675,15 @@ msgstr ""
 " debian pakete zaharra, %s bertsioa.\n"
 " tamaina: %ld byte; kontrol-artxiboa= %zi, artxibo nagusia= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Errorea `ctrlarea' aldagaiarentzat memoria esleitzean"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "kontrol eremua"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3652,65 +3692,65 @@ msgstr ""
 "dpkg-deb: badirudi fitxategia ASCII moduan deskargatu delako \n"
 "dpkg-deb:    hondatu den artxibo bat dela\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' ez da debian formatuko artxibo bat"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "huts fitxategi kokapena eskuratzean"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "huts fitxategi kokapena ezartzean"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "Huts `1' tutu deskribapena itsastean irekitzean"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "huts egin du idaztean: gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "huts egin du ixtean: gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "huts egin du lseek sistema-deia egitean fitxategien artxibo-zatian"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "huts egin du kanalizazioan idaztean kopian"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "huts egin du kanalizazioa ixtean kopian"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "huts egin du direktorioa sortzean"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "huts egin du direktoriora chdir egitean, direktorioa sortu ondoren"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "huts egin du direktoriora chdir egitean"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "huts egin du tar exekutatzean"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s: .deb fitxategi izen argumentu bat behar du"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3719,12 +3759,12 @@ msgstr ""
 "--%s: helburu-direktorio bat behar du.\n"
 "Beharbada dpkg--install erabili nahi zenuen?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s: bi argumentu hartzen ditu gutxienez (.deb eta direktorioa)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s: argumentu bat bakarrik hartzen du (.deb fitxategi izena)"
@@ -3766,7 +3806,8 @@ msgstr "dpkg-deb: `%.255s': ez dauka `%.255s' kontrol-osagairik\n"
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "huts egin du `%.255s' osagaia irekitzean (%.255s), espero ez zen moduan"
+msgstr ""
+"huts egin du `%.255s' osagaia irekitzean (%.255s), espero ez zen moduan"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3880,7 +3921,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3891,7 +3932,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Aukerak:\n"
@@ -3928,7 +3970,7 @@ msgstr ""
 "Idatzi dpkg-deb --help *.deb fitxategiak manipulatzeko laguntza lortzeko;\n"
 "Idatzi dpkg --help paketeak instalatu eta desinstalatzeko laguntza lortzeko."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "%s konpresio mota ezezaguna!"
@@ -3952,7 +3994,8 @@ msgstr "ezin da joan atzera"
 #: dpkg-split/info.c:105
 #, c-format
 msgid "file `%.250s' is corrupt - bad padding character (code %d)"
-msgstr "`%.250s' fitxategia hondatuta dago - okerreko karaktere betegarria (%d kodea)"
+msgstr ""
+"`%.250s' fitxategia hondatuta dago - okerreko karaktere betegarria (%d kodea)"
 
 #: dpkg-split/info.c:109
 #, c-format
@@ -3969,7 +4012,8 @@ msgstr ""
 #: dpkg-split/info.c:124
 #, c-format
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
-msgstr "`%.250s' fitxategia hondatuta dago - okerreko MD5 kontrol-batura: `%.250s'"
+msgstr ""
+"`%.250s' fitxategia hondatuta dago - okerreko MD5 kontrol-batura: `%.250s'"
 
 #: dpkg-split/info.c:131
 #, c-format
@@ -4314,9 +4358,9 @@ msgstr "helburuko `%.250s' fitxategia ez da fitxategi arrunta"
 msgid "unable to exec mksplit"
 msgstr "ezin da mksplit exekutatu"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s -%s bertsioa.\n"
@@ -4329,9 +4373,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4388,7 +4432,7 @@ msgid "try deleting %s"
 msgstr "saiatu %s ezabatzen"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "Ezin da %s ireki: %s"
@@ -4415,7 +4459,7 @@ msgid "unable to close %s after read: %s"
 msgstr "ezin da irakurri ondoren %s itxi: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Ezin da %s itxi: %s"
@@ -4435,12 +4479,12 @@ msgstr "huts %s instalatzean ; berau %s bezala uzten: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: ezin da %s desblokeatu: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Ezin da ENOENT balioa eskuratu %s-tik: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4450,7 +4494,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4505,89 +4549,89 @@ msgstr ""
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "bi modu ezarri dira: %s eta --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s-(e)k desbideratzeko argumentu bat behar du"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to-ek ezin du lerro berririk eduki"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s-(e)k <pakete> argumentu bat behar du"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "paketea ezin du lerro berririk eduki"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s-(e)k <direktorio> argumentu bat behar du"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "`%s' aukera ezezaguna"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "huts egin du desbideraketak irekitzean: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "altname falta da"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "paketea falta da"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s-(e)k argumentu soil bat behar du"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" fitxategi izena ez da absolutua"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "fitxategiak ezin du lerro berririk eduki"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Ezin dira direktorioak desbideratu"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "`%s' uzten"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s'-ek `%s'-ekin elkarjotzen du"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' gehitzen"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4598,7 +4642,7 @@ msgstr ""
 "`%s' ezabatzean\n"
 "`%s' aurkitu da"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4609,37 +4653,37 @@ msgstr ""
 "`%s' ezabatzean\n"
 "`%s' aurkitu da"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "`%s' kentzen"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Ez dago `%s' desbideraketarik, ez da ezabatuko"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "barne errorea - `%s' modu okerra"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "ezin da`%s' izen zaharra atzitu: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "ezin da `%s' izen berria atzitu: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "errorea `%s' egiaztatzean: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4648,52 +4692,52 @@ msgstr ""
 "berrizendatzeak `%s' gainidaztea dakar\n"
 "  `%s' fitxategi ezberdinarekin, ez da onartzen"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: `%s' lotura zaharra ezabatu: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: `%s' `%s'-ra berrizendatu: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new sortu: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new idatzi: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new itxi: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "diversions-old zaharra ezabatu: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "diversions-old berria sortu: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "desbideraketa berriak instalatu: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "barne errorea: %s hondaturik: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4701,7 +4745,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4736,106 +4780,106 @@ msgstr ""
 "  --help                   lagunrza mezu hau bistarazi.\n"
 "  --version                bertsioa bistarazi.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "ez da modurik ezarri"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add-ek lau argumentu behar ditu"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "legezkanpoko %s erabiltzailea"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "ez dagoen %s erabiltzailea"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "legezkanpoko %s taldea"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "ez dagoen %s taldea"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "legezkanpoko %s modua"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "amaierako sobrako zuriuneak /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\"-en gainidazketa badago dagoeneko, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "baina --force ezarri da, beraz alde batetara utziko da."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "uzten"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "abisua_ --update eman da baina %s ez dago"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "huts %s taldez aldatzean: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "huts %s-ren baimenak aldatzean: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Ez dago gainidazketarik."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "abisua: --update ezin da --remove-rekin erabili"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "Ezin da statoverride fitxategia ireki: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Agindu anitz \"%s\"-rentzat, uzten"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "Ezin da statoverride fitxategi berria ireki: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "errorea statoverride-old ezabatzen: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "errorea statoverride-old berria sortzerakoan: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "error statoverride berria instaalzeab: %s"
@@ -4963,7 +5007,8 @@ msgstr "%s: huts %s %s-ra mugitzerakoan, uzten: %s"
 #: scripts/install-info.pl:288
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
-msgstr "%s: %s babeskopia fitxategia ez dago, lehenetsiriko fitxategia erabiltzen."
+msgstr ""
+"%s: %s babeskopia fitxategia ez dago, lehenetsiriko fitxategia erabiltzen."
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5055,7 +5100,7 @@ msgstr "ezin da %s irakurri: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5065,8 +5110,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5086,7 +5131,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5140,95 +5185,36 @@ msgstr ""
 "  --help                   laguntza mezu hau bistarazi.\n"
 "  --version                bertsioa bistarazi.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "`%s' argumentu ezezaguna"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install-ek <lotura> <izena> <bidea> <lehentasuna> behar ditu"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "lehentasuna zenbaki oso bat izan behar da"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s-ek <izena> <bidea> behar ditu"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s-ek <izena> behar du"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave-ek <lotura> <izena> <bidea> behar ditu"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "%s izen morroia bikoizturik"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "%s lotura morroia bikoizturik dago"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "%s izena batera morroi eta nagusia da"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "%s lotura batera morroi eta nagusia da"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all "
-"edo --auto behar da"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave --install-ekin batera bakarrik onartzen da"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "%s morroi bikoiztua"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "lotura morroia %s loturaren berdina da"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "%s lotura morroia bikoiztua"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "bikoizturiko %s bidea"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "%s %s lehentasuna"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5237,66 +5223,124 @@ msgstr ""
 "%s-ren alternatibak ez den aurkitzen %s-ra jotzen du. Aukera zerrendatik "
 "ezabatzen."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ez dago alternatibarik %s-rentzat."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - egoera %s da."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " loturak orain %s-ra darama"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " lotura ez dago une honetan"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lotura irakurrezina - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - %s lehetasuna"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " %s morroia: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "ez dago bertsiorik eskuragarri."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Unekobertsio `onena' %s da."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "`%s' argumentu ezezaguna"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install-ek <lotura> <izena> <bidea> <lehentasuna> behar ditu"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "lehentasuna zenbaki oso bat izan behar da"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s-ek <izena> <bidea> behar ditu"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s-ek <izena> behar du"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave-ek <lotura> <izena> <bidea> behar ditu"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "%s izen morroia bikoizturik"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "%s lotura morroia bikoizturik dago"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "%s izena batera morroi eta nagusia da"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "%s lotura batera morroi eta nagusia da"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all "
+"edo --auto behar da"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave --install-ekin batera bakarrik onartzen da"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s-ren hautatze automatikoa ezartzen."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "ezin da %s ezabatu: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5305,7 +5349,7 @@ msgstr ""
 "%s aldatu egin da (eskuz edo script batez).\n"
 "Eskuzko eguneraketara aldatzen."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5315,69 +5359,69 @@ msgstr ""
 "(lotura sinbolikoa aldatu beharko duzu zure kabuz, laguntza behar ezkero "
 "`man ln' begiratu.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s lotura %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "ezin da %s %s-ra berrizendatu: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s lotura morroi izena bikoizturik dago"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s lotura morroia %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Eskuz hautaturiko alternatiba ezabatzen - modu automatikora aldatzen"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "%s (%s) lotura morroi zaharra alde batetara uzten."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Aurretik huts egindako  %s-ren eguneraketa batetik berreskuratzen"
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Ezin da %s idazteko ireki: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) hornitzen duen azken paketea ezabaturik, ezabatzen."
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5386,38 +5430,38 @@ msgstr ""
 "abisua: %s %s-ra lotura sinboliko bat dela suposatzen\n"
 "da (edo ez dago), hala ere, rakurketak huts egin du: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "ezin da ziurtatu %s ez dagoenik: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "Ezin da %s %s bezala instalatu: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s)-ra lotzen %s utzi."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) egunaratzen %s-ra jo dezan"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5426,13 +5470,13 @@ msgstr ""
 "abisua: %s ez du oanrtzen %s-ra esteka sinboliko morroia\n"
 "izarea, edo ez dago, hala ere, lotura irakurtzeak huts egin du: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) ezabatzen, ez da %s-rekin egokia."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5441,7 +5485,7 @@ msgstr ""
 "Programa 1 bakarrik dago %s (%s)-taz hornitzen\n"
 " duena. Ezer konfiguratzeko.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5454,42 +5498,51 @@ msgstr ""
 "Alternatiba aukeratu\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
+msgstr ""
+"Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' erabiltzen `%s'-etaz hornitzeko."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Ezin da `%s' ordezkorik aurkitu."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errorea irteera estandarrean idazterakoan: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives fitxategiak (%s) ezin du lerro berririk eduki"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fixtategi amaiera edo errorea %s irakurtzean %s-rako (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lerro berria falta da %s ondoren"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Arazo larria: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: huts egin du exekutatzean: gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: huts egin du exekutatzean: bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: huts egin du bzip2 %s exekutatzean"
diff --git a/po/fr.po b/po/fr.po
index a9f0e6b3..efe18f90 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-09-05 07:06+0100\n"
 "Last-Translator: Frederic Bothamy <frederic.bothamy@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -116,72 +116,57 @@ msgstr "Erreur syst
 msgid "Signal no.%d"
 msgstr "Signal n° %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s : échec de l'exécution de gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s : erreur interne de gzip : « %s »"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s : impossible d'exécuter « gzip -dc »"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s : erreur interne de bzip2 : « %s »"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s : impossible d'exécuter « bzip2 -dc »"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s : décompression"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s : erreur interne de gzip : lu : « %s »"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s : erreur interne de gzip : écrit : « %s »"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s : erreur interne de gzip : lu(%i) != écrit(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s : échec de l'exécution de gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s : erreur interne de bzip2 : lu : « %s »"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s : erreur interne de bzip2 : écrit : « %s »"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s : erreur interne de bzip2 : lu(%i) != écrit(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s : échec de l'exécution de bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s : compression"
@@ -228,7 +213,7 @@ msgstr "ne peut pas parcourir le r
 msgid "failed to remove incorporated update file %.255s"
 msgstr "impossible de supprimer le fichier de mise à jour incorporé %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "impossible de créer « %.255s »"
@@ -978,30 +963,30 @@ msgstr "Parenth
 msgid "failed to realloc for variable buffer"
 msgstr "échec de réallocation de la mémoire tampon de variable"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... a déjà disparu !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "erreur de lecture du tube de dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "erreur de paramétrage des cachets de date de « %.255s »"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erreur de paramétrage des droits de « %.255s »"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erreur de paramétrage des permissions de « %.255s »"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -1010,17 +995,17 @@ msgstr ""
 "tentative de remplacement de « %.250s », qui est la version détournée de "
 "« %.250s » %.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paquet : "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 "impossible d'analyser « %.255s » (qui était sur le point d'être installé)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -1029,28 +1014,28 @@ msgstr ""
 "impossible de faire le ménage autour de « %.255s » avant d'installer une "
 "autre version"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "impossible d'analyser « %.255s » restauré avant d'installer une autre version"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "l'archive contient un objet « %.255s » de type inconnu 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Remplacement de fichiers dans l'ancien paquet %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Remplacés par des fichiers du paquet %s déjà installé...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -1058,95 +1043,95 @@ msgstr ""
 "tentative de remplacement du répertoire « %.250s » dans le paquet %.250s "
 "avec un élément de type différent"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, 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"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "écrasement du fichier remplacé « %.255s »"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb pendant « %.255s »"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erreur pendant la fermeture/écriture de « %.255s »"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erreur pendant la création du tube « %.255s »"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erreur pendant la création du périphérique « %.255s »"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erreur pendant la création du lien physique « %.255s »"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erreur pendant la création du lien symbolique « %.255s »"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erreur pendant la définition des droits du lien symbolique « %.255s »"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erreur pendant la création du répertoire « %.255s »"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "impossible de déplacer ailleurs « %.255s » afin d'en installer une nouvelle "
 "version"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "impossible de lire le lien « %.255s »"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "impossible de créer un lien symbolique de secours pour « %.255s »"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "impossible de modifier les droits du lien symbolique de secours pour "
 "« %.255s »"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "impossible de créer un lien symbolique de secours de « %.255s » avant "
 "d'installer une nouvelle version"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossible d'installer une nouvelle version de « %.255s »"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1156,7 +1141,7 @@ msgstr ""
 "de %s :\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1165,7 +1150,7 @@ msgstr ""
 "dpkg : avertissement - déconfigurer le paquet\n"
 " essentiel %s pour autoriser la suppression de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1174,7 +1159,7 @@ msgstr ""
 "dpkg : non, %s est essentiel, il ne sera pas déconfiguré\n"
 " pour autoriser la suppression de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1183,24 +1168,24 @@ msgstr ""
 "dpkg : non, impossible de retirer %s (voir --auto-deconfigure) :\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg : retirer %s en faveur de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s n'est pas correctement installé - ses dépendances sont ignorées.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg : la suppression de %s peut être problématique, puisqu'il fournit%"
 "s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1209,18 +1194,23 @@ msgstr ""
 "dpkg : le paquet %s requiert une réinstallation, mais suppression comme "
 "demandé.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg : le paquet %s requiert une réinstallation, suppression annulée.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg : oui, suppression de %s en faveur de %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1229,74 +1219,74 @@ msgstr ""
 "dpkg : concernant %s contenant %s :\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquets en conflit - %.250s non installé"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg : avertissement - conflit ignoré, poursuite possible !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive a besoin d'au moins un chemin comme paramètre"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "échec de l'exécution de « find » pour --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "échec de « fdopen » sur le tube de « find »"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "erreur pendant la lecture sur le tube de « find »"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "erreur pendant la fermeture du tube de « find »"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "Le find pour --recursive a renvoyé une erreur %i non gérée"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "recherché, mais aucun paquet trouvé (fichiers *.deb correspondant)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s a besoin d'au moins un fichier archive de paquet comme paramètre"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Sélection du paquet %s précédemment désélectionné.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Paquet désélectionné %s ignoré.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s de %.250s déjà installée, paquet ignoré.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - avertissement : %.250s mis à jour de la version %.250s vers l'ancienne "
 "version %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1694,110 +1684,117 @@ msgstr "EOF sur l'entr
 msgid "unable to check for existence of `%.250s'"
 msgstr "impossible de vérifier l'existence de « %.250s »"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " dépend de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pré-dépend de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recommande "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " suggère "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " casse (« breaks »)"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " entre en conflit avec "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " suggère "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " étend "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s doit être supprimé.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s doit être déconfiguré.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s doit être installé, mais sa version est %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s est installé, mais sa version est %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s est dépaqueté, mais n'a jamais été configuré.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s est dépaqueté, mais sa version est %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la dernière version configurée de %.250s est %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s est %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fournit %.250s mais doit être supprimé.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fournit %.250s mais doit être déconfiguré.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fournit %.250s mais est %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s n'est pas installé.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) doit être installé.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) est %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fournit %.250s et doit être installé.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s fournit %.250s et est %s.\n"
@@ -2750,7 +2747,7 @@ msgstr "impossible d'ouvrir le flux d'entr
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "requiert une option d'action"
@@ -2827,6 +2824,10 @@ msgstr "  Le paquet %s qui fournit %s n'est pas install
 msgid "  Package %s is not installed.\n"
 msgstr "  Le paquet %s n'est pas installé.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " dépend de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr " ; cependant :\n"
@@ -3031,10 +3032,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "impossible d'analyser un autre nouveau fichier « %.250s »"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg : avertissement - l'ancien fichier « %.250s » est identique\n"
 "à plusieurs nouveaux fichiers (à la fois « %.250s » et « %.250s »)"
@@ -3518,26 +3519,31 @@ msgstr "--forget-old-unavail ne prend pas de param
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - erreur : %s (« %s ») ne contient pas de chiffres\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build a besoin d'un répertoire comme paramètre"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build prend au plus deux paramètres"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "impossible de vérifier l'existence de l'archive « %.250s »"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "la cible est un répertoire - ne peut pas ignorer la vérification du fichier "
 "« control »"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3547,49 +3553,49 @@ msgstr ""
 "contrôle.\n"
 "dpkg-deb : construction d'un paquet inconnu dans « %s ».\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "le nom de paquet contient des caractères qui ne sont pas des minuscules "
 "alphanumériques ou « -+. »"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "avertissement, « %s » contient une valeur « Priority » « %s » définie par "
 "l'utilisateur\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr ""
 "avertissement, « %s » contient le champ « %s » défini par l'utilisateur\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d erreurs dans le fichier de contrôle"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb : construction du paquet « %s » dans « %s ».\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "le répertoire de contrôle n'a pas les bonnes permissions %03lo (doit être "
 ">=0755 et <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "le script « %.50s » du responsable n'est pas un simple fichier ou un lien"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3598,16 +3604,16 @@ msgstr ""
 "le script « %.50s » du responsable n'a pas les bonnes permissions %03lo "
 "(doit être >=0755 et <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "le script « %.50s » du responsable n'est pas testable (stattable)"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "« fgets » renvoie une chaîne vide en lisant les conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3615,120 +3621,120 @@ msgstr ""
 "avertissement, le nom du conffile « %.50s... » est trop long, ou il manque "
 "le saut de ligne final\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "avertissement, le conffile « %s » contient des espaces à la fin\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "le conffile « %.250s » n'apparaît pas dans le paquet"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "le conffile « %.250s » n'est pas testable (stattable)"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "avertissement, le conffile « %s » n'est pas un simple fichier\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "impossible d'ouvrir le fichier conffile"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "erreur lors de l'ouverture du fichier conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb : %d avertissements sur les fichiers « control » ignorés\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "impossible de « unbuffer » « %.255s »"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "impossible de changer de répertoire vers « %.255s »"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "impossible de changer de répertoire vers .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "impossible d'exécuter  « tar -cf »"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "impossible de créer un fichier temporaire (« control »)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "l'ouverture d'un fichier temporaire (« control ») %s a échoué"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "impossible de délier un fichier temporaire (« control »), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "échec de « fstat » sur un fichier temporaire (« control »)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "le « rewind » sur un fichier temporaire (« control ») a échoué"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "échec de la création d'un fichier temporaire (« data »)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "l'ouverture d'un fichier temporaire (« data »), %s a échoué"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "impossible de délier un fichier temporaire (« data »), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "données"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "impossible d'exécuter « find »"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 "l'écriture d'un nom de fichier à travers un tube tar (« data ») a échoué"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Erreur interne, type de compression inconnu : %i"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "échec de « rewind » sur un fichier temporaire (« data »)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3814,24 +3820,24 @@ msgstr ""
 "version %.250s de l'archive non comprise, récupérer une version plus récente "
 "de dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "données membres de %s ignorées"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "le fichier « %.250s » contient l'élément de données non compris (%.*s), "
 "abandon"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "le fichier « %.250s » contient deux éléments de contrôle, abandon"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3840,16 +3846,16 @@ msgstr ""
 " nouveau paquet Debian, version %s.\n"
 " taille %ld octets : archive de contrôle = %zi octets.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "longueur de l'information de contrôle"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "l'archive possède une information de contrôle « %s » mal formée"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3858,15 +3864,15 @@ msgstr ""
 " ancien paquet Debian, version %s.\n"
 " taille %ld octets : archive de contrôle= %zi, archive principale= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Erreur d'allocation mémoire pour la variable « ctrlarea »"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "zone de contrôle"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3875,67 +3881,67 @@ msgstr ""
 "dpkg-deb : le fichier ressemble apparemment à une archive\n"
 "dpkg-deb :    corrompue par un téléchargement en mode ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s » n'est pas une archive de format Debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "échec de récupération de la position courante dans le fichier"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "échec de modification de la position courante dans le fichier"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr ""
 "échec d'ouverture de descripteur de tube (« pipe ») « 1 » lors du collage"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "échec de l'écriture vers « gzip -dc »"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "impossible de fermer « gzip -dc »"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 "échec de l'appel système « lseek » pour la portion d'archive des fichiers"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "impossible d'écrire dans le tube pour copie"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "impossible de fermer le tube en copie"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "impossible de créer le répertoire"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "échec de « chdir » vers un répertoire après l'avoir créé"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "échec de « chdir » vers le répertoire"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "impossible d'exécuter « tar »"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s a besoin d'un fichier .deb comme paramètre"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3944,12 +3950,12 @@ msgstr ""
 "--%s a besoin d'un répertoire cible.\n"
 "Peut-être devriez-vous utiliser dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s a besoin d'au plus deux paramètres (.deb et répertoire)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s a besoin d'un seul paramètre (nom de fichier .deb)"
@@ -4109,7 +4115,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -4120,7 +4126,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Options :\n"
@@ -4160,7 +4167,7 @@ msgstr ""
 "Taper dpkg --help pour obtenir une aide sur l'installation et la "
 "désinstallation des paquets."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "type de compression %s inconnu"
@@ -4558,9 +4565,9 @@ msgstr "le fichier source 
 msgid "unable to exec mksplit"
 msgstr "impossible d'exécuter mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -4573,9 +4580,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4632,7 +4639,7 @@ msgid "try deleting %s"
 msgstr "tentative de suppression de %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "impossible d'ouvrir %s : %s"
@@ -4659,7 +4666,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossible de fermer %s après lecture : %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossible de fermer %s : %s"
@@ -4679,12 +4686,12 @@ msgstr "
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s : échec du déverrouillage de %s : %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Impossible d'obtenir la valeur ENOENT depuis %s : %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4694,7 +4701,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4754,89 +4761,89 @@ msgstr ""
 "spécifier\n"
 "--package et --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "deux modes spécifiés : %s et --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s a besoin d'un paramètre détournement-vers"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "détournement-vers ne peut pas contenir de retour chariot"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s a besoin d'un paramètre <paquet>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "le paquet ne peut pas contenir de retour chariot"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s a besoin d'un paramètre <répertoire>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "option « %s » inconnue"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "impossible d'ouvrir le fichier des détournements : %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "altname manque"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "paquet manque"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s demande un seul paramètre"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "le nom de fichier « %s » n'est pas absolu"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "le fichier ne doit pas contenir de retour chariot"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Impossible de détourner des répertoires"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Conservation de « %s »"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "« %s » entre en conflit avec « %s »"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Ajout de « %s »"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4847,7 +4854,7 @@ msgstr ""
 "  lors de la suppression de « %s »\n"
 "  « %s » trouvé"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4858,37 +4865,37 @@ msgstr ""
 "  lors de la suppression de « %s »\n"
 "  « %s » trouvé"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Suppression de « %s »"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Pas de détournement « %s », aucun supprimé"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "erreur interne - mode « %s » incorrect"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "analyse impossible sur l'ancien nom « %s » : %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "analyse impossible sur le nouveau nom « %s » : %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erreur lors de la vérification de « %s » : %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4897,52 +4904,52 @@ msgstr ""
 "le renommage implique l'écrasement de « %s » avec\n"
 "  un fichier différent « %s », ce n'est pas autorisé"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renommage : suppression de l'ancien lien dupliqué « %s » : %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renommage : renommage de « %s » en « %s » : %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "création de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "écriture de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fermeture de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "suppression de l'ancien diversions-old : %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "écriture du nouveau diversions-old : %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installation des nouvelles diversions : %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erreur interne : %s corrompu : %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4950,7 +4957,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4990,107 +4997,107 @@ msgstr ""
 "  --help                   afficher ce message d'aide.\n"
 "  --version                afficher la version.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "pas de mode spécifié"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add a besoin de quatre paramètres"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "utilisateur %s illégal"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "utilisateur %s non existant"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "groupe %s illégal"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "groupe %s non existant"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "mode %s illégal"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "suppression du / final"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Une dérogation pour « %s » existe déjà, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "mais --force a été spécifié, donc sera ignoré."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "abandon"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "avertissement : --update spécifié, mais %s n'existe pas"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "échec de chown sur %s : %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "échec de chmod sur %s : %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Pas de forçage présent."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "avertissement : --update est inutile pour --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "impossible d'ouvrir le fichier des permissions (statoverride) : %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Forçage multiples pour « %s », abandon"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr ""
 "impossible d'ouvrir le nouveau fichier des permissions (statoverride) : %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "erreur de suppression de statoverride-old : %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "erreur pendant la création du nouveau statoverride-old : %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "erreur d'installation du nouveau statoverride : %s"
@@ -5319,7 +5326,7 @@ msgstr "impossible de lire %s
 msgid "dbg: %s"
 msgstr "dbg : %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5329,8 +5336,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5350,7 +5357,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5411,95 +5418,36 @@ msgstr ""
 "  --help                   afficher ce message d'aide.\n"
 "  --version                afficher la version.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "paramètre inconnu « %s »"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install a besoin de <lien> <nom> <chemin> <priorité>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "la priorité doit être un entier"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s a besoin de <nom> <chemin>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s a besoin de <nom>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave a besoin de <lien> <nom> <chemin>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "le nom secondaire (« slave ») %s est dupliqué"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "le lien secondaire (« slave ») %s est dupliqué"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "le nom %s est à la fois principal et secondaire"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "le lien %s est à la fois principal et secondaire"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"a besoin de --display, --config, --set, --install, --remove, --all, --remove-"
-"all ou --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave n'est autorisé qu'avec --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "%s secondaire dupliqué"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "lien secondaire identique au lien principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "lien secondaire dupliqué %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "chemin dupliqué %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "priorité %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5508,66 +5456,124 @@ msgstr ""
 "L'alternative pour %s pointe sur %s - qui n'a pas été trouvé. Suppression de "
 "la liste des alternatives."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pas d'alternatives pour %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - l'état est %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " le lien pointe actuellement sur %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " le lien est actuellement absent"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lien non lisible - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorité %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " lien secondaire %s : %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Aucune version disponible."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "La « meilleure » version actuelle est %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "paramètre inconnu « %s »"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install a besoin de <lien> <nom> <chemin> <priorité>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "la priorité doit être un entier"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s a besoin de <nom> <chemin>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s a besoin de <nom>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave a besoin de <lien> <nom> <chemin>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "le nom secondaire (« slave ») %s est dupliqué"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "le lien secondaire (« slave ») %s est dupliqué"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "le nom %s est à la fois principal et secondaire"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "le lien %s est à la fois principal et secondaire"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"a besoin de --display, --config, --set, --install, --remove, --all, --remove-"
+"all ou --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave n'est autorisé qu'avec --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configuration de la sélection automatique pour %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossible de supprimer %s : %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5576,7 +5582,7 @@ msgstr ""
 "%s a été changé (manuellement ou par un script).\n"
 "Bascule vers des mises à jour manuelles uniquement."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5588,71 +5594,71 @@ msgstr ""
 "-\n"
 "voir « man ln »)."
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renommage du lien %s de %s en %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossible de renommer %s en %s : %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom de lien secondaire %s dupliqué"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Abandon du lien secondaire obsolète %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossible d'ouvrir %s en écriture : %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5661,38 +5667,38 @@ msgstr ""
 "Avertissement : %s est censé être un lien symbolique vers %s\n"
 " (ou non existant) ; cependant, échec de readlink : %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "impossible de garantir l'inexistence de %s : %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "impossible d'installer %s en tant que %s : %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Conservation de %s (%s) pointant sur %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Mise à jour de %s (%s) pointant sur %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5701,13 +5707,13 @@ msgstr ""
 "avertissement : %s est censé être un lien symbolique secondaire vers\n"
 "%s ou ne pas exister ; cependant, échec de readlink : %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Suppression de %s (%s), non approprié avec %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5716,7 +5722,7 @@ msgstr ""
 "Il n'y a qu'un programme fournissant %s (%s).\n"
 "Rien à configurer.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5729,44 +5735,53 @@ msgstr ""
 "  Sélection    Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Utilisation de « %s » pour fournir « %s »."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossible de trouver l'alternative « %s »."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erreur d'écriture sur la sortie standard : %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "retour chariot absent après %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problème grave : %s"
+
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s : impossible d'exécuter « gzip -dc »"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s : impossible d'exécuter « bzip2 -dc »"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s : échec de l'exécution de bzip2 %s"
diff --git a/po/gl.po b/po/gl.po
index 53b1f1ce..c682538d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-08-18 09:52+0200\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -57,72 +57,57 @@ msgstr "Erro do sistema número %d"
 msgid "Signal no.%d"
 msgstr "Sinal número %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: non se puido executar gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: erro interno de gzip: \"%s\""
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: non se puido executar gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: erro interno de bzip2: \"%s\""
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: non se puido executar bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompresión"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: erro interno de gzip: lectura: \"%s\""
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: erro interno de gzip: escritura: \"%s\""
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: erro interno de gzip: léronse %i e escribíronse %i"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: non se puido executar gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: erro interno de bzip2: lectura: \"%s\""
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: erro interno de bzip2: escritura: \"%s\""
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: erro interno de bzip 2: léronse %i e escribíronse %i"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: non se puido executar bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresión"
@@ -168,7 +153,7 @@ msgstr "non se pode explorar o directorio de actualizacións \"%.255s\""
 msgid "failed to remove incorporated update file %.255s"
 msgstr "non se puido borrar o ficheiro de actualizacións incorporado %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "non se pode crear \"%.255s\""
@@ -920,30 +905,30 @@ msgstr "Falla a chave de peche no formato\n"
 msgid "failed to realloc for variable buffer"
 msgstr "non se puido facer realloc para o buffer variable"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  xa desapareceu"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro ao ler da canle de dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "erro ao estabrecer as marcas de tempo de \"%.255s\""
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro ao estabrecer o propietario de \"%.255s\""
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro ao estabrecer os permisos de \"%.255s\""
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -952,16 +937,16 @@ msgstr ""
 "téntase sobrescribir \"%.250s\", que é a versión desviada de \"%.250s\"%.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paquete: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "non se pode atopar \"%.255s\" (que se ía instalar)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -970,28 +955,28 @@ msgstr ""
 "non se pode limpar o barullo que rodea a \"%.255s\" antes de instalar outra "
 "versión"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "non se pode atopar o \"%.255s\" restaurado antes de instalar outra versión"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "o arquivo contiña un obxecto \"%.255s\" de tipo 0x%x descoñecido"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "A substituír os ficheiros do paquete antigo %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituíronse por ficheiros do paquete instalado %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -999,90 +984,90 @@ msgstr ""
 "téntase sobrescribir o directorio \"%.250s\" do paquete %.250s con algo que "
 "non é un directorio"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "téntase sobrescribir \"%.250s\", que tamén está no paquete %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "leuse e omitiuse o ficheiro \"%.255s\""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "back-end dpkg-deb durante \"%.255s\""
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro ao pechar ou gravar en \"%.255s\""
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro ao crear a canle \"%.255s\""
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erro ao crear o dispositivo \"%.255s\""
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro ao crear a ligazón dura \"%.255s\""
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro ao crear a ligazón simbólica \"%.255s\""
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro ao estabrecer o propietario da ligazón simbólica \"%.255s\""
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro ao crear o directorio \"%.255s\""
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "non se pode apartar \"%.255s\" para instalar a nova versión"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "non se pode ler a ligazón \"%.255s\""
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "non se pode facer unha copia da ligazón simbólica \"%.255s\""
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "non se pode cambiar o propietario da copia da ligazón simbólica \"%.255s\""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "non se pode facer unha copia da ligazón simbólica \"%.255s\" antes de "
 "instalar a nova versión"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "non se pode instalar unha nova versión de \"%.255s\""
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1091,7 +1076,7 @@ msgstr ""
 "dpkg: aviso - ignóranse os problemas de dependencias co borrado de %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1100,7 +1085,7 @@ msgstr ""
 "dpkg: aviso - a considerar a desconfiguración do paquete esencial\n"
 " %s, para permitir a eliminación de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1109,7 +1094,7 @@ msgstr ""
 "dpkg: non, %s é esencial, non se ha desconfigurar para\n"
 " permitir a eliminación de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1118,23 +1103,23 @@ msgstr ""
 "dpkg: non, non se pode eliminar %s (--auto-deconfigure ha axudar):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: a considerar a eliminación de %s en favor de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s non está instalado correctamente - ignóranse tódalas dependencias del.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: pode terse problemas para eliminar %s, xa que fornece %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1143,17 +1128,22 @@ msgstr ""
 "dpkg: o paquete %s precisa dunha reinstalación, pero hase eliminar como "
 "pide.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: o paquete %s precisa dunha reinstalación, non se ha eliminar.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: si, hase eliminar %s en favor de %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1162,75 +1152,75 @@ msgstr ""
 "dpkg: respecto a %s que contén %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paquetes con conflictos - non se instala %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: aviso - a ignorar o conflicto, hase continuar igualmente\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive precisa de alomenos un argumento de ruta"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "non se puido executar \"find\" para --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "non se puido abrir a canle de find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "erro ao ler da canle de find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "erro ao pechar a canle de find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "a execución de \"find\" para --recursive voltou o erro %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "buscouse, pero non se atopou ningún paquete (ficheiros que encaixan con *."
 "deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 "--%s precisa de alomenos un argumento de ficheiro de arquivo de paquete"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "A escoller o paquete %s anteriormente deseleccionado.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "A omitir o paquete deseleccionado %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "A versión %.250s de %.250s xa está instalada, omítese.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - aviso: a desactualizar %.250s de %.250s a %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Non se ha desactualizar %.250s da versión %.250s a %.250s, omítese.\n"
@@ -1617,110 +1607,117 @@ msgstr ""
 msgid "unable to check for existence of `%.250s'"
 msgstr "non se pode comprobar a existencia de \"%.250s\""
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depende de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pre-depende de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomenda "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " suxire "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " rompe "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " ten conflictos con "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " suxire "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " mellora "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s hase eliminar.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s hase desconfigurar.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s hase instalar, pero é a versión %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero é a versión %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempaquetado, pero non se configurou.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero é a versión %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ten de última versión configurada %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s está %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fornece %.250s pero hase eliminar.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fornece %.250s pero hase desconfigurar.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fornece %.250s pero está %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s non está instalado.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) hase instalar.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versión %.250s) está %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fornece %.250s e hase instalar.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s fornece %.250s e está %s.\n"
@@ -2608,7 +2605,7 @@ msgstr "non se puido abrir \"%i\" para fluxo"
 msgid "unexpected eof before end of line %d"
 msgstr "fin de ficheiro inesperada antes da fin da liña %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "precísase dunha opción de acción"
@@ -2685,6 +2682,10 @@ msgstr "  O paquete %s, que fornece %s, non está instalado.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  O paquete %s non está instalado.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depende de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; nembargantes:\n"
@@ -2884,10 +2885,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "non se atopou outro ficheiro novo \"%.250s\""
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: aviso - o ficheiro antigo \"%.250s\" é o mesmo que varios ficheiros "
 "novos (\"%.250s\" e \"%.250s\")"
@@ -3371,26 +3372,31 @@ msgstr "--forget-old-unavail non toma ningún argumento"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - erro: %s (\"%s\") non contén ningún díxito\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build precisa dun argumento de directorio"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build toma dous argumentos como máximo"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "non se pode comprobar a existencia do arquivo \"%.250s\""
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "o destino é un directorio - non se pode omitir a comprobación do ficheiro de "
 "control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3399,47 +3405,47 @@ msgstr ""
 "dpkg-deb: aviso, non se comproba o contido da área de control.\n"
 "dpkg-deb: constrúese un paquete descoñecido en \"%s\".\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "o nome do paquete ten caracteres que non son alfanuméricos minúsculos ou \"-"
 "+.\""
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "aviso, \"%s\" contén o valor de prioridade definido polo usuario \"%s\"\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "aviso, \"%s\" contén o campo definido polo usuario \"%s\"\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d erros no ficheiro de control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: a construír o paquete \"%s\" en \"%s\".\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "o directorio de control ten uns permisos %03lo incorrectos (deben estar "
 "entre 0755 e 0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "o script de mantedor \"%.50s\" non é un ficheiro normal ou ligazón simbólica"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3448,17 +3454,17 @@ msgstr ""
 "o script de mantedor \"%.50s\" ten uns permisos %03lo incorrectos (deben "
 "estar entre 0555 e 0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "non se atopa o script de mantedor \"%.50s\""
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 "recibiuse unha cadea baleira de fgets ao ler os ficheiros de configuración"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3466,120 +3472,120 @@ msgstr ""
 "aviso, o nome do ficheiro de configuración \"%.50s...\" é longo de máis ou "
 "falla o retorno de carro final\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 "aviso, o ficheiro de configuración \"%s\" contén espazos en branco ao final\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "o ficheiro de configuración \"%.250s\" non aparece no paquete"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "non se atopa o ficheiro de configuración \"%.250s\""
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "aviso, o ficheiro de configuración \"%s\" non é un ficheiro normal\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "erro ao ler o ficheiro de ficheiros de configuración"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "erro ao abrir o ficheiro de ficheiros de configuración"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignóranse %d avisos sobre o(s) ficheiros(s) de control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "non se puido sacar do buffer \"%.255s\""
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "non se puido cambiar a \"%.255s\""
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "non se puido cambiar a .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "non se puido executar tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "non se puido crear o ficheiro temporal (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "non se puido abrir o ficheiro temporal (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "non se puido borrar o ficheiro temporal (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "non se atopou o ficheiro temporal (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "non se puido retroceder no ficheiro temporal (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "non se puido crear o ficheiro temporal (datos)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "non se puido abrir o ficheiro temporal (datos), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "non se puido borrar o ficheiro temporal (datos), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "non se puido executar find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "non se puido gravar o nome do ficheiro na canle de tar (datos)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Erro interno, tipo de compresión \"%i\" descoñecido"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "non se puido retroceder no ficheiro temporal (datos)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (datos)"
 
@@ -3664,24 +3670,24 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "non se entende a versión %.250s do arquivo, obteña un dpkg-deb máis moderno"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "omítense datos do membro de %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "o ficheiro \"%.250s\" contén o membro de datos %.*s que non se entende, "
 "déixase"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "o ficheiro \"%.250s\" contén dous membros de control, déixase"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3690,16 +3696,16 @@ msgstr ""
 " novo paquete Debian, versión %s.\n"
 " tamaño %ld bytes: arquivo de control= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "lonxitude da información de control"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "o arquivo ten unha lonxitude de control mal formatada \"%s\""
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3708,15 +3714,15 @@ msgstr ""
 " antigo paquete Debian, versión %s.\n"
 " tamaño %ld bytes: arquivo de control= %zi, arquivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "erro ao reservar memoria para a variable \"ctrlarea\""
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "área de control"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3725,65 +3731,65 @@ msgstr ""
 "dpkg-deb: semella que o arquivo quedou corrompido\n"
 "dpkg-deb:    por se ter descargado en modo ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" non é un arquivo de formato Debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "non se puido obter a posición actual no ficheiro"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "non se puido estabrecer a posición actual no ficheiro"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "non se puido abrir o descritor de canle \"1\" para pegar"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "non se puido escribir en gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "non se puido pechar gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "non se puido chamar a lseek para a porción de ficheiros do arquivo"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "non se puido gravar na canle da copia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "non se puido pechar a canle da copia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "non se puido crear o directorio"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "non se puido cambiar ao directorio despois de o crear"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "non se puido cambiar ao directorio"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "non se puido executar tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s precisa dun argumento de nome de ficheiro .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3792,12 +3798,12 @@ msgstr ""
 "--%s precisa dun directorio destino.\n"
 "¿Pode ser que teña que empregar dpkg --install?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s toma como moito dous argumentos (.deb e directorio)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma só un argumento (nome de ficheiro .deb)"
@@ -3954,7 +3960,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3965,7 +3971,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opcións:\n"
@@ -4003,7 +4010,7 @@ msgstr ""
 "Escriba dpkg --help para axuda sobre instalación e desinstalación de "
 "paquetes."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compresión \"%s\" descoñecido"
@@ -4396,9 +4403,9 @@ msgstr "o ficheiro de orixe \"%.250s\" non é un ficheiro normal"
 msgid "unable to exec mksplit"
 msgstr "non se pode executar mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "%s de Debian, versión %s.\n"
@@ -4411,9 +4418,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4469,7 +4476,7 @@ msgid "try deleting %s"
 msgstr "probe a borrar %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "non se pode abrir %s: %s"
@@ -4496,7 +4503,7 @@ msgid "unable to close %s after read: %s"
 msgstr "non se pode pechar %s trala lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "non se pode pechar %s: %s"
@@ -4516,12 +4523,12 @@ msgstr "non se puido instalar %s; hase deixar coma %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: non se pode desbloquear %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Non se pode obter o valor ENOENT de %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4531,7 +4538,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4585,89 +4592,89 @@ msgstr ""
 "Ao eliminar deben encaixar --package ou --local e --divert se se indican.\n"
 "Os scripts de preinst/postrm deberían especificar --package e --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "especificáronse dous modos: %s e --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s precisa dun argumento que indique onde desviar"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "o destino do desvío non pode conter saltos de liña"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s precisa dun argumento de nome de paquete"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "o nome do paquete non pode conter saltos de liña"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa dun argumento de directorio"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción \"%s\" descoñecida"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "non se puido abrir o ficheiro de desvíos: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "falla o nome alternativo"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "falla o nome do paquete"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s precisa dun só argumento"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "o nome de ficheiro \"%s\" non é absoluto"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "o nome do ficheiro non pode conter saltos de liña"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Non se poden desviar directorios"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Déixase \"%s\""
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" choca con \"%s\""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "A engadir \"%s\""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4678,7 +4685,7 @@ msgstr ""
 "  ao eliminar \"%s\"\n"
 "  atopouse \"%s\""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4689,37 +4696,37 @@ msgstr ""
 "  ao eliminar \"%s\"\n"
 "  atopouse \"%s\""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "A eliminar \"%s\""
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Non existe o desvío \"%s\", non se eliminou ningún"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "erro interno - modo \"%s\" incorrecto"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "non se atopa o nome antigo \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "non se atopa o novo nome \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao comprobar \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4728,52 +4735,52 @@ msgstr ""
 "o cambio de nome supón sobrescribir \"%s\" co\n"
 "  ficheiro diferente \"%s\", non se permite"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: cambio do nome de \"%s\" a \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creación do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escritura do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "peche do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "eliminación do antigo ficheiro diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "creación do novo ficheiro diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalación de novos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s está corrompido: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4781,7 +4788,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4817,106 +4824,106 @@ msgstr ""
 "  --help                   amosa esta mensaxe de axuda.\n"
 "  --version                amosa a versión.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "non se especificou un modo"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add precisa de catro argumentos"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "usuario %s non válido"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "usuario %s non existente"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "grupo %s non válido"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "grupo %s non existente"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "modo %s non válido"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "omítese o \"/\" ao final"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Xa existe unha substitución para \"%s\", "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "pero indicouse --force, así que se ha ignorar."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "a abortar"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "aviso: indicouse --update pero %s non existe"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "non se puido cambiar o propietario de %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "non se puido cambiar os permisos de %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Non hai unha substitución presente."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "aviso: --update é inútil con --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "non se pode abrir o ficheiro statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Existen varias substitucións para \"%s\", abórtase"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "non se pode abrir o novo ficheiro statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "erro ao eliminar o ficheiro statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "erro ao crear o novo ficheiro statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "erro ao instalar o novo ficheiro statoverride: %s"
@@ -5138,7 +5145,7 @@ msgstr "non se pode ler %s: %d"
 msgid "dbg: %s"
 msgstr "depuración: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5148,8 +5155,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5169,7 +5176,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5225,95 +5232,36 @@ msgstr ""
 "  --help                   amosa esta mensaxe de axuda.\n"
 "  --version                amosa a versión.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "argumento \"%s\" descoñecido"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install precisa dos argumentos de ligazón, nome, ruta e prioridade"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "a prioridade ten que ser un número enteiro"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s precisa dos argumentos de nome e ruta"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s precisa do argumento de nome"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave precisa dos argumentos de ligazón, nome e ruta"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "nome de escravo %s duplicado"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "ligazón escrava %s duplicada"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "o nome %s é primario e escravo ao mesmo tempo"
-
-#: scripts/update-alternatives.pl:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"precísase de --display, --config, --set, --install, --remove, --all, --"
-"remove-all ou -auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "só se admite --slave con --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "a ligazón escrava é igual á ligazón principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "ligazón escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "ruta %s duplicada"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioridade %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5322,66 +5270,124 @@ msgstr ""
 "A alternativa de %s apunta a %s, que non se atopou. Elimínase da lista de "
 "alternativas."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Non hai alternativas para %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - o estado é %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " a ligazón apunta a %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " a ligazón está ausente"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ligazón ilexible - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Non hia ningunha versión dispoñible."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A versión \"mellor\" actual é %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "argumento \"%s\" descoñecido"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install precisa dos argumentos de ligazón, nome, ruta e prioridade"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "a prioridade ten que ser un número enteiro"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s precisa dos argumentos de nome e ruta"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s precisa do argumento de nome"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave precisa dos argumentos de ligazón, nome e ruta"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "nome de escravo %s duplicado"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "ligazón escrava %s duplicada"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "o nome %s é primario e escravo ao mesmo tempo"
+
+#: scripts/update-alternatives.pl:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"precísase de --display, --config, --set, --install, --remove, --all, --"
+"remove-all ou -auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "só se admite --slave con --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A estabrecer a selección automática de %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "non se pode eliminar %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5390,7 +5396,7 @@ msgstr ""
 "%s cambiou (manualmente ou mediante un script).\n"
 "Cámbiase a só actualizacións manuais."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5400,71 +5406,71 @@ msgstr ""
 "s ...\n"
 "(Pode modificar as ligazóns vostede se o prefire - consulte \"man ln\")."
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, 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:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, 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:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligazón escrava %s duplicado"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descargar a ligazón escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperarse dunha anterior actualización fallida de %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "non se pode abrir %s para escritura: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5473,38 +5479,38 @@ msgstr ""
 "aviso: suponse que %s é unha ligazón simbólica a %s\n"
 "  (ou que non existe); nembargantes, non se puido ler a ligazón: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "non se pode asegurar que %s non exista: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "non se pode instalar %s coma %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Déixase %s (%s) apuntando a %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "A actualizar %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5513,13 +5519,13 @@ msgstr ""
 "aviso: suponse que %s é unha ligazón simbólica escrava a\n"
 "  %s, ou que non existe; nembargantes, non se puido ler a ligazón: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "A eliminar %s (%s); non é apropiado con %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5528,7 +5534,7 @@ msgstr ""
 "Só hai un programa que forneza %s\n"
 "(%s). Non hai nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5541,48 +5547,57 @@ msgstr ""
 "  Selección    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "A empregar \"%s\" para fornecer \"%s\"."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non se pode atopar a alternativa \"%s\"."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na saída estándar: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falla un salto de liña despois de %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: non se puido executar gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: non se puido executar bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: non se puido executar bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "non se pode crear %.250s"
 
diff --git a/po/hu.po b/po/hu.po
index dbf5b22a..bc7dbc11 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-21 23:19+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -61,72 +61,57 @@ msgstr "Rendszerhiba - %d"
 msgid "Signal no.%d"
 msgstr "Szignál - %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: sikertelen gzip %s futtatás"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: belső gzip hiba: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: sikertelen gzip -dc futtatás"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: belső bzip2 hiba: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: sikertelen bzip2 -dc futtatás"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: kicsomagolás"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: belső gzip hiba: olvasás: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: belső gzip hiba: írás: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: belső gzip hiba: olvasás(%i) != írás(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: sikertelen gzip %s futtatás"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: belső bzip2 hiba: olvasás: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: belső bzip2 hiba: írás: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: belső bzip2 hiba: olvasás(%i) != írás(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: sikertelen bzip2 %s futtatás"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: tömörítés"
@@ -147,12 +132,16 @@ msgstr "sikertelen írás hashreport közben"
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "Az updates könyvtárban lévő `%.250s' fájl neve túl hosszú (hossz=%d, max=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"Az updates könyvtárban lévő `%.250s' fájl neve túl hosszú (hossz=%d, max=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr "Az updates könyvtár eltérő hosszú fájlneveket tartalmaz (%d és %d is)"
 
 #: lib/dbmodify.c:77
@@ -165,9 +154,7 @@ msgstr "nem tudom átnézni az updates könyvtárat: `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nem tudom törölni a beépített %.255s fájlt"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' nem hozható létre"
@@ -256,7 +243,8 @@ msgstr "a status fájlon a pufferelés beállítása sikertelen"
 #: lib/dump.c:307
 #, c-format
 msgid "failed to write %s record about `%.50s' to `%.250s'"
-msgstr "nem sikerült %s rekord kiírása a következőről: \"%.50s\" ide: \"%.250s\""
+msgstr ""
+"nem sikerült %s rekord kiírása a következőről: \"%.50s\" ide: \"%.250s\""
 
 #: lib/dump.c:315
 #, c-format
@@ -417,7 +405,8 @@ msgstr "gyökér vagy üres könyvtár konffájlként listázva"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr "`%s' mező, hiányzó csomagnév vagy torlódás annak helyén"
 
 #: lib/fields.c:340
@@ -465,8 +454,7 @@ msgstr ""
 "`%s' mező, hivatkozás erre: `%.255s':\n"
 " a verzió érték nem-alfanumerikussal kezdődik, szóköz javasolt"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s' mező, hivatkozás erre: `%.255s': a verzió `%c'-t tartalmaz"
@@ -516,8 +504,7 @@ msgstr "a dpkg állapot adatbázis lezárása sikertelen"
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc hiba (%ld bytes)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc hiba (%ld bytes)"
@@ -560,8 +547,7 @@ msgstr "%s alfolyamat %d hibakóddal kilépett"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: figyelem - %s megölve, a halált okozó jel: (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ""
 
@@ -670,8 +656,7 @@ msgstr "beállító fájl olvasási hiba: `%.255s'"
 msgid "error closing configuration file `%.255s'"
 msgstr "hiba e beállító fájl lezárásakor: `%.255s'"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Hiba a cfgfilename memóriafoglalásakor"
 
@@ -840,7 +825,8 @@ msgstr "alfanumerikussal kell kezdődnie"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "`%c' karakter tilos (csak betűk, számok és `%s' karakterek adhatók meg)"
+msgstr ""
+"`%c' karakter tilos (csak betűk, számok és `%s' karakterek adhatók meg)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -890,168 +876,174 @@ msgstr "A lezáró kapocs hiányzik a formátumban\n"
 msgid "failed to realloc for variable buffer"
 msgstr "nem tudtam újrafoglalni a változó puffer számára"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... már eltűnt!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "hiba a dpkg-deb cső olvasásakor"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "nem sikerült beállítani `%.255s' időpecsétjét"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "nem sikerült beállítani `%.255s' tulajdonosát"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "nem sikerült beállítani `%.255s' jogait"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "kísérlet `%.255s' felülírására, ami a(z) `%.250s'%.10s%.100s%.10s eltérített verziója."
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"kísérlet `%.255s' felülírására, ami a(z) `%.250s'%.10s%.100s%.10s eltérített "
+"verziója."
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (csomag: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "nem találom `%.255s'-t (melyet telepítenem kéne)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
 msgstr ""
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "az archívum `%.255s' objektuma ismeretlen 0x%x típusú"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Fájlok cseréje a régi %s csomagban...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "A telepített %s csomag fájljai cserélték ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "`%.250s' könyvtár felülírási kísérlete a csomagban: %.250s más fájltípussal"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"`%.250s' könyvtár felülírási kísérlete a csomagban: %.250s más fájltípussal"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
-msgstr "`%.250s' felülírási kísérlete, mely az alábbi csomagban is szerepel: %.250s"
+msgstr ""
+"`%.250s' felülírási kísérlete, mely az alábbi csomagban is szerepel: %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr ""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "háttér dpkg-deb `%.255s' során"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "hiba az alábbi lezárásakor/írásakor: `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "hiba az alábbi cső létrehozásakor: `%.255s'"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "hiba az alábbi eszköz létrehozásakor: `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "hiba az alábbi merev lánc létrehozásakor: `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "hiba az alábbi jelképes lánc létrehozásakor: `%.255s'"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "hiba az alábbi jlánc tulajdonosának beállításakor: `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "hiba az alábbi könyvtár létrehozásakor: `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nem tudom elmozdítani `%.255s'-t az új változat telepítéséhez"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "meghiúsult e lánc olvasása: `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "nem tudom elkészíteni `%.255s' mentő láncát az új változat telepítése előtt"
+msgstr ""
+"nem tudom elkészíteni `%.255s' mentő láncát az új változat telepítése előtt"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nem tudom telepíteni `%.255s' új verzióját"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
-"dpkg: figyelem - nem veszem figyelembe a(z) %s eltávolításával járó függőségi gondokat:\n"
+"dpkg: figyelem - nem veszem figyelembe a(z) %s eltávolításával járó "
+"függőségi gondokat:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1060,7 +1052,7 @@ msgstr ""
 "dpkg: figyelem - egy lényeges csomag: %s dekonfigurálását\n"
 " választottad %s eltávolításáért.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1069,7 +1061,7 @@ msgstr ""
 "dpkg: nem, %s lényeges, nem dekonfigurálom\n"
 " %s eltávolításáért.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1078,37 +1070,44 @@ msgstr ""
 "dpkg: nem, nem tudom törölni %s-t (--auto-deconfigure segít):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s törlése %s javára...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s nincs rendben telepítve - kihagyom, amik tőle függenek.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: gond lehet %s törlésekor, mivel %s-t adja ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
 msgstr "dpkg %s újratelepítést kíván, de kérésedre törlöm.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg %s újratelepítést kíván, nem törlöm.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: igen, törlöm %s-t %s javára.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1117,80 +1116,85 @@ msgstr ""
 "dpkg: %s miatt %s-t is tartalmazza:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "ütköző csomagok - nem telepítem %.250s-t"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: figyelem - az ütközések figyelmen kívül hagyásával folytatom !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive legalább 1 ösvény argumentumot vár"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "find futtatása a --recursive-hoz sikertelen"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "sikertelen fdopen a find csőhöz"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "hiba a find cső olvasásakor"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "hiba a find cső lezárásakor"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "a find a --recursive-hoz kezeletlen hibával tért vissza: %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "kerestem, de nem leltem csomagokat (*.deb fájlokat)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s legalább 1 csomagarchívum fájl argumentumot vár"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Új csomag kiválasztása: %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Kijelöletlen %s csomag átugrása.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "E csomag %.250s veziója: %.250s már telepített, átugrom.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - figyelem: %.250s öregbítése innen: %.250s ide: %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "Nem fogom örgegbíteni %.250s-t %.250s verzióról erre: %.250s, kihagyom.\n"
+msgstr ""
+"Nem fogom örgegbíteni %.250s-t %.250s verzióról erre: %.250s, kihagyom.\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "nem lehet törölni `%.250s' újonnan telepített verzióját a biztonsági másolat újratelepítéséhez"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"nem lehet törölni `%.250s' újonnan telepített verzióját a biztonsági másolat "
+"újratelepítéséhez"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1266,8 +1270,7 @@ msgstr "Beállítás: %s (%s) ...\n"
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "nem érhető el az új terjesztési beállítófájl: %.250s"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "nem érhető el a jelenleg telepített beállítófájl: %.250s"
@@ -1291,7 +1294,8 @@ msgstr "dpkg: %s: figyelem - a régi `%.250s' mentés törlése meghiúsult: %s\
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: figyelem - nem sikerült átnevezni `%.250s'-t erre: `%.250s': %s\n"
+msgstr ""
+"dpkg: %s: figyelem - nem sikerült átnevezni `%.250s'-t erre: `%.250s': %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1306,7 +1310,9 @@ msgstr ""
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: figyelem - nem sikerült `%.250s' eltávolítása (felülírás előtt): %s\n"
+msgstr ""
+"dpkg: %s: figyelem - nem sikerült `%.250s' eltávolítása (felülírás előtt): %"
+"s\n"
 
 #: src/configure.c:267
 #, c-format
@@ -1359,8 +1365,11 @@ msgstr ""
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
-msgstr "dpkg: %s: figyelem - `%.250s' konffájl nem sima fájl vagy jlánc (= `%s')\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: figyelem - `%.250s' konffájl nem sima fájl vagy jlánc (= `%s')\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1386,8 +1395,7 @@ msgstr "`%.250s' új terjesztői beállítófájl módja nem állítható be"
 msgid "failed to run %s (%.250s)"
 msgstr "%s futtatása meghiúsult (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "nem jött a héj"
 
@@ -1540,118 +1548,122 @@ msgstr ""
 msgid "unable to check for existence of `%.250s'"
 msgstr "nem ellenőrizhető `%.250s' léte"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " függőségek: "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " elő-függőségek: "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " ajánlások:"
 
-#: src/depcon.c:156
-msgid " breaks "
-msgstr ""
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " tippek:"
 
-#: src/depcon.c:157
-msgid " conflicts with "
-msgstr " ütközések:"
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
+msgstr "%s (alfolyamat): %s\n"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " tippek:"
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " ütközések:"
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " kiterjeszti "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s eltávolításra jelölt.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s dekonfigurálásra jelölt.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s telepítésre jelölt, de verziója %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s telepített, de verziója %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s is kibontva, de sosem került konfigurálásra.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s kibontva, de verziója %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s legutolsó beállított verziója %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s adja %.250s-t de törlésre jelölt.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s adja %.250s-t de dekonfra jelölt.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s adja %.250s-t de %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nincs telepítve.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (%.250s verzió) telepítésre jelölt.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (%.250s verzió) %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s adja %.250s-t és telepítésre jelölt.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s adja %.250s-t és %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(nincs leírás)"
 
@@ -1680,7 +1692,8 @@ msgid ""
 "configuring them the first time.  The configuration should be retried using\n"
 "dpkg --configure <package> or the configure menu option in dselect:\n"
 msgstr ""
-"Az alábbi csomagok fél-beállítottak, valószínűleg az 1. beállítás alatti hibák miatt.\n"
+"Az alábbi csomagok fél-beállítottak, valószínűleg az 1. beállítás alatti "
+"hibák miatt.\n"
 "A beállítás újra megkísérelhető a dpkg --configure <package> paranccsal\n"
 "vagy egy aptitude-hoz, dselect-hez hasonló\n"
 "felülettel:\n"
@@ -1734,7 +1747,9 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "a dpkg nincs bejegyezve telepítettként, az epoch támogatás nem ellenőrizhető !\n"
+msgstr ""
+"a dpkg nincs bejegyezve telepítettként, az epoch támogatás nem "
+"ellenőrizhető !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1759,15 +1774,16 @@ msgid "--print-architecture does not take any argument"
 msgstr "a --print-architecture nem vár argumentumot"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "a --compare-versions 3 argumentumot vár: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"a --compare-versions 3 argumentumot vár: <version> <relation> <version>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "rossz --compare-versions reláció"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: '%s' verzió nyelvtana hibás: %s\n"
@@ -1782,8 +1798,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: sikertelen memóriafoglalás a sikertelen csomagok listájának új eleméhez."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: sikertelen memóriafoglalás a sikertelen csomagok listájának új "
+"eleméhez."
 
 #: src/errors.c:91
 #, c-format
@@ -1805,8 +1824,11 @@ msgstr "%s vissza volt fogva, de kérésedre mégis feldolgozom\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "Visszafogásban lévő csomag: %s, nem módosítom. Használd a --force-hold-ot a felülbíráláshoz.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"Visszafogásban lévő csomag: %s, nem módosítom. Használd a --force-hold-ot a "
+"felülbíráláshoz.\n"
 
 #: src/errors.c:125
 msgid ""
@@ -1823,8 +1845,12 @@ msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
-msgstr "dpkg: Figyelmeztetés: nincs fájllista fájl e csomaghoz: `%.250s', feltételezem, hogy a csomagnak most nincsenek telepített fájljai\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
+msgstr ""
+"dpkg: Figyelmeztetés: nincs fájllista fájl e csomaghoz: `%.250s', "
+"feltételezem, hogy a csomagnak most nincsenek telepített fájljai\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -1869,7 +1895,8 @@ msgstr "nem sikerült kiüríteni a frissített fájllista fájlt e csomaghoz: %
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "nem sikerült szinkronizálni a frissített fájllista fájlt e csomaghoz: %s"
+msgstr ""
+"nem sikerült szinkronizálni a frissített fájllista fájlt e csomaghoz: %s"
 
 #: src/filesdb.c:257
 #, c-format
@@ -1934,8 +1961,7 @@ msgstr "váratlan EOF az eltérítésben [ii]"
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets üres füzért adott az eltérítésből [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "eltérítés fájlban túl hosszú sor vagy EOF [ii]"
 
@@ -2000,7 +2026,8 @@ msgid ""
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
 msgstr ""
 "%d kért program nincs a PATH-ban megadott helyeken.\n"
-"Megj.: a root felhasználó PATH változója általában tartalmazza a /usr/local/sbin, a /usr/sbin és a /sbin könyvtárakat."
+"Megj.: a root felhasználó PATH változója általában tartalmazza a /usr/local/"
+"sbin, a /usr/sbin és a /sbin könyvtárakat."
 
 #: src/help.c:179
 #, c-format
@@ -2027,9 +2054,7 @@ msgstr "`%.250s' futtatási jogainak beállítása sikertelen"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "nem lelem telepített %s `%.250s' szkriptjét"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "sikertelen futtatás: %s"
@@ -2086,8 +2111,7 @@ msgstr "elláncolás"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "törlés"
 
@@ -2096,8 +2120,7 @@ msgstr "törlés"
 msgid "failed to %s `%%.255s'"
 msgstr "meghiúsult ehhez: %s `%%.250s'"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "az rm futtatása a tisztításhoz nem sikerült"
 
@@ -2106,10 +2129,7 @@ msgstr "az rm futtatása a tisztításhoz nem sikerült"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian `%s' csomagkezelő program %s verzió.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2120,10 +2140,7 @@ msgstr ""
 "változatát a másolási feltételekért.  NINCS garancia.\n"
 "L. a %s  --licence opciót a szerzői jogi és licenc részletekért.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2170,11 +2187,13 @@ msgstr ""
 "  -P|--purge          <csomag> ... | -a|--pending\n"
 "  --get-selections   [<minta> ...] A kiválasztottakat a stdout-ra küldi.\n"
 "  --set-selections                 Kiválaszt a stdin-ről.\n"
-"  --clear-selections               Nélkülözhető csomagok kiválasztását törli.\n"
+"  --clear-selections               Nélkülözhető csomagok kiválasztását "
+"törli.\n"
 "  --update-avail <Packages-fájl>   Elérhető csomagok adatait cseréli\n"
 "  --merge-avail <Packages-fájl>    Merge with info from file.\n"
 "  --clear-avail                    Törli az elérhetőségi adatokat.\n"
-"  --forget-old-unavail             Feledi a telepítetlen elérhetetlen csomagokat.\n"
+"  --forget-old-unavail             Feledi a telepítetlen elérhetetlen "
+"csomagokat.\n"
 "  -s|--status <csomag> ...         Részletes csomag állapot kiírás.\n"
 "  -p|--print-avail <csomag> ...    Részletes elérhető verzió kiírás.\n"
 "  -L|--listfiles <csomag> ...      Csomag(ok) által adott fájlok.\n"
@@ -2187,10 +2206,7 @@ msgstr ""
 "  -Dh|--debug=help                 Súgó mutatása hibakereséskor.\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2211,7 +2227,8 @@ msgid ""
 "\n"
 msgstr ""
 "Használd a dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile -t az archívumokon (gépeld be ezt: %s --help).\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile -t az archívumokon (gépeld be "
+"ezt: %s --help).\n"
 "\n"
 
 #: src/main.c:99
@@ -2231,16 +2248,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2252,13 +2274,16 @@ msgid ""
 msgstr ""
 "Lehetőségek:\n"
 "  --admindir=<könyvtár>      A <könyvtár> használata %s helyett\n"
-"  --root=<könyvtár>          Telepítés az adott gyökerű alternatív rendszerre\n"
+"  --root=<könyvtár>          Telepítés az adott gyökerű alternatív "
+"rendszerre\n"
 "  --instdir=<könyvtár>       Telepítési gyökér módosítása az admin könyvtár\n"
 "                               módosítása nélkül\n"
 "  -O|--selected-only         A telepítésre/frissítésre ki nem választott\n"
 "                               csomagok kihagyása\n"
 "  -E|--skip-same-version     Azonos telepített verziójú csomagok kihagyása\n"
-"  -G|--refuse-downgrade      A telepítettnél korábbi verziójú csomagok kihagyása  -B|--auto-deconfigure      Telepítés, még ha más csomag törötté is válik\n"
+"  -G|--refuse-downgrade      A telepítettnél korábbi verziójú csomagok "
+"kihagyása  -B|--auto-deconfigure      Telepítés, még ha más csomag törötté "
+"is válik\n"
 "  --no-debsig                Ne próbálja ellenőrizni a csomagaláírásokat\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Csak kiírja mi történne - de nem teszi meg\n"
@@ -2277,22 +2302,28 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "A --compare-versions kapcsoló összehasonlító operátorai:\n"
-" lt le eq ne ge gt       (üres verzió kezelése minden verziónál korábbiként);\n"
-" lt-nl le-nl ge-nl gt-nl (üres verzió kezelése minden verziónál későbbiként);\n"
-" < << <= = >= >> >       (csak a control fájl szintaxisával való kompatibilitás\n"
+" lt le eq ne ge gt       (üres verzió kezelése minden verziónál "
+"korábbiként);\n"
+" lt-nl le-nl ge-nl gt-nl (üres verzió kezelése minden verziónál "
+"későbbiként);\n"
+" < << <= = >= >> >       (csak a control fájl szintaxisával való "
+"kompatibilitás\n"
 "                            miatt).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Használd a `aptitude' (vagy `dselect') felhasználó-barát csomag-kezelőket\n"
+msgstr ""
+"Használd a `aptitude' (vagy `dselect') felhasználó-barát csomag-kezelőket\n"
 
 #: src/main.c:141
 msgid ""
@@ -2301,23 +2332,24 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
 "A dpkg --help parancs adja a súgót csomagok telepítéséhez[*];\n"
 "A dselect parancs a dpkg csomagkezelő egy felhasználóbarátabb felülete;\n"
 "A dpkg -Dhelp a dpkg hibakereső értékeit adja;\n"
 "A dpkg --force-help a kényszerítő lehetőségeket;\n"
 "A dpkg-deb --help a *.deb fájlok kezeléséről súg;\n"
-"A dpkg --licence a GNU GPL szerinti szerzői jogi licencről és garanciahiányról szól[*].\n"
+"A dpkg --licence a GNU GPL szerinti szerzői jogi licencről és "
+"garanciahiányról szól[*].\n"
 "\n"
-"A [*]-gal jelölt lehetőségek nagy kimenetet írnak - használd a pipát a `less' vagy `more' parancson keresztül!"
+"A [*]-gal jelölt lehetőségek nagy kimenetet írnak - használd a pipát a "
+"`less' vagy `more' parancson keresztül!"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ütköző műveletek -%c (--%s) and -%c (--%s)"
@@ -2351,13 +2383,15 @@ msgstr ""
 "\n"
 "   szám   hiv. a forrásban  leírás\n"
 "      1   general           Általánosan hasznos folyamatinformációk\n"
-"      2   scripts           A karbantartó parancsfájlok meghívása és állapota\n"
+"      2   scripts           A karbantartó parancsfájlok meghívása és "
+"állapota\n"
 "     10   eachfile          Kimenet minden feldolgozott fájlhoz\n"
 "    100   eachfiledetail    Rengeteg kimenet minden feldolgozott fájlhoz\n"
 "     20   conff             Kimenet minden beállítófájlhoz\n"
 "    200   conffdetail       Rengeteg kimenet minden beállítófájlhoz\n"
 "     40   depcon            Függőségek és ütközések\n"
-"    400   depcondetail      Rengeteg kimenet a függőségekről és ütközésekről\n"
+"    400   depcondetail      Rengeteg kimenet a függőségekről és "
+"ütközésekről\n"
 "   1000   veryverbose       Rengeteg fecsegés pl. a dpkg/info könyvtárról\n"
 "   2000   stupidlyverbose   Őrült mennyiségű fecsegés\n"
 "\n"
@@ -2371,15 +2405,16 @@ msgstr "a --debug egy oktális argumentumot igényel"
 #: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr "nincs csomagnév az --ignore-depends vesszővel elválasztott listájában: `%.250s'"
+msgstr ""
+"nincs csomagnév az --ignore-depends vesszővel elválasztott listájában: `"
+"%.250s'"
 
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "Az --ignore-depends helyes csomagnevet követel. `%.250s' nem az; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
@@ -2395,23 +2430,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2420,32 +2460,41 @@ msgid ""
 msgstr ""
 "%s kényszerítési kapcsolói - probléma esetén a viselkedés irányítása:\n"
 "  figyelmeztet, de folytatja:  --force-<valami>,<valami>,...\n"
-"  leállás hibával:    --refuse-<valami>,<valami>,... | --no-force-<valami>,...\n"
+"  leállás hibával:    --refuse-<valami>,<valami>,... | --no-force-"
+"<valami>,...\n"
 " Kényszeríthető dolgok:\n"
 "  all                    Az összes kényszerítési lehetőség beállítása\n"
 "  auto-select [*]        Csomagok kijelölése telepítésre (eltávolításra)\n"
 "  downgrade [*]          Csomag helyettesítése egy alacsonyabb verzióval\n"
 "  configure-any          Minden csomag beállítása, amely segíthet ezen\n"
-"  hold                   Azonos csomagok feldolgozása még megtartás esetén is\n"
+"  hold                   Azonos csomagok feldolgozása még megtartás esetén "
+"is\n"
 "  bad-path               A PATH változóból fontos programok hiányoznak,\n"
 "                           problémák léphetnek fel\n"
-"  not-root               Megpróbálja telepíteni (eltávolítani) a csomagokat,\n"
+"  not-root               Megpróbálja telepíteni (eltávolítani) a "
+"csomagokat,\n"
 "                           akkor is, ha nem root\n"
-"  overwrite              Egy csomag fájljának felülírása egy másik csomagéval\n"
+"  overwrite              Egy csomag fájljának felülírása egy másik "
+"csomagéval\n"
 "  overwrite-diverted     Eltérített fájl felülírása egy el nem térített\n"
 "                           verzióval\n"
-"  bad-verify             Csomag telepítése akkor is, ha a hitelességellenőrzés\n"
+"  bad-verify             Csomag telepítése akkor is, ha a "
+"hitelességellenőrzés\n"
 "                           meghiúsul\n"
-"  depends-version [!]    Verziófüggőségi problémák figyelmeztetésekké alakítása\n"
-"  depends [!]            Minden függőségi probléma figyelmeztetésekké alakítása\n"
+"  depends-version [!]    Verziófüggőségi problémák figyelmeztetésekké "
+"alakítása\n"
+"  depends [!]            Minden függőségi probléma figyelmeztetésekké "
+"alakítása\n"
 "  confnew [!]            Kérdés nélkül mindig az új beállítófájlokat\n"
 "                           használja\n"
 "  confold [!]            Kérdés nélkül mindig a régi beállítófájlokat\n"
 "                           használja\n"
 "  confdef [!]            Az alapértelmezett beállítás használata az új\n"
 "                         beállítófájlokhoz, ne kérdezzen, ha van elérhető.\n"
-"                         Ha az alapértelmezés nem található, a program rákérdez,\n"
-"                         hacsak a confold vagy confnew kapcsolók egyike is meg\n"
+"                         Ha az alapértelmezés nem található, a program "
+"rákérdez,\n"
+"                         hacsak a confold vagy confnew kapcsolók egyike is "
+"meg\n"
 "                         nincs adva\n"
 "  confmiss [!]           Mindig telepítse a hiányzó beállítófájlokat\n"
 "  conflicts [!]          Ütköző csomagok telepítésének engedélyezése\n"
@@ -2468,14 +2517,11 @@ msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "sikertelen malloc az execbackend-ben"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "sikertelen strdup az execbackend-ben"
 
@@ -2506,10 +2552,7 @@ msgstr "`%i' nem nyitható meg az áramoltatásra"
 msgid "unexpected eof before end of line %d"
 msgstr "váratlan eof e sor vége előtt: %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "egy művelet opciót igényel"
@@ -2519,14 +2562,15 @@ msgstr "egy művelet opciót igényel"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "a --%s --pending nem fogad non-opcionális argumentumot"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "a --%s legalább 1 csomagnév argumentot vár"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
 msgstr "a csomagok sima nevét kell megadnod, nem az őket tartalmazó fájlokét"
 
 #: src/packages.c:150
@@ -2583,6 +2627,10 @@ msgstr "  `%s' csomag, mely %s-t adja nincs telepítve.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "   `%s' csomag nincs telepítve.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " függőségek: "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; ám:\n"
@@ -2756,8 +2804,12 @@ msgstr "dpkg: figyelem - nem törölhető a régi könyvtár: `%.250s': %s\n"
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg: figyelem - a régi konffájl: `%.250s' egy üres könyvtár volt (ezt most törlöm)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg: figyelem - a régi konffájl: `%.250s' egy üres könyvtár volt (ezt most "
+"törlöm)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2765,25 +2817,28 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "nem találom a másik `%.250s' új fájlt"
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
-msgstr "dpkg: figyelem - `%.250s' régi fájl új fájlokkal egyezik!  (`%.250s' és `%.250s')"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: figyelem - `%.250s' régi fájl új fájlokkal egyezik!  (`%.250s' és `"
+"%.250s')"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: figyelem - nem tudom %s a régi fájlt `%%.250s': %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "az info könyvtár nem olvasható"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "a csomag régi verziójában túl hosszú info fájlnév van, kezdete: `%.250s'"
+msgstr ""
+"a csomag régi verziójában túl hosszú info fájlnév van, kezdete: `%.250s'"
 
 #: src/processarc.c:766
 #, c-format
@@ -2838,11 +2893,14 @@ msgstr "nem tudom törölni az eltűnt `%.250s' kontroll info fájlt"
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "Kért=Ismeretlen/Telepít/Eltávolít/Töröl/Fog\n"
-"| Állapot=Nem/Telepített/Konfig-fájlok/Kibontatlan/Hibás-konfig/Félig-települt\n"
-"|/ Hib?=(nem)/Fog/Reinstallt-kért/X=mindkét-gond (Állapot,Hib: nagybetű=rossz)\n"
+"| Állapot=Nem/Telepített/Konfig-fájlok/Kibontatlan/Hibás-konfig/Félig-"
+"települt\n"
+"|/ Hib?=(nem)/Fog/Reinstallt-kért/X=mindkét-gond (Állapot,Hib: "
+"nagybetű=rossz)\n"
 
 #: src/query.c:164
 msgid "Name"
@@ -2856,9 +2914,7 @@ msgstr "Verzió"
 msgid "Description"
 msgstr "Leírás"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Nincs ilyen csomag: %s.\n"
@@ -2972,23 +3028,22 @@ msgstr ""
 "  -f|--showformat=<forma>          Más forma a --show opcióhoz.\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Formátum nyelvtan:\n"
 "  A formátum egy füzér, mely minden csomagra kimegy. A forma\n"
-"  szabvány escape sorokat is tartalmazhat, például: \\n"
-" (újsor), \\r (kocsi\n"
+"  szabvány escape sorokat is tartalmazhat, például: \\n (újsor), \\r (kocsi\n"
 "  vissza) vagy \\\\ (sima per). Csomag adatok a csomag\n"
 "  mezőire utaló változókkal szúrhatók be a ${var[;width]} szintaxis\n"
 "  által. A mezők jobbra igazítottak, ha a szélesség negatív, akkor\n"
@@ -3007,8 +3062,11 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - figyelem: átugrom a(z) %.250s csomag törlését, hisz' nincs telepítve.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - figyelem: átugrom a(z) %.250s csomag törlését, hisz' nincs "
+"telepítve.\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3063,14 +3121,16 @@ msgstr ""
 msgid "Removing %s ...\n"
 msgstr "Eltávolítás: %s ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - figyelem: a(z) %.250s törlésekor nem tudtam törölni a(z) `%.250s' könyvtárat: %s -  a könyvtár egy csatolási pont ?\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - figyelem: a(z) %.250s törlésekor nem tudtam törölni a(z) `%.250s' "
+"könyvtárat: %s -  a könyvtár egy csatolási pont ?\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "nem törölhető: `%.250s'"
@@ -3087,8 +3147,12 @@ msgstr "nem tudom törölni `%.250s' kontroll info fájlt"
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - figyelem: a(z) %.250s törlésekor a(z) `%.250s' könyvtár nem üres, így azt nem töröltem.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - figyelem: a(z) %.250s törlésekor a(z) `%.250s' könyvtár nem üres, így "
+"azt nem töröltem.\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3182,11 +3246,14 @@ msgstr "--%s pontosan 1 Packages fájl argumentumot vár"
 
 #: src/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
-msgstr "nem tudok hozzáférni a dpkg állapot területhez a tömeges available frissítéshez"
+msgstr ""
+"nem tudok hozzáférni a dpkg állapot területhez a tömeges available "
+"frissítéshez"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "a tömeges available frissítés a dpkg állapot területhez írási jogot igényel"
+msgstr ""
+"a tömeges available frissítés a dpkg állapot területhez írási jogot igényel"
 
 #: src/update.c:66
 #, c-format
@@ -3212,24 +3279,29 @@ msgstr "A --forget-old-unavail nem vár argumentumot"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - error: %s (`%s') nem tartalmaz számot\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "a --build egy könyvtár argumentumot vár"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "a --builds 2 argumentumot fogad"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "nem ellenőrizhető az alábbi archívum léte: `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "a cél egy könyvtár - nem mellőzhető a control fájl ellenőrzése"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3238,178 +3310,180 @@ msgstr ""
 "dpkg-deb: figyelem, nem ellenőrzőm az ellenőrző terület tartalmát.\n"
 "dpkg-deb: ismeretlen csomag építése itt: `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "a csomagnév kisbetűs alfanumerikus és `-+.'-tól eltérő karaktereket tartalmaz"
+msgstr ""
+"a csomagnév kisbetűs alfanumerikus és `-+.'-tól eltérő karaktereket tartalmaz"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "figyelem, `%s' felhasználói `%s' elsőbbségi értéket tartalmaz\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "figyelem, `%s' felhasználói `%s' mezőt tartalmaz\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d hiba az ellenőrző fájlban"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%s' csomag építése itt: `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
-msgstr "az ellenőrző könyvtárnak hibás %03lo jogai vannak (>=0755 és <=775 kell legyen)"
+msgstr ""
+"az ellenőrző könyvtárnak hibás %03lo jogai vannak (>=0755 és <=775 kell "
+"legyen)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "A karbantartói szkript (`%.50s') nem sima fájl vagy jelképes lánc"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "`%.50s' karbantartói szkript jogok hibásak (%03lo) (>=0555 és <=0775 kell)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"`%.50s' karbantartói szkript jogok hibásak (%03lo) (>=0555 és <=0775 kell)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "`%.50s' karbantartói szkript nem található"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "üres szöveg az fgets-ből a konffájl olvasásakor"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "figyelem, `%.50s...' konffájl név túl hosszú, vagy hiányzó végső újsor\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"figyelem, `%.50s...' konffájl név túl hosszú, vagy hiányzó végső újsor\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "úgy fest, `%.250s' konffájl nincs a csomagban"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "`%.250s' konffájl nem található"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "figyelem, `%s' konffájl nem sima fájl\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "hiba a conffiles fájl olvasásakor"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "hiba a conffiles fájl megnyitásakor"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: %d figyelmeztetés átlépése az ellenőrző fájl(ok)ról\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "sikertelen chdir ide: `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "nem tudtam a ../DEBIAN könyvtárba váltani"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "sikertelen tar -d futtatás"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "az ideiglenes fájl (vezérlő) létrehozása meghiúsult"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "az ideiglenes fájl (vezérlő) megnyitása meghiúsult, %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "az ideiglenes fájl (vezérlő) törlése meghiúsult, %s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "vezérlés"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "az ideiglenes fájl (vezérlő) fstat-olása meghiúsult"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "az ideiglenes fájl (vezérlő) visszaállítása meghiúsult"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "tmpfájl létrehozása sikertelen (adat)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "tmpfájl megnyitása sikertelen (adat), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "tmpfájl elláncolása sikertelen (adat), %s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "adatok"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "sikertelen find futtatás"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "fájlnév írás a tar csőbe (adatok) meghiúsult"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Belső hiba, `%i' tömörítő típus ismeretlen!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "az ideiglenes fájl (adatok) visszaállítása meghiúsult"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (adatok)"
 
@@ -3427,14 +3501,12 @@ msgstr "hibás %s olvasás e fájlból: %.255s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "`%.250s' hibás - %.250s hossz 0-kat tartalmaz"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "`%.250s' hibás - rossz szám (%d kód) ebben: %s"
@@ -3456,8 +3528,7 @@ msgstr "verziószám"
 msgid "between members"
 msgstr "tagok közt"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr "`%.250s' hibás - rossz bűvös szám az 1. fejléc végén"
@@ -3489,23 +3560,22 @@ msgstr "nincs . az archívum verziószámában"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "érthetetlen %.250s formájú archívum, újabb dpkg-deb kell"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "kihagyott tag adat innen: %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "A(z) `%.250s' fájl érthetetlen %.*s adattagot tartalmaz, feladom"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "A(z) `%.250s' fájl 2 ellenőrző tagot tartalmaz, feladom"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3514,16 +3584,16 @@ msgstr ""
 " új Debian csomag, %s verzió.\n"
 " méret: %ld bájt: ellenőrző archívum= %zi bájt.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "ellenőrző információ hossz"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "az archívum `%s' ellenőrző hossza rossz"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3532,15 +3602,15 @@ msgstr ""
 " régi Debian csomag, %s verzió.\n"
 " méret: %ld bájt: ellenőrző archívum= %zi, fő archívum: %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "a `ctrlarea' változó memória lefoglalása sikertelen"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "ellenőrző terület"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3549,67 +3619,65 @@ msgstr ""
 "dpkg-deb: úgy fest ez egy olyan archívum, amely az\n"
 "dpkg-deb:    ASCII módú letöltéstől megsérült\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nem Debian archívum"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "az adott fájl pozíció nem olvasható"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "az adott fájl pozíció nem állítható be"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "az `1' csőleíró megnyitása sikertelen a beszúrásban"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "írási hiba gzip -dc-be"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "sikertelen gzip -dc bezárás"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "sikertelen lseek rendszerhívás az archív részfájlokra"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "hiba a pipába íráskor másolásnál"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "pipa bezárás hiba a másoláskor"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "sikertelen könyvtár létrehozás"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "hiba a könyvtárba lépéskor létrehozása után"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "hiba a könyvtárváltáskor"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "hiba a tar futtatásakor"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s egy .deb fájlnév argumentmot vár"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3618,12 +3686,12 @@ msgstr ""
 "--%s egy célkönyvtárat igényel.\n"
 "Lehet, hogy a dpkg --install-t kell használnod ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 2 argumentumot fogad (.deb és könyvtár)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s csak 1 argumentumot fogad (.deb fájlnév)"
@@ -3665,7 +3733,8 @@ msgstr "dpkg-deb: `%.255s' nem tartalmaz `%.255s' ellenőrző összetevőt\n"
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "`%.255s' összetevő megnyitása (ebben: %.255s) váratlan módon meghiúsult"
+msgstr ""
+"`%.255s' összetevő megnyitása (ebben: %.255s) váratlan módon meghiúsult"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3777,7 +3846,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3786,8 +3855,10 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Lehetőségek:\n"
@@ -3796,7 +3867,8 @@ msgstr ""
 "  --old, --new                     Archívum formátum.\n"
 "  --nocheck                        Nincs ellenőrzés (rosszul készített\n"
 "                                     csomagok).\n"
-"  -z#                              Tömörítés szint beállítása a készítéshez.\n"
+"  -z#                              Tömörítés szint beállítása a "
+"készítéshez.\n"
 "  -Z<típus>                        Készítéshez használt tömörítő típus.\n"
 "                                     Lehetőségek: gzip, bzip2, nincs.\n"
 "\n"
@@ -3810,7 +3882,8 @@ msgid ""
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "\n"
-"Használd a `dpkg'-t csomagok telepítésére és eltávolítására a rendszerről, vagy\n"
+"Használd a `dpkg'-t csomagok telepítésére és eltávolítására a rendszerről, "
+"vagy\n"
 "az `aptitude'-ot (vagy `dselect'-t) a felhasználó-barát csomag kezeléshez.\n"
 "A `dpkg-deb --extract' által kibontott csomagok helytelenül települnek !\n"
 
@@ -3822,7 +3895,7 @@ msgstr ""
 "A dpkg-deb --help súg a *.deb fájlok kezeléséről;\n"
 "A dpkg --help súg csomagok telepítéséről/eltávolításáról dpkg-val."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ismeretlen tömörítés: `%s'!"
@@ -3884,7 +3957,8 @@ msgstr "Az alábbi fájl: `%.250s' sérült - a második tag nem adattag"
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "Az alábbi fájl: `%.250s' sérült - a részek száma rossz az idézett méretekhez"
+msgstr ""
+"Az alábbi fájl: `%.250s' sérült - a részek száma rossz az idézett méretekhez"
 
 #: dpkg-split/info.c:157
 #, c-format
@@ -3901,8 +3975,7 @@ msgstr "`%.250s' rész fájl fstat sikertelen"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "E fájl: `%.250s' hibás - túl rövid"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "nem megnyitható archívum rész fájl: `%.250s'"
@@ -4021,7 +4094,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4130,8 +4204,7 @@ msgstr "a --listq nem vár argumentumot"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Szemét fájlok maradtak a raktár könyvtárban:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "nem lelem `%.250s'-t"
@@ -4196,11 +4269,9 @@ msgstr "`%.250s' forrás fájl nem sima fájl"
 msgid "unable to exec mksplit"
 msgstr "a mksplit nem futtatható"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s %s verzió.\n"
@@ -4213,11 +4284,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4246,26 +4315,22 @@ msgstr ""
 "  --help       e súgó mutatása.\n"
 "  --version    verzió mutatása.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: figyelem - nem tudom kioldani %s-t: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: ismeretlen `%s' lehetőség"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: túl sok argumentum"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: sikertelen könyvtár zárás szerkesztéshez! %s"
@@ -4275,48 +4340,40 @@ msgstr "%s: sikertelen könyvtár zárás szerkesztéshez! %s"
 msgid "try deleting %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "%s megnyitása sikertelen: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "%s létrehozása sikertelen: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "%s írása sikertelen: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "%s olvasása sikertelen: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "nem tudom lezárni %s-t olvasás után: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nem tudom lezárni %s-t: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "nem tudom menteni a régi %s-t, feladom: %s"
@@ -4331,13 +4388,12 @@ msgstr "%s telepítése sikertelen; marad mint %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: nem tudom kioldani %s-t: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Nem kapok ENOENT értéket innen: %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4347,7 +4403,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4359,7 +4415,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4372,100 +4429,93 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "2 mód megadva: %s és --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s egy divert-to argumentumot vár"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nem tartalmazhat újsorokat"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s egy <csomag> argumentumot vár"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "csomag nem tartalmazhat újsorokat"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s egy <könyvtár> argumentumot vár"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ismeretlen `%s' lehetőség"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "nem megnyitható eltérítések: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "hiányzó altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "hiányzó csomag"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s 1 argumentumot vár"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" fájlnév nem abszolút"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "fájl nem tartalmazhat újsorokat"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Könyvtárak eltérítése sikertelen"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "`%s' elhagyása"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' ütközik ezzel: `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' hozzáadása"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4476,7 +4526,7 @@ msgstr ""
 "  `%s' eltávolításakor\n"
 "  `%s'-t találtam"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4487,37 +4537,37 @@ msgstr ""
 "  `%s' eltávolításakor\n"
 "  `%s'-t találtam"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "%s eltávolítása"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Nincs `%s' eltérítés, nem volt eltávolítás"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "belső hiba - rossz `%s' mód"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "a régi `%s' név nem található: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "az új `%s' név nem behatárolható: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "hiba `%s' ellenőrzésekor: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4526,53 +4576,52 @@ 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:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "átnevezés: `%s' átnevezése erre: `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new létrehozása: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new írása: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new lezárása: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "régi diversions-old eltávoltása: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "új diversions-old létrehozása: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "új eltérítések telepítése: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "belső hiba: %s rossz: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4580,7 +4629,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4615,107 +4664,106 @@ msgstr ""
 "  --help                   e súgó üzenet mutatása.\n"
 "  --version                verzió mutatása.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nincs mód megadva"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "a --add 4 argumentumot vár"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "szabálytalan %s felhasználó"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "nem létező %s felhasználó"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "szabálytalan %s csoport"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "nem létező %s csoport"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "tilos %s mód"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "/ leszedése"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\" egy felülbírálása már létezik, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "de --force miatt figyelmen kívül hagyom"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "törlés"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "figyelem: --update megadva, de %s nem létezik"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "sikertelen %s chown: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "sikertelen %s chmod: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Nincs felülbírálás."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "figyelem: a --update értelmetlen --remove esetén"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "nem megnyitható statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "\"%s\" többszöri felülbírálása, megszakítva"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "nem megnyitható új statoverride fájl: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "hiba a statoverride-old törlésekor: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "hiba az új statoverride-old létrehozásakor: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "hiba az új statoverride telepítésekor: %s"
@@ -4736,15 +4784,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4765,7 +4816,8 @@ msgstr ""
 "  --infodir=<könyvtár>     ugyanaz, mint a '--dir-file=<könyvtár>/dir'.\n"
 "  --info-dir=<könyvtár>    hasonló.\n"
 "  --keep-old               nem cserél bejegyzést és nem töröl üreseket.\n"
-"  --remove                 törli a <fájlnév> alapnévvel megadott bejegyzést.\n"
+"  --remove                 törli a <fájlnév> alapnévvel megadott "
+"bejegyzést.\n"
 "  --remove-exactly         törli a <fájlnév> bejegyzést.\n"
 "  --test                   teszt mód (nem végez műveletet).\n"
 "  --debug                  hiba mód (több információt mutat).\n"
@@ -4828,8 +4880,7 @@ msgstr ""
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: nincs %s fájl, %s másolat fájlt használom."
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: %s másolása ide: %s sikertelen, feladom: %s"
@@ -4929,7 +4980,7 @@ msgstr "%s olvasása sikertelen: %d"
 msgid "dbg: %s"
 msgstr "hbk: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4939,7 +4990,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4949,22 +5000,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -4977,162 +5031,162 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "ismeretlen %s argumentum"
-
-#: scripts/update-alternatives.pl:130
-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:132
-msgid "priority must be an integer"
-msgstr "az elsőbbség egész szám kell legyen"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s számára <név> és <ösvény> kell"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s számára <név> kell"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "a --slave követelményei: <lánc> <név> <ösvény>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "%s szolga név megkettőzött"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "%s szolga lánc megkettőzött"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "%s elsődleges és szolga név is"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "%s elsődleges és szolga lánc is"
-
-#: scripts/update-alternatives.pl:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "igénye --display, --config, --set, --install, --remove, --all, --remove-all vagy --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "a --slave csak --install mellett engedélyezett"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "kettős %s szolga"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "szolga lánc és %s fő lánc azonos"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "kettős %s szolga lánc"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "kettős %s ösvény"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "%s elsőbbség %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "%s választása erre mutat: %s - melyet nem leltem. Eltávolítom a választási listából."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"%s választása erre mutat: %s - melyet nem leltem. Eltávolítom a választási "
+"listából."
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nincs kiválasztás erre: %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - állapot: %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lánc most ide mutat: %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " lánc most hiányzik"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lánc olvashatatlan - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - %s elsőbbség"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " %s szolga: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nincs elérhető verzió."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A jelenlegi `legjobb' verzió: %s"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "ismeretlen %s argumentum"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "a --install követelményei: <lánc> <név> <ösvény> <elsőbbség>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "az elsőbbség egész szám kell legyen"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s számára <név> és <ösvény> kell"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s számára <név> kell"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "a --slave követelményei: <lánc> <név> <ösvény>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "%s szolga név megkettőzött"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "%s szolga lánc megkettőzött"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "%s elsődleges és szolga név is"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "%s elsődleges és szolga lánc is"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"igénye --display, --config, --set, --install, --remove, --all, --remove-all "
+"vagy --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "a --slave csak --install mellett engedélyezett"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s automata kijelölésének beállítása."
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nem tudom törölni %s-t: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5141,7 +5195,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:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5150,131 +5204,120 @@ msgstr ""
 "%s elérhető verziói ellenőrzése, láncok frissítése itt: %s ...\n"
 "(Magad is módosíthatod ezeket - lásd a `man ln'-t.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, 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:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nem tudom átnevezni %s-t erre: %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s szolga lánc név megkettőzött"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Elavult %s szolga lánc átugrása (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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"
+msgstr ""
+"Az automatikus frissítésekhez való visszatéréshez használd az `update-"
+"alternatives --auto %s'-t"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nem tudom megnyitni %s-t írásra: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, 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:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nem biztos, hogy %s nem létezik: %s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, 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:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Meghagyom %s (%s)-t ezen: %s"
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Frissítem %s (%s)-t erre: %s"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, 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:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5283,7 +5326,7 @@ msgstr ""
 "Csak 1 program adja ezt: %s\n"
 "(%s). Nincs beállítandó.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5296,53 +5339,63 @@ msgstr ""
 "  Kijelölés    Választás\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' használata `%s' számára."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nem találom a `%s' kiválasztást"
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "hiba stdout íráskor: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "újsorok tilosak az update-alternatives fájlokban (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "eof hiba %s olvasásakor ehhez: %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "hiányzó új sor ezután: %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Komoly gond: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: sikertelen gzip -dc futtatás"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: sikertelen bzip2 -dc futtatás"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: sikertelen bzip2 %s futtatás"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "%.250s létrehozása sikertelen"
+
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
 #~ msgstr "`%s' mező, hivatkozás erre: `%.255s': ` ' a verzióban"
+
 #~ msgid "%s: can't open %s: %s"
 #~ msgstr "%s: %s nem nyitható meg: %s"
+
 #~ msgid "%s: error writing %s: %s"
 #~ msgstr "%s: hiba %s írásakor: %s"
 
@@ -5355,40 +5408,57 @@ msgstr "Komoly gond: %s"
 #~ msgstr ""
 #~ "%s: hibás feldolgozás: %s (--%s):\n"
 #~ " %s\n"
+
 #~ msgid "--admindir needs a directory argument"
 #~ msgstr "a --admindir 1 könyvtár argumentumot vár"
+
 #~ msgid "--remove needs a single argument"
 #~ msgstr "a --remove 1 argumentumot vár"
+
 #~ msgid "--truename needs a single argument"
 #~ msgstr "a --truename 1 argumentumot vár"
+
 #~ msgid "dpkg-divert: %s"
 #~ msgstr "dpkg-divert: %s"
+
 #~ msgid "You need --help"
 #~ msgstr "--help kell neked"
+
 #~ msgid "--remove needs one arguments"
 #~ msgstr "a --remove 1 argumentumot vár"
+
 #~ msgid "--admindir needs a <directory> argument"
 #~ msgstr "a --admindir egy <könyvtár> argumentumot vár"
+
 #~ msgid "failed to open %s: %s"
 #~ msgstr "nem tudtam megnyitni %s-t: %s"
+
 #~ msgid "unable to install %s as %s"
 #~ msgstr "nem sikerült telepíteni %s-t mint %s"
+
 #~ msgid "version a has bad syntax: %s\n"
 #~ msgstr "az a verzió nyelvtana hibás: %s\n"
+
 #~ msgid "  Package "
 #~ msgstr "  E csomag: "
+
 #~ msgid " which provides "
 #~ msgstr " mely az alábbit adja: "
+
 #~ msgid " is to be removed.\n"
 #~ msgstr " eltávolításra jelölt.\n"
+
 #~ msgid " on system is "
 #~ msgstr " a rendszeren"
+
 #~ msgid " is not installed.\n"
 #~ msgstr " nincs telepítve.\n"
+
 #~ msgid " to: %s\n"
 #~ msgstr " ide: %s\n"
+
 #~ msgid "fgetpos failed"
 #~ msgstr "sikertelen fgetpos"
+
 #~ msgid "fsetpos failed"
 #~ msgstr "sikertelen fsetpos"
-
diff --git a/po/id.po b/po/id.po
index 67e48f9f..a86693f6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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."
@@ -64,72 +64,57 @@ msgstr "Kesalahan sistem no. %d"
 msgid "Signal no.%d"
 msgstr "Sinyal no. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: gagal menjalankan perintah 'gzip %s'"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: ada kesalahan gzip internal: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: gagal menjalankan perintah 'gzip -dc'"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: ada kesalahan bzip2 internal: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: gagal menjalankan perintah 'bzip2 -dc'"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresi"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: ada kesalahan gzip internal: read: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: ada kesalahan gzip internal: write: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: kesalahan gzip internal: read(%i) != write (%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: gagal menjalankan perintah 'gzip %s'"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: ada kesalahan bzip2 internal: read: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: ada kesalahan bzip2 internal: write: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: ada kesalahan bzip2 internal: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: gagal menjalankan perintah 'bzip2 %s'"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresi"
@@ -175,7 +160,7 @@ msgstr "tidak dapat memindai direktori 'updates' `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "gagal membuang berkas terbaru %.255s yang tidak dapat digabungkan"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "tidak bisa membuat `%.255s'"
@@ -905,30 +890,30 @@ msgstr "kurung tutup tidak ada dalam format\n"
 msgid "failed to realloc for variable buffer"
 msgstr "gagal melakukan 'realloc' pada penyangga variabel"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... telah menghilang!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "ada kesalahan saat membaca pipe dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "Ada kesalahan penyetelan tanda waktu pada `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "Ada kesalahan penyetelan kepemilikan pada `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "Ada kesalahan penyetelan perizinan pada `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -937,16 +922,16 @@ msgstr ""
 "mencoba menimpa `%.250s', yang merupakan versi `%.250s'%.10s%.100s%.10s yang "
 "dialihkan"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr "(paket: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "tidak bisa melakukan 'stat' pada `%.255s' (yang ingin saya pasang)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -954,27 +939,27 @@ msgid ""
 msgstr ""
 "gagal membersihkan kekacauan sekitar `%.255s' sebelum memasang versi lain."
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "gagal mengembalikan 'stat' pada `%.255s' sebelum memasang versi lain "
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arsip berisi obyek `%.255s' dari jenis 0x%x yang tak dikenal"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Sedang mengganti berkas-berkas dalam paket lama %s ... \n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Digantikan oleh berkas-berkas dalam paket terinstal %s ... \n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -982,88 +967,88 @@ msgstr ""
 "sedang mencoba menimpa direktori `%.250s' dalam paket %.250s dengan non-"
 "direktori"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "sedang mencoba menimpa `%.250s', yang juga ada dalam paket %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "gobble file yang digantikan `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb saat `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "Ada kesalahan menutup/menulis `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "Ada kesalahan saat membuat pipe `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "Ada kesalahan saat membuat piranti `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ada kesalahan saat membuat 'hard link' `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "ada kesalahan saat membuat link simbolik `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "ada kesalahan saat menyetel kepemilikan symlink `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "Ada kesalahan saat membuat direktori `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "tidak bisa memindahkan `%.255s' untuk memasang versi yang baru"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "tidak bisa membaca link `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "tidak bisa membuat symlink cadangan untuk `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "tidak dapat melakukan 'chown' symlink cadangan untuk `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "tidak bisa membuat link cadangan untuk `%.255s' sebelum memasang versi baru"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "tidak bisa memasang versi baru dari `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1073,7 +1058,7 @@ msgstr ""
 "s: \n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1082,7 +1067,7 @@ msgstr ""
 "dpkg: PERINGATAN - sedang mencoba dekonfigurasi paket-paket sangat penting \n"
 "%s, agar dapat membuang paket %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1091,7 +1076,7 @@ msgstr ""
 "dpkg: tidak, %s sangat penting, tidak akan melakukan dekonfigurasi \n"
 "agar dapat membuang paket %s. \n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1101,26 +1086,26 @@ msgstr ""
 "membantu): \n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: sedang mencoba membuang %s sehubungan dengan paket %s ... \n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s tidak terpasang dengan benar - abaikan semua ketergantungan dengan paket "
 "ini. \n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: mungkin ada masalah saat membuang %s, karena paket ini menyediakan %"
 "s ... \n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1129,17 +1114,22 @@ msgstr ""
 "dpkg: paket %s perlu dipasang ulang, tetapi akan dibuang sesuai dengan "
 "permintaan Anda. \n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: paket %s perlu dipasang ulang, tidak akan dibuang.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ya, akan membuang %s sehubungan dengan paket %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1148,77 +1138,77 @@ msgstr ""
 "dpkg: memandang %s berisi %s: \n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paket-paket berbenturan - tidak akan memasang %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: PERINGATAN - abaikan paket yang bentrok, proses dilanjutkan! \n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive perlu sedikitnya satu argumen path"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "gagal menjalankan perintah 'find' untuk --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "Gagal melakukan fdopen pipe 'find'"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "Ada kesalahan saat membaca pipe 'find'"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "Ada kesalahan saat menutup pipe 'find'"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "perintah 'find' untuk --recursive menghasilkan kesalahan yang tak teratasi: %"
 "i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "telah dicari, tetapi tidak menemukan suatu paket pun (berkas-berkas yang "
 "cocok dengan *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s butuh sedikitnya satu argumen berkas arsip paket"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Memilih paket %s yang sebelumnya tidak dipilih. \n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Abaikan paket yang tak dipilih: %s. \n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versi %.250s dari paket %.250s telah dipasang, dilewati.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - PERINGATAN: menurunkan versi paket %.250s dari %.250s ke %.250s. \n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1595,110 +1585,117 @@ msgstr "Ada EOF pada stdin di prompt 'conffile'"
 msgid "unable to check for existence of `%.250s'"
 msgstr "tidak bisa memeriksa keberadaan `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " bergantung pada "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pra-syarat awalnya "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " menganjurkan "
 
-#: src/depcon.c:156
-msgid " breaks "
-msgstr ""
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " menyarankan "
 
-#: src/depcon.c:157
-msgid " conflicts with "
-msgstr " bentrok dengan "
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
+msgstr "%s (subproses): %s \n"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " menyarankan "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " bentrok dengan "
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " meningkatkan "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "   %.250s akan dibuang.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "   %.250s akan didekonfigurasi.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s akan dipasang, tetapi versi %.250s\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s terpasang, tetapi versi %.250s. \n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "   %.250s telah dibuka, tetapi belum pernah dikonfigurasi.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "   %.250s telah dibuka, tetapi versi %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "   %.250s versi terakhir yang terkonfigurasi adalah %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s adalah %s. \n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "   %.250s menyediakan %.250s tetapi akan dibuang.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "   %.250s menyediakan %.250s tetapi akan didekonfigurasi.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s menyediakan %.250s, tetapi %s. \n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s tidak terpasang. \n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "   %.250s (versi %.250s) akan dipasang.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versi %.250s) adalah %s. \n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "   %.250s menyediakan %.250s dan akan dipasang.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s menyediakan %.250s dan %s. \n"
@@ -2508,7 +2505,7 @@ msgstr "tidak dapat membuka `%i' untuk stream"
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"
@@ -2585,6 +2582,10 @@ msgstr "Paket `%s' tidak terpasang. \n"
 msgid "  Package %s is not installed.\n"
 msgstr "Paket `%s' tidak terpasang. \n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " bergantung pada "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; tetapi:\n"
@@ -2782,7 +2783,7 @@ msgstr "tidak bisa melakukan 'fstat' berkas 'part' `%.250s'"
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: %s: PERINGATAN - conffile `%.250s' bukan sebuah berkas normal atau "
 "symlink (= `%s') \n"
@@ -3255,25 +3256,30 @@ msgstr "--forget-old-unavail tidak butuh argumen"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - ADA KESALAHAN: %s (`%s') tidak berisi suatu digit pun.\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build butuh sebuah argumen direktori"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build butuh paling banyak dua argumen"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "tidak dapat memeriksa keberadaan arsip `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "target adalah direktori - tidak dapat melompati pemeriksaan berkas 'control'"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3282,43 +3288,43 @@ msgstr ""
 "dpkg-deb: PERINGATAN, tidak memeriksa isi dari area 'control'.\n"
 "dpkg-deb: membuat paket tak dikenal di dalam `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "nama paket berisi karakter yang bukan huruf kecil atau `-+'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "PERINGATAN, `%s' berisi nilai Prioritas definisi pengguna `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "PERINGATAN, `%s' berisi ruas `%s' definisi pengguna \n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d kesalahan dalam berkas 'control'"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: membuat paket `%s' di dalam `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "direktori 'control' memiliki izin yang buruk: %03lo (seharusnya >= 0755 dan "
 "<=0755)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "skrip pengelola `%.250s' bukan berkas biasa atau symlink"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3327,16 +3333,16 @@ msgstr ""
 "skrip pengelola `%.50s' memiliki izin yang buruk: %03lo (seharusnya >=0555 "
 "dan <=0755)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "skrip pengelola `%.50s' tidak bisa di-'stat'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "string kosong dari fgets yang membaca 'conffiles'"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3344,119 +3350,119 @@ msgstr ""
 "PERINGATAN, nama berkas 'conffile' `%.50s...' terlalu panjang, atau tidak "
 "ada baris-barunya\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, fuzzy, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "PERINGATAN, berkas 'conffile' `%s' bukan berkas biasa\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "berkas 'conffile' `%.250s' tidak ada dalam paket"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "conffile '%.250s' tidak bisa di-'stat'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "PERINGATAN, berkas 'conffile' `%s' bukan berkas biasa\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "ada kesalahan saat membaca berkas 'conffile'"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "ada kesalahan saat membuka berkas 'conffile'"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: mengabaikan %d peringatan tentang berkas 'control'\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "tidak bisa mematikan penyangga (buffer) `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "Gagal melakukan chdir ke `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "gagal melakukan chdir ke .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "gagal menjalankan perintah 'tar -cf'"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "gagal membuat berkas tmp (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "gagal membuka berkas tmp (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "Gagal membuang link berkas tmp (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "gagal melakukan 'fstat' pada berkas tmp (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "gagal mengulangi berkas tmp (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "gagal membuat berkas tmp (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "gagal membuka berkas tmp (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "gagal membuang link berkas tmp (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "gagal menjalankan perintah 'find'"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "gagal menulis nama berkas ke pipe tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Ada kesalahan internal, jenis_kompresi `%i' tidak dikenal!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "Gagal mengulangi berkas tmp (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3533,22 +3539,22 @@ msgstr "arsip tidak mengandung titik pada nomor versinya"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "versi arsip %.250s tidak dipahami, gunakan dpkg-deb terbaru"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "abaikan data anggota dari %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "berkas `%.250s' berisi anggota data %.*s yang tak dipahami, menyerah"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "berkas `%.250s' berisi dua anggota 'control', menyerah"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3557,17 +3563,17 @@ msgstr ""
 " paket baru debian, versi %s.\n"
 " besar %ld byte: arsip 'control'= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 #, fuzzy
 msgid "control information length"
 msgstr "panjang informasi ctrl"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, fuzzy, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arsip mengandung 'ctrl len' `%s' yang salah bentuk"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3576,17 +3582,17 @@ msgstr ""
 " paket lama debian, versi %s.\n"
 " besar %ld byte: arsip 'control'= %zi, arsip utama= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 #, fuzzy
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Ada kesalahan mengalokasikan memory untuk cfgfilename"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 #, fuzzy
 msgid "control area"
 msgstr "area ctrl"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3595,66 +3601,66 @@ msgstr ""
 "dpkg-deb: berkas tampaknya seperti suatu arsip yang telah \n"
 "dpkg-deb:      terkorupsi saat diambil dengan modus ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.250s' bukan suatu arsip berformat debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 #, fuzzy
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "gagal melakukan 'fdopen p1' saat menempelkan "
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "gagal menulis ke gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "gagal menutup gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "gagal melakukan 'syscall lseek' untuk memberkasi sebahagian arsip"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "gagal menulis ke pipe dalam penyalinan"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "gagal menutup pipe dalam penyalinan"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "gagal membuat direktori"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "gagal melakukan 'chdir' ke direktori setelah membuatnya"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "gagal melakukan chdir ke direktori"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "gagal menjalankan perintah tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s butuh suatu argumen nama berkas .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3663,12 +3669,12 @@ msgstr ""
 "--%s butuh suatu direktori target.\n"
 "Mungkin Anda harus menggunakan dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s butuh paling banyak dua argumen (.deb dan direktori)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s hanya butuh satu argumen (nama berkas .deb)"
@@ -3819,7 +3825,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3840,7 +3847,7 @@ msgstr ""
 "Ketik dpkg-deb --help untuk panduan dalam manipulasi berkas *.deb;\n"
 "Ketik dpkg --help untuk panduan dalam pemasangan dan pembuangan paket."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "jenis kompresi `%s' tidak dikenal!"
@@ -4199,9 +4206,9 @@ msgstr "berkas sumber `%.250s' bukan suatu berkas biasa"
 msgid "unable to exec mksplit"
 msgstr "gagal menjalankan perintah mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "'versi 'backend' arsip paket"
@@ -4212,9 +4219,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 #, fuzzy
 msgid ""
 "\n"
@@ -4264,7 +4271,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, fuzzy, perl-format
 msgid "unable to open %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
@@ -4291,7 +4298,7 @@ msgid "unable to close %s after read: %s"
 msgstr "gagal menutup setelah membaca: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
@@ -4311,19 +4318,19 @@ msgstr "tidak bisa memasang `%.250s' sebagai `%.250s'"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: gagal menjalankan perintah 'gzip %s'"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4353,93 +4360,93 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, fuzzy, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--build butuh sebuah argumen direktori"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, fuzzy, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s butuh sedikitnya satu argumen nama paket"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Paket `%s' tidak berisi suatu berkas pun!\n"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build butuh sebuah argumen direktori"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "pilihan --%s tak dikenal"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, fuzzy, perl-format
 msgid "cannot open diversions: %s"
 msgstr "gagal membuka berkas 'diversions'"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 #, fuzzy
 msgid "missing altname"
 msgstr "%s hilang"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 #, fuzzy
 msgid "missing package"
 msgstr "%s hilang"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, fuzzy, perl-format
 msgid "--%s needs a single argument"
 msgstr "--build butuh sebuah argumen direktori"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, fuzzy, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "conffile '%.250s' tidak bisa di-'stat'"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "tidak dapat membaca direktori 'info'"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, fuzzy, perl-format
 msgid "Leaving `%s'"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4447,7 +4454,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4455,96 +4462,96 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, fuzzy, perl-format
 msgid "Removing `%s'"
 msgstr "Sedang membuang %s ... \n"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, fuzzy, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "%s: ada kesalahan gzip internal: read: `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, fuzzy, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "tidak dapat melakukan 'stat' pada `%.255s' (dalam `%.255s')"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, fuzzy, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "tidak dapat melakukan 'stat' pada `%.255s' (dalam `%.255s')"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, 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:260
+#: scripts/dpkg-divert.pl:275
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "Ada kesalahan membaca 'diversions' [i]"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "Dialihkan oleh %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "Dialihkan oleh %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "Ada kesalahan membaca 'diversions' [i]"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "tidak bisa memasang versi baru dari `%.255s'"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: ada kesalahan gzip internal: write: `%s'"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4564,108 +4571,108 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build butuh sebuah argumen direktori"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 #, fuzzy
 msgid "aborting"
 msgstr "PERINGATAN"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, fuzzy, perl-format
 msgid "failed to chown %s: %s"
 msgstr "Gagal menjalankan %s (%.250s)"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, fuzzy, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "Gagal menjalankan perintah %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, fuzzy, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "gagal membuka berkas 'statoverride'"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, fuzzy, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "gagal membuka berkas 'statoverride'"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, fuzzy, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "Ada kesalahan saat membuat piranti `%.255s'"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4856,14 +4863,14 @@ msgstr "tidak bisa menjalankan perintah %s"
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4884,7 +4891,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4904,292 +4911,291 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, fuzzy, perl-format
-msgid "unknown argument `%s'"
-msgstr "jenis kompresi `%s' tidak dikenal!"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr ""
-
-#: scripts/update-alternatives.pl:136
-#, fuzzy, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s butuh suatu argumen nama berkas .deb"
-
-#: scripts/update-alternatives.pl:141
-#, fuzzy, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s tidak perlu argumen"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr ""
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, fuzzy, perl-format
 msgid "duplicate slave %s"
 msgstr "nilai ganda untuk ruas `%s'"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, fuzzy, perl-format
 msgid "duplicate slave link %s"
 msgstr "nilai ganda untuk ruas `%s'"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 #, fuzzy
 msgid "No versions available."
 msgstr "(tidak ada keterangan yang tersedia)"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, fuzzy, perl-format
+msgid "unknown argument `%s'"
+msgstr "jenis kompresi `%s' tidak dikenal!"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s butuh suatu argumen nama berkas .deb"
+
+#: scripts/update-alternatives.pl:261
+#, fuzzy, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s tidak perlu argumen"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr ""
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Sedang membuka paket %s (dari %s) ... \n"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "gagal melakukan 'stat' %s `%.250s'"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "gagal membuka berkas sumber %.250s'"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "tidak bisa menjalankan %s baru"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "tidak bisa memasang `%.250s' sebagai `%.250s'"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5198,45 +5204,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ada kesalahan saat membaca %s dari %.255s"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "berkas `%.250s' terkorupsi - baris-baru hilang setelah %.250s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: gagal menjalankan perintah 'gzip -dc'"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: gagal menjalankan perintah 'bzip2 -dc'"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: gagal menjalankan perintah 'bzip2 %s'"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "Tidak bisa membuat %.250s"
 
diff --git a/po/it.po b/po/it.po
index 66f834a7..e8e449e0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -90,72 +90,57 @@ msgstr "Errore di sistema n.%d"
 msgid "Signal no.%d"
 msgstr "Segnale n.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: impossibile eseguire gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: errore interno di gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: impossibile eseguire gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: errore interno di bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: impossibile eseguire bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompressione"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: errore interno di gzip: read: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: errore interno: write: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: errore interno di gzip: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: impossibile eseguire gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: errore interno di bzip2: read: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: errore interno di bzip2: write: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: errore interno di bzip2: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: impossibile eseguire bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressione"
@@ -201,7 +186,7 @@ msgstr "impossibile fare lo scan della directory updates `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "è fallita la rimozione del file di update incorporato %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "impossibile creare `%.255s'"
@@ -886,7 +871,9 @@ msgstr "deve iniziare con un carattere alfanumerico"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "il carattere `%c' non è consentito (sono consentite solo lettere, cifre e i caratteri `%s'"
+msgstr ""
+"il carattere `%c' non è consentito (sono consentite solo lettere, cifre e i "
+"caratteri `%s'"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -936,30 +923,30 @@ msgstr "Manca la parentesi di chiusura nella stringa di formato\n"
 msgid "failed to realloc for variable buffer"
 msgstr "impossibile riallocare un buffer dinamico"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  già scomparso !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "errore di lettura dalla pipe con dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "impossibile impostare il timestamp di `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "impossibile impostare il proprietario di `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "impossibile impostare i permessi di `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -968,16 +955,16 @@ msgstr ""
 "tentata sovrascrittura di `%.250s', che è la versione diversificata di `"
 "%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pacchetto: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "impossibile eseguire stat() su `%.255s' (che stavo per installare)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -986,29 +973,29 @@ msgstr ""
 "impossibile mettere ordine nel caos attorno a `%.255s' prima di installarne "
 "un'altra versione"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "impossibile eseguire stat su `%.255s' appena ripristinato prima di "
 "installarne un'altra versione"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "l'archivio contiene l'oggetto `%.255s' di tipo sconosciuto 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Sostituisco i file nel vecchio pacchetto %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Sostituiti dai file nel pacchetto installato %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -1016,96 +1003,96 @@ msgstr ""
 "tentata sovrascrittura della directory `%.250s' nel pacchetto %.250s con "
 "qualcos'altro"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "tentata sovrascrittura di `%.250s', che si trova anche nel pacchetto %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "rilettura del file sostituito `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb backend su `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "errore chiudendo/scrivendo `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "impossibile creare la pipe su `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "impossibile creare il device `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "impossibile creare il collegamento `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "impossibile creare il collegamento simbolico `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 "impossibile impostare il proprietario del collegamento simbolico `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "impossibile creare la directory `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "impossibile spostare da una parte `%.255s' per installarne la nuova versione"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "impossibile leggere il collegamento `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 "impossibile creare il collegamento simbolico alla copia di sicurezza di `"
 "%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "impossibile impostare il proprietario del collegamento simbolico alla copia "
 "di sicurezza di `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "impossibile creare il link per la copia di sicurezza di `%.255s' prima di "
 "installarne la nuova versione"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "impossibile installare la nuova versione di `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1115,7 +1102,7 @@ msgstr ""
 "vengono ignorati:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1124,7 +1111,7 @@ msgstr ""
 "dpkg: attenzione - valuto la deconfigurazione del pacchetto\n"
 " essenziale %s, per rendere possibile la rimozione di %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1133,7 +1120,7 @@ msgstr ""
 "dpkg: no, %s è essenziale, non verrà deconfigurato\n"
 " per consentire la rimozione di %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1142,26 +1129,26 @@ msgstr ""
 "dpkg: no, non è possibile rimuovere %s (--auto-deconfigure può aiutare):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: valuto la rimozione di %s in favore di %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s non è correttamente installato - le dipendenze relative verranno "
 "ignorate.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: la rimozione di %s potrebbe causare dei problemi, perché fornisce %"
 "s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1170,18 +1157,23 @@ msgstr ""
 "dpkg: il pacchetto %s richiede una reinstallazione, ma verrà rimosso "
 "comunque come richiesto.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 "dpkg: il pacchetto %s richiede una reinstallazione, non verrà rimosso.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: si, rimuoverò il pacchetto %s a favore di %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1190,72 +1182,72 @@ msgstr ""
 "dpkg: al riguardo di %s, contenente %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacchetti in conflitto - %.250s non installato"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: attenzione - conflitti ignorati, si procede comunque !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive richiede almeno un percorso come parametro"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "impossibile eseguire find per --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "impossibile aprire la pipe con find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "errore di lettura dalla pipe con find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "errore di chiusura della pipe con find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find per --recursive ha restituito l'errore non gestito %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "ricerca completata, senza trovare nessun pacchetto (file *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s richiede almeno un archivio di pacchetto come parametro"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Selezionato il pacchetto %s, che non lo era.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Tralascio il pacchetto deselezionato %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "La versione %.250s di %.250s è già installata, lo salto.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - attenzione: riporto %.250s dalla versione %.250s alla %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1646,110 +1638,117 @@ msgstr "EOF da stdin al prompt per il file di configurazione"
 msgid "unable to check for existence of `%.250s'"
 msgstr "impossibile verificare l'esistenza di `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " dipende da "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pre-dipende da "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " raccomanda "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " suggerisce "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " corrompe "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " è in conflitto con "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " suggerisce "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " estende "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sta per essere rimosso.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s sta per essere deconfigurato.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s sta per essere installato, ma la versione è la %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s è installato, ma la versione è la %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s è spacchettato, ma non è mai stato configurato.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s è spacchettato, ma la versione è la %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  l'ultima versione configurata di %.250s è la %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s è %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fornisce %.250s ma sta per essere rimosso.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fornisce %.250s ma sta per essere deconfigurato.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fornisce %.250s ma è %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s non è installato.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versione %.250s) sta per essere installato.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versione %.250s) è %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fornisce %.250s e sta per essere installato.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s fornisce %.250s ed è %s.\n"
@@ -2254,7 +2253,9 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
-msgstr "Uso: %s [<opzione> ...] <comando>\n\n"
+msgstr ""
+"Uso: %s [<opzione> ...] <comando>\n"
+"\n"
 
 #: src/main.c:61
 #, c-format
@@ -2294,20 +2295,26 @@ msgstr ""
 "  -P|--purge         <pacchetto> ... | -a|--pending\n"
 "  --get-selections [<modello> ...] Ottieni lista selezioni su stdout.\n"
 "  --set-selections                 Imposta selezioni da stdin.\n"
-"  --clear-selections               Deselezioni tutti i pacchetti non essenziali.\n"
+"  --clear-selections               Deselezioni tutti i pacchetti non "
+"essenziali.\n"
 "  --update-avail <file Packages>   Rimpiazza info pacchetti disponibili.\n"
 "  --merge-avail <file Packages>    Aggiorna le info dal file.\n"
 "  --clear-avail                    Cancella info sulla disponibilità.\n"
-"  --forget-old-unavail             Dimentica vecchi pacchetti non più dispon.\n"
+"  --forget-old-unavail             Dimentica vecchi pacchetti non più "
+"dispon.\n"
 "  -s|--status <pacchetto> ...      Mostra stato dettagliato del pacchetto.\n"
-"  -p|--print-avail <pacchetto> ... Mostra dettagli delle versioni disponibili.\n"
+"  -p|--print-avail <pacchetto> ... Mostra dettagli delle versioni "
+"disponibili.\n"
 "  -L|--listfiles <pacchetto> ...   Lista file contenuti nel pacchetto.\n"
 "  -l|--list [<modello> ...]        Lista concisa dei pacchetti.\n"
-"  -S|--search <modello> ...        Trova i pacchetti che contengono un file.\n"
+"  -S|--search <modello> ...        Trova i pacchetti che contengono un "
+"file.\n"
 "  -C|--audit                       Verifica presenza pacchetti difettosi.\n"
 "  --print-architecture             Mostra l'architettura usata da dpkg.\n"
-"  --compare-versions <a> <op> <b>  Confronta i numeri di versione - vedi sotto.\n"
-"  --force-help                     Mostra l'aiuto sulle opzioni di forzatura.\n"
+"  --compare-versions <a> <op> <b>  Confronta i numeri di versione - vedi "
+"sotto.\n"
+"  --force-help                     Mostra l'aiuto sulle opzioni di "
+"forzatura.\n"
 "  -Dh|--debug=help                 Mostra l'aiuto sulle opzioni di debug.\n"
 "\n"
 
@@ -2321,7 +2328,8 @@ msgid ""
 msgstr ""
 "  -h|--help                        Mostra questo aiuto.\n"
 "  --version                        Mostra la versione.\n"
-"  --license|--licence              Mostra il copyright e i termini di licenza.\n"
+"  --license|--licence              Mostra il copyright e i termini di "
+"licenza.\n"
 "\n"
 
 #: src/main.c:94
@@ -2379,17 +2387,25 @@ msgstr ""
 "Options:\n"
 "  --admindir=<directory>     Usa <directory> anziché %s.\n"
 "  --root=<directory>         Installa in una gerarchia differente da '/'.\n"
-"  --instdir=<directory>      Cambia la dir. di installazione non quella admin.\n"
-"  -O|--selected-only         Salta pacchetti non selezionati per inst./aggiorn.\n"
-"  -E|--skip-same-version     Salta pacchetti se stessa versione già presente.\n"
-"  -G|--refuse-downgrade      Salta pacch. di versione precedente alla corrente.\n"
-"  -B|--auto-deconfigure      Installa anche se causa problemi ad altri pacch.\n"
+"  --instdir=<directory>      Cambia la dir. di installazione non quella "
+"admin.\n"
+"  -O|--selected-only         Salta pacchetti non selezionati per inst./"
+"aggiorn.\n"
+"  -E|--skip-same-version     Salta pacchetti se stessa versione già "
+"presente.\n"
+"  -G|--refuse-downgrade      Salta pacch. di versione precedente alla "
+"corrente.\n"
+"  -B|--auto-deconfigure      Installa anche se causa problemi ad altri "
+"pacch.\n"
 "  --no-debsig                Non controllare le firme dei pacchetti.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                             Dì solo quello che verrebbe svolto - non farlo.\n"
+"                             Dì solo quello che verrebbe svolto - non "
+"farlo.\n"
 "  -D|--debug=<ottale>        Abilita il debug (vedi -Dhelp o --debug=help).\n"
-"  --status-fd <n>            Invia le modifiche allo stato al descrittore <n>.\n"
-"  --log=<nomefile>           Annota modifiche e azioni svolte in <nomefile>.\n"
+"  --status-fd <n>            Invia le modifiche allo stato al descrittore "
+"<n>.\n"
+"  --log=<nomefile>           Annota modifiche e azioni svolte in "
+"<nomefile>.\n"
 "  --ignore-depends=<pacchetto>,...\n"
 "                             Ignora dipendenze relative a <pacchetto>.\n"
 "  --force-...                Aggira i problemi (vedi --force-help).\n"
@@ -2414,13 +2430,15 @@ msgstr ""
 "                           qualsiasi versione);\n"
 "  lt-nl le-nl ge-nl gt-nl (se manca la versione, intendi come successiva a\n"
 "                           qualsiasi versione);\n"
-"  < << <= = >= >> >       (solo per compatibilità con il file di controllo).\n"
+"  < << <= = >= >> >       (solo per compatibilità con il file di "
+"controllo).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Usa `dselect' o `aptitude' per una gestione più amichevole dei pacchetti.\n"
+msgstr ""
+"Usa `dselect' o `aptitude' per una gestione più amichevole dei pacchetti.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2562,25 +2580,41 @@ msgstr ""
 "  all [!]                Seleziona tutte le opzioni di forzatura\n"
 "  downgrade [*]          Rimpiazza un pacchetto con una versione precedente\n"
 "  configure-any          Configura qualsiasi pacchetto se può essere utile\n"
-"  hold                   Agisci sui pacchetti coinvolti anche se sono bloccati\n"
-"  bad-path               PATH manca di programmi importanti, probabili errori\n"
-"  not-root               Cerca di (dis)installare pacchetti anche se non root\n"
-"  overwrite              Sovrascrivi file di un pacchetto con quello di un altro\n"
-"  overwrite-diverted     Sovrascrivi un file diversificato con una versione originale.\n"
-"  bad-verify             Installa un pacchetto anche se dà errore di autenticazione\n"
-"  depends-version [!]    Trasforma i problemi con le dipendenze sulle versioni in avvisi\n"
-"  depends [!]            Trasforma tutti i problemi con le dipendenze in avvisi\n"
-"  confnew [!]            Usa sempre i nuovi file di configurazione, senza chiedere\n"
-"  confold [!]            Usa sempre i vecchi file di configurazione, senza chiedere\n"
-"  confdef [!]            Usa la scelta di defalt per i nuovi file di configurazione\n"
-"                         se disponibili, senza chiedere. Se non esiste il default\n"
-"                         sarà richiesta conferma a meno che sia specificata anche\n"
+"  hold                   Agisci sui pacchetti coinvolti anche se sono "
+"bloccati\n"
+"  bad-path               PATH manca di programmi importanti, probabili "
+"errori\n"
+"  not-root               Cerca di (dis)installare pacchetti anche se non "
+"root\n"
+"  overwrite              Sovrascrivi file di un pacchetto con quello di un "
+"altro\n"
+"  overwrite-diverted     Sovrascrivi un file diversificato con una versione "
+"originale.\n"
+"  bad-verify             Installa un pacchetto anche se dà errore di "
+"autenticazione\n"
+"  depends-version [!]    Trasforma i problemi con le dipendenze sulle "
+"versioni in avvisi\n"
+"  depends [!]            Trasforma tutti i problemi con le dipendenze in "
+"avvisi\n"
+"  confnew [!]            Usa sempre i nuovi file di configurazione, senza "
+"chiedere\n"
+"  confold [!]            Usa sempre i vecchi file di configurazione, senza "
+"chiedere\n"
+"  confdef [!]            Usa la scelta di defalt per i nuovi file di "
+"configurazione\n"
+"                         se disponibili, senza chiedere. Se non esiste il "
+"default\n"
+"                         sarà richiesta conferma a meno che sia specificata "
+"anche\n"
 "                         l'opzione confold oppure confnew\n"
 "  confmiss [!]           Installa sempre i file di configurazione mancanti\n"
-"  conflicts [!]          Consenti l'installazione di pacchetti anche se generano conflitti\n"
+"  conflicts [!]          Consenti l'installazione di pacchetti anche se "
+"generano conflitti\n"
 "  architecture [!]       Processa anche pacchetti con l'architettura errata\n"
-"  overwrite-dir [!]      Sovrascrivi la directory di un pacchetto con un file di un altro\n"
-"  remove-reinstreq [!]   Rimuovi i pacchetti che richiedono la reinstallazione\n"
+"  overwrite-dir [!]      Sovrascrivi la directory di un pacchetto con un "
+"file di un altro\n"
+"  remove-reinstreq [!]   Rimuovi i pacchetti che richiedono la "
+"reinstallazione\n"
 "  remove-essential [!]   Rimuovi un pacchetto essenziale\n"
 "\n"
 "ATTENZIONE - l'uso delle opzioni contrassegnate da [!] può danneggiare\n"
@@ -2632,7 +2666,7 @@ msgstr "impossibile aprire `%i' per ricevere il flusso"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "è necessaria una opzione che indichi che azione svolgere"
@@ -2709,6 +2743,10 @@ msgstr "  Il pacchetto %s che fornisce %s non è installato.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Il pacchetto %s non è installato.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " dipende da "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; comunque:\n"
@@ -2801,7 +2839,9 @@ msgstr "problema con le dipendenze non gestito - non installo %.250s"
 #: src/processarc.c:262
 #, c-format
 msgid "dpkg: warning - ignoring Breaks !\n"
-msgstr "dpkg: attenzione - ignoro Breaks !\n\n"
+msgstr ""
+"dpkg: attenzione - ignoro Breaks !\n"
+"\n"
 
 #: src/processarc.c:275
 #, c-format
@@ -2908,10 +2948,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "impossibile eseguire stat sull'altro nuovo file `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: attenzione - il vecchio file `%.250s' è lo stesso di svariati nuovi "
 "file! (sia `%.250s' che `%.250s')"
@@ -3108,8 +3148,10 @@ msgid ""
 "\n"
 msgstr ""
 "Comandi:\n"
-"  -s|--status <pacchetto> ...      Mostra nel dettaglio lo stato del pacchetto.\n"
-"  -p|--print-avail <pacchetto> ... Mostra dettagli sulle versioni disponibili.\n"
+"  -s|--status <pacchetto> ...      Mostra nel dettaglio lo stato del "
+"pacchetto.\n"
+"  -p|--print-avail <pacchetto> ... Mostra dettagli sulle versioni "
+"disponibili.\n"
 "  -L|--listfiles <pacchetto> ...   Mostra i file 'posseduti' dal pacchetto.\n"
 "  -l|--list [<modello> ...]        Lista concisa dei pacchetti.\n"
 "  -W|--show <modello> ...          Mostra informazioni sui pacchetti.\n"
@@ -3389,26 +3431,31 @@ msgstr "--forget-old-unavail non accetta alcun parametro"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - errore: %s (`%s') non contiene cifre\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build richiede il nome di una directory come parametro"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build accetta al massimo due parametri"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "impossibile verificare l'esistenza dell'archivio `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "la destinazione è una directory - non posso saltare la verifica del file di "
 "controllo"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3418,48 +3465,48 @@ msgstr ""
 "viene effettuata.\n"
 "dpkg-deb: costruisco un pacchetto sconosciuto in `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "il nome del pacchetto contiene caratteri che non sono né alfanumerici "
 "minuscoli né `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "attenzione, `%s' contiene un valore di Priority `%s' definito dall'utente\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "attenzione, `%s' contiene un campo `%s' definito dall'utente\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d errori nel file di controllo"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: costruisco il pacchetto `%s' in `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "la directory di controllo ha dei permessi non validi: %03lo (devono essere "
 ">=0755 e <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "lo script del responsabile `%.50s' non è un file normale né un collegamento "
 "simbolico"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3468,17 +3515,17 @@ msgstr ""
 "lo script del responsabile `%.50s' ha dei permessi errati %03lo (devono "
 "essere >=0555 e <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "impossibile eseguire stat sullo script del responsabile `%.50s'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 "fgets ha restituito una stringa vuota leggendo i file di configurazione"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3486,119 +3533,121 @@ msgstr ""
 "attenzione, il nome del file di configurazione `%.50s...' è troppo lungo, o "
 "manca l'a-capo finale\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "attenzione, il file di configurazione `%s' contiene della spaziatura inutile in fondo\n"
+msgstr ""
+"attenzione, il file di configurazione `%s' contiene della spaziatura inutile "
+"in fondo\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "il file di configurazione `%.250s' non appare nel pacchetto"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "impossibile eseguire stat sul file di configurazione `%.250s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "attenzione, il file di configurazione `%s' non è un file normale\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "errore di lettura dal file contenente i file di configurazione"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "errore di apertura del file contenente i file di configurazione"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-dev: %d avvisi relativi ai file di controllo vengono ignorati\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "impossibile rimuovere la bufferizzazione su `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "impossibile fare chdir a `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "impossibile fare chdir a .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "impossibile eseguire tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "impossibile creare un file temporaneo (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "impossibile aprire il file temporaneo (control) %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "impossibile cancellare il file temporaneo (control) %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "impossibile eseguire fstat sul file temporaneo (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "impossibile eseguire rewind sul file temporaneo (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "impossibile create un file temporaneo (dati)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "impossibile aprire il file temporaneo %s (dati)"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "impossibile rimuovere il file temporaneo %s (dati)"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dati"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "impossibile eseguire find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "la scrittura dei nomi dei file sulla pipe di tar è fallita (dati)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Errore interno, compress_type `%i' sconosciuto!\""
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "impossibile eseguire rewind su un file temporaneo (dati)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3683,24 +3732,24 @@ msgstr ""
 "la versione dell'archivio, %.250s, non è comprensibile, usa un dpkg-deb più "
 "recente"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "dati dell'elemento non estratti da %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "il file `%.250s' contiene un elemento dati incomprensibile %.*s, lascio "
 "perdere"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "il file `%.250s' contiene due elementi di controllo, lascio perdere"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3709,16 +3758,16 @@ msgstr ""
 " nuovo pacchetto debian, versione %s.\n"
 " dimensione %ld byte: archivio di controllo= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "lunghezza info controllo"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "l'archivio ha la lunghezza di controllo formattata male `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3727,15 +3776,15 @@ msgstr ""
 " vecchio pacchetto debian, versione %s.\n"
 " dimensione %ld byte: archivio di controllo= %zi, archivio principale= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "impossibile allocare memoria per la variabile `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "area di controllo"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3744,66 +3793,66 @@ msgstr ""
 "dpkg-deb: il file sembrerebbe essere un archivio rovinato\n"
 "dpkg-deb:    per esser stato scaricato in modalità ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' non è un archivio in formato debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "impossibile ottenere la posizione corrente nel file"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "impossibile impostare la posizione corrente nel file"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "impossibile aprire il descrittore di pipe `1' nel paste"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "impossibile scrivere su gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "impossibile chiudere gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 "impossibile eseguire lseek per spostarsi sulla porzione archivio del file"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "impossibile scrivere sulla pipe nella copia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "impossibile chiudere la pipe nella copia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "impossibile creare una directory"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "impossibile eseguire chdir sulla directory dopo averla creata"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "impossibile fare il chdir alla directory"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "impossibile eseguire tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s richiede il nome di un file .deb come parametro"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3812,12 +3861,12 @@ msgstr ""
 "--%s richiede come parametro una directory di destinazione.\n"
 "Forse dovresti usare dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s accetta al massimo due parametri (un .deb e una directory)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s accetta un solo parametro (un nome di file .deb)"
@@ -3975,7 +4024,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3986,14 +4035,16 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opzioni:\n"
 "  --showformat=<formato>           Usa un formato alternativo per --show.\n"
 "  -D                               Abilita l'output di debug.\n"
 "  --old, --new                     Seleziona il formato di archiviazione.\n"
-"  --nocheck                        Disattiva la verifica del file di controllo\n"
+"  --nocheck                        Disattiva la verifica del file di "
+"controllo\n"
 "                                     (produce pacchetti scadenti).\n"
 "  -z#                              Imposta il livello di compressione usato\n"
 "                                     nella costruzione del pacchetto.\n"
@@ -4023,7 +4074,7 @@ msgstr ""
 "Usa dpkg-deb --help per un aiuto sulla manipolazione dei file *.deb;\n"
 "Usa dpkg --help per un aiuto sull'installazione e rimozione dei pacchetti."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo di compressione sconosciuto `%s'!"
@@ -4226,8 +4277,10 @@ msgstr ""
 "  -j|--join <parte> <parte> ...    Ricomponi le porzioni.\n"
 "  -I|--info <parte> ...            Mostra info su una porzione.\n"
 "  -a|--auto -o <completo> <parte>  Accumula automaticamente le porzioni.\n"
-"  -l|--listq                       Elenca le porzioni che non corrispondono.\n"
-"  -d|--discard [<filename> ...]    Scarta le porzioni che non corrispondono.\n"
+"  -l|--listq                       Elenca le porzioni che non "
+"corrispondono.\n"
+"  -d|--discard [<filename> ...]    Scarta le porzioni che non "
+"corrispondono.\n"
 "\n"
 
 #: dpkg-split/main.c:69
@@ -4246,9 +4299,12 @@ msgstr ""
 "Opzioni:\n"
 "  --depotdir <directory>           Usa <directory> invece di %s/%s.\n"
 "  -S|--partsize <dimensione>       In kilobyte, per -s (default è 450).\n"
-"  -o|--output <file>               Per -j (default è <pacchetto>-<versione>.deb).\n"
-"  -Q|--npquiet                     Stai quieto quando -a non è una porzione.\n"
-"  --msdos                          Genera nomi dei file corti ala msdos (8.3)\n"
+"  -o|--output <file>               Per -j (default è <pacchetto>-<versione>."
+"deb).\n"
+"  -Q|--npquiet                     Stai quieto quando -a non è una "
+"porzione.\n"
+"  --msdos                          Genera nomi dei file corti ala msdos "
+"(8.3)\n"
 "\n"
 "Status di uscita: 0 = OK;  1 = -a non è una porzione;  2 = problema!\n"
 
@@ -4415,9 +4471,9 @@ msgstr "il file sorgente `%.250s' non è un file normale"
 msgid "unable to exec mksplit"
 msgstr "impossibile eseguire mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versione %s.\n"
@@ -4426,11 +4482,13 @@ msgstr "Debian %s versione %s.\n"
 msgid ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
-msgstr "\nCopyright (C) 1996 Kim-Minh Kaplan."
+msgstr ""
+"\n"
+"Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4485,7 +4543,7 @@ msgid "try deleting %s"
 msgstr "provo a cancellare %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "impossibile aprire %s: %s"
@@ -4512,7 +4570,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossibile chiudere %s dopo la lettura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossibile chiudere %s: %s"
@@ -4532,12 +4590,12 @@ msgstr "impossibile installare %s; verrà lasciato come %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: impossibile fare l'unlock di %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Impossibile ottenere il valore di ENOENT da %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4547,7 +4605,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4587,9 +4645,12 @@ msgstr ""
 "Options:\n"
 "  --package <pacchetto>    nome del pacchetto la cui copia di <file> non\n"
 "                             verrà diversificata.\n"
-"  --local                  tutte le versioni dei pacchetti sono diversificate.\n"
-"  --divert <divers-a>      il nome usato dalla versione nell'altro pacchetto.\n"
-"  --rename                 cambia effettivamente il nome al file (o ripristinalo).\n"
+"  --local                  tutte le versioni dei pacchetti sono "
+"diversificate.\n"
+"  --divert <divers-a>      il nome usato dalla versione nell'altro "
+"pacchetto.\n"
+"  --rename                 cambia effettivamente il nome al file (o "
+"ripristinalo).\n"
 "  --admindir <directory>   imposta la directory con le diversioni ai file.\n"
 "  --test                   non fare nulla, mostra solo cosa succederebbe.\n"
 "  --quiet                  modalità quieta, output minimale.\n"
@@ -4597,92 +4658,94 @@ msgstr ""
 "  --version                mostra la versione.\n"
 "\n"
 "Quando si aggiunge, il default è --local e --divert <originale>.distrib.\n"
-"Quando si rimuove, --package o --local e --divert devono corrispondere se specificati.\n"
-"Gli script preinst/postrm del pacchetto devono sempre specificare --package e --divert.\n"
+"Quando si rimuove, --package o --local e --divert devono corrispondere se "
+"specificati.\n"
+"Gli script preinst/postrm del pacchetto devono sempre specificare --package "
+"e --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "sono state specificate due modalità: %s e --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s richiede il parametro <divers-a>"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to non può contenere a-capo"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s richiede il nome di un pacchetto come parametro"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pacchetto non può contenere a-capo"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s richiede il nome di una directory come parametro"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opzione `%s' non riconosciuta"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "impossibile aprire il file con le diversioni: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "manca il nome alternativo"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "manca il pacchetto"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s accetta un singolo parametro"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "il nome di file \"%s\" non è assoluto"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "il file non può contenere a-capo"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Impossibile diversionare una directory"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Lascio `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' è in conflitto con `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Aggiungo `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4693,7 +4756,7 @@ msgstr ""
 "  durante la rimozione di `%s'\n"
 "  è stato trovato `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4704,37 +4767,37 @@ msgstr ""
 "  durante la rimozione di `%s'\n"
 "  è stato trovato `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Rimuovo `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Nessuna diversione per `%s', non rimuovo nulla"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "errore interno - modalità errata `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "impossibile eseguire stat sul nome precedente `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "impossibile eseguire stat sul nuovo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "errore controllando `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4743,58 +4806,60 @@ msgstr ""
 "il cambio del nome comporta la sovrascrittura di `%s' con\n"
 "  un file diverso `%s', che non è consentito"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: rimozione duplicato del vecchio collegamento `%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: cambiando il nome da `%s' a `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creazione di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "scrittura di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "chiusura di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "rimozione del diversions-old precedente: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "creazione nuovo diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installazione nuovo diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "errore interno: %s è corrotto: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
-msgstr "\nCopyright (C) 2000 Wichert Akkerman."
+msgstr ""
+"\n"
+"Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4822,113 +4887,115 @@ msgstr ""
 "  --list [<glob-pattern>]  elenca gli override attualmente nel database.\n"
 "\n"
 "Opzioni:\n"
-"  --admindir <directory>   imposta la directory che contiene il file statoverride.\n"
+"  --admindir <directory>   imposta la directory che contiene il file "
+"statoverride.\n"
 "  --update                 aggiorna i permessi dei file immediatamente.\n"
-"  --force                  forza un'azione anche se uno dei controlli di integrità fallisce.\n"
+"  --force                  forza un'azione anche se uno dei controlli di "
+"integrità fallisce.\n"
 "  --quiet                  modalità quieta, output minimale.\n"
 "  --help                   mostra questo messaggio di aiuto.\n"
 "  --version                mostra la versione.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nessuna modalità specificata"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add richiede quattro parametri"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "utente %s non valido"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "utente %s inesistente"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "gruppo %s non consentito"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "gruppo %s inesistente"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "modalità %s non consentita"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "rimuovo lo / terminale"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Un override per \"%s\" esiste già, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "ma --force specificato così verrà ignorato."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "termino"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "attenzione: si è specificato --update ma %s non esiste"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "impossibile eseguire chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "impossibile eseguire chmod %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Nessun override presente."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "attenzione: --update è inutile con --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "impossibile aprire il file statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Più di un override per \"%s\", mi fermo"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "impossibile aprire il nuovo file statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "errore rimuovendo statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "impossibile creare il nuovo statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "errore installando il nuovo statoverride: %s"
@@ -4937,7 +5004,9 @@ msgstr "errore installando il nuovo statoverride: %s"
 msgid ""
 "\n"
 "Copyright (C) 1994,1995 Ian Jackson."
-msgstr "\nCopyright (C) 1994-1996 Ian Jackson."
+msgstr ""
+"\n"
+"Copyright (C) 1994-1996 Ian Jackson."
 
 #: scripts/install-info.pl:31
 #, perl-format
@@ -4970,19 +5039,27 @@ msgstr ""
 "\n"
 "Opzioni:\n"
 "  --section <regexp> <titolo>\n"
-"                           metti la nuova entry nella sezione che corrisponde alla\n"
-"                           regexp o creane una nuova <titolo> se non esiste.\n"
+"                           metti la nuova entry nella sezione che "
+"corrisponde alla\n"
+"                           regexp o creane una nuova <titolo> se non "
+"esiste.\n"
 "  --menuentry=<text>       imposta la voce del menu.\n"
 "  --description=<text>     imposta la descrizione da usare nel menu.\n"
-"  --info-file=<path>       specifica il file info da installare nella directory.\n"
-"  --dir-file=<path>        specifica il nome del file delle info sulle directory.\n"
+"  --info-file=<path>       specifica il file info da installare nella "
+"directory.\n"
+"  --dir-file=<path>        specifica il nome del file delle info sulle "
+"directory.\n"
 "  --infodir=<directory>    stessa cosa di '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   idem.\n"
-"  --keep-old               non sostiture le entry e non rimuovere quelle vuote.\n"
-"  --remove                 rimuovi la entri specificata dal basename di <filename>.\n"
+"  --keep-old               non sostiture le entry e non rimuovere quelle "
+"vuote.\n"
+"  --remove                 rimuovi la entri specificata dal basename di "
+"<filename>.\n"
 "  --remove-exactly         rimuovi esattamente la entry <filename>.\n"
-"  --test                   abilita la modalità di test (le azioni non vengono svolte).\n"
-"  --debug                  abilita la modalità di debug (mostra più informazioni).\n"
+"  --test                   abilita la modalità di test (le azioni non "
+"vengono svolte).\n"
+"  --debug                  abilita la modalità di debug (mostra più "
+"informazioni).\n"
 "  --quiet                  non mostrare alcun messaggio di output.\n"
 "  --help                   mostra questo messaggio di aiuto.\n"
 "  --version                mostra la versione.\n"
@@ -5035,7 +5112,8 @@ msgid ""
 msgstr ""
 "\n"
 "Nessuna `START-INFO-DIR-ENTRY' e non trovo `This file documents'.\n"
-"%s: impossibile determinare la descrizione per la entry `dir' - lascio perdere\n"
+"%s: impossibile determinare la descrizione per la entry `dir' - lascio "
+"perdere\n"
 
 #: scripts/install-info.pl:279
 #, perl-format
@@ -5085,12 +5163,14 @@ msgstr "%s: creo una nuova sezione `%s'"
 #: scripts/install-info.pl:367
 #, perl-format
 msgid "%s: no sections yet, creating Miscellaneous section too."
-msgstr "%s: non c'è ancora nessuna sezione, creo anche un sezione Miscellaneous."
+msgstr ""
+"%s: non c'è ancora nessuna sezione, creo anche un sezione Miscellaneous."
 
 #: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
-msgstr "%s: non è stata specificata la sezione per la nuova entry, la metto in fondo"
+msgstr ""
+"%s: non è stata specificata la sezione per la nuova entry, la metto in fondo"
 
 #: scripts/install-info.pl:422
 #, perl-format
@@ -5142,7 +5222,7 @@ msgstr "impossibile leggere %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5152,8 +5232,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5173,7 +5253,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5198,12 +5278,15 @@ msgstr ""
 "  --install <link> <nome> <percorso> <priorità>\n"
 "    [--slave <link> <nome> <percorso>] ...\n"
 "                             aggiungi un gruppo di alternative al sistema.\n"
-"  --remove <nome> <percorso> rimuovi <percorso> dal gruppo di alternative <nome>.\n"
+"  --remove <nome> <percorso> rimuovi <percorso> dal gruppo di alternative "
+"<nome>.\n"
 "  --remove-all <nome>        rimuovi il gruppo  <nome> dal sistema.\n"
-"  --auto <nome>              metti il link primario <nome> in modalità automatica.\n"
+"  --auto <nome>              metti il link primario <nome> in modalità "
+"automatica.\n"
 "  --display <nome>           mostra informazioni sul gruppo <nome>.\n"
 "  --list <nome>              elenca tutti gli obbiettivi del gruppo <nome>.\n"
-"  --config <nome>            mostra le alternative per il gruppo <nome> e chiedi\n"
+"  --config <nome>            mostra le alternative per il gruppo <nome> e "
+"chiedi\n"
 "                             all'utente quale usare.\n"
 "  --set <nome> <percorso>    imposta <percorso> come alternativa di <nome>.\n"
 "  --all                      eseguio --config su tutte le alternative.\n"
@@ -5214,7 +5297,8 @@ msgstr ""
 "  (ad esempio pager)\n"
 "<percorso> è la locazione di uno del file alternativi.\n"
 "  (ad esempio /usr/bin/less)\n"
-"<priorità> è un numero intero; opzioni con numero maggiore hanno una priorità\n"
+"<priorità> è un numero intero; opzioni con numero maggiore hanno una "
+"priorità\n"
 "  più alta in modalità automatica.\n"
 "\n"
 "Opzioni:\n"
@@ -5226,159 +5310,162 @@ msgstr ""
 "  --help                   mostra questo messaggio di aiuto.\n"
 "  --version                mostra la versione.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "parametro sconosciuto `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install necessita di <link> <nome> <percorso> <priorità>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "la priorità deve essere un numero intero"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s richiede <nome> e <percorso>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s necessita di <nome>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave necessita di <link> <nome> <percorso>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "nome slave %s duplicato"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "link slave %s duplicato"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "il nome %s è sia primario che slave"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "il link %s è sia primario che slave"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr "necessita --display, --config, --set, --install, --remove, --all, --remove-all o --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave è consentito solo con --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "slave duplicato %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "link slave uguale a quello principale %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "link slave duplicato %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "percorso duplicato %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "priorità %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
-msgstr "L'alternativa per %s punta a %s, che non è stato trovato.  La rimuovo dalla lista delle alternative."
+msgstr ""
+"L'alternativa per %s punta a %s, che non è stato trovato.  La rimuovo dalla "
+"lista delle alternative."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nessuna alternativa per %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - lo status è %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " il link attualmente punta a %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " il link attualmente non c'è"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " link illeggibile - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorità %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nessuna versione disponibile."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "La `migliore' versione attualmente è %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "parametro sconosciuto `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install necessita di <link> <nome> <percorso> <priorità>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "la priorità deve essere un numero intero"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s richiede <nome> e <percorso>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s necessita di <nome>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave necessita di <link> <nome> <percorso>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "nome slave %s duplicato"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "link slave %s duplicato"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "il nome %s è sia primario che slave"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "il link %s è sia primario che slave"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"necessita --display, --config, --set, --install, --remove, --all, --remove-"
+"all o --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave è consentito solo con --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Imposto la selezione automatica di %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossibile rimuovere %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5387,76 +5474,79 @@ msgstr ""
 "%s è stato modificato (da te o da uno script).\n"
 "Passo all'aggiornamento esclusivamente manuale."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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 ""
 "Controllo le versioni disponibili di %s, aggiorno i link in %s ...\n"
-"(Se desideri puoi modificare direttamente quei link simbolici, vedi `man ln'.)"
+"(Se desideri puoi modificare direttamente quei link simbolici, vedi `man "
+"ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Rinomino il link %s da %s a %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossibile rinominare %s a %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome link slave %s duplicato"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
-msgstr "Rimuovo le alternative selezionte manualmente, passo alla modalità automatica"
+msgstr ""
+"Rimuovo le alternative selezionte manualmente, passo alla modalità automatica"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Scarto il link slave obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
-msgstr "Per tornare all'aggiornamento automatico usa `update-alternatives --auto %s'."
+msgstr ""
+"Per tornare all'aggiornamento automatico usa `update-alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Ripristino da un precedente aggiornamento fallito di %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossibile aprire %s in scrittura: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5465,38 +5555,38 @@ msgstr ""
 "attenzione: %s dovrebbe essere un symlink a %s\n"
 " (o non esistere affatto); invece, readlink è fallita: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "impossibile assicurare che %s non esiste: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "impossibile installare %s come %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lascio %s (%s) puntare a %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aggiorno %s (%s) che punti a %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5505,13 +5595,13 @@ msgstr ""
 "attenzione: %s dovrebbe essere un symlink slave a %s,\n"
 " o non esistere; invece, readlink è fallita: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Rimuovo %s (%s), non appropriato con %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5520,7 +5610,7 @@ msgstr ""
 "C'è un solo programma che fornisce %s\n"
 "(%s). Non c'è nulla da configurare.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5533,41 +5623,52 @@ msgstr ""
 "  Selezione    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "Premi invio per mantenere il default[*], o inserisci il numero da selezionare:"
+msgstr ""
+"Premi invio per mantenere il default[*], o inserisci il numero da "
+"selezionare:"
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Uso `%s' per fornire `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non riesco a trovare l'alternativa `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errore scrivendo su stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "errore o eof leggendo %s per %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manca un a-capo dopo %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
+
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: impossibile eseguire gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: impossibile eseguire bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: impossibile eseguire bzip2 %s"
diff --git a/po/ja.po b/po/ja.po
index 12f2320b..08844f12 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-09-13 22:11+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -69,72 +69,57 @@ msgstr "%d番のシステムエラーが発生しました"
 msgid "Signal no.%d"
 msgstr "%d番のシグナルが発生しました"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: gzip %s の実行に失敗しました"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: 内部 gzip エラー: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: gzip -dc の実行に失敗しました"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: 内部 bzip2 エラー: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: bzip2 -dc の実行に失敗しました"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: 展開"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: 内部 gzip エラー: 読み取り: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: 内部 gzip エラー: 書き込み: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: 内部 gzip エラー: 読み取り (%i) != 書き込み (%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: gzip %s の実行に失敗しました"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: 内部 bzip2 エラー: 読み取り: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: 内部 bzip2 エラー: 書き込み: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: 内部 bzip2 エラー: 読み取り (%i) != 書き込み (%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: bzip2 %s の実行に失敗しました"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: 圧縮"
@@ -180,7 +165,7 @@ msgstr "updates ディレクトリ `%.255s' を走査できません"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "統合した更新用ファイル %.255s の削除に失敗しました"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' を作成できません"
@@ -914,30 +899,30 @@ msgstr "フォーマットに閉じ括弧 (}) が抜けています\n"
 msgid "failed to realloc for variable buffer"
 msgstr "可変長バッファの再割り当てに失敗しました"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... すでに消滅しています!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb パイプからの読み込みエラーです"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "`%.255s' のタイムスタンプ設定エラーです"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' の所有者設定エラーです"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s' の許可属性設定エラーです"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -946,44 +931,44 @@ msgstr ""
 "`%.250s' を上書きしようとしています。これは `%.250s'%.10s%.100s%.10s の退避"
 "バージョンです"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (パッケージ: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "(今インストールしようとしている) `%.255s' のステータスを得られません"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr "別バージョンのインストール前の `%.255s' まわりのゴミ掃除に失敗しました"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "別バージョンのインストール前の復元された `%.255s' の状態を得られません"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "アーカイブに含まれるオブジェクト `%.255s' が不明な型 0x%x です"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "古いパッケージ %s 中のファイルを置換しています ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 "インストールされたパッケージ %s の中のファイルで置き換えられました ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -991,91 +976,91 @@ msgstr ""
 "パッケージ %2$.250s に含まれるディレクトリ `%1$.250s' をディレクトリ以外のも"
 "ので上書きしようとしています"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "`%.250s' を上書きしようとしています。これはパッケージ %.250s にも含まれていま"
 "す"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "置き換えられたファイル `%.255s' を集めます"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' 間の dpkg-deb バックエンド"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s' のクローズ/書き込み中にエラーが発生しました"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "パイプ `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "デバイス `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "シンボリックリンク `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "シンボリックリンク `%.255s' の所有者設定中にエラーが発生しました"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "ディレクトリ `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "新バージョンをインストールするための `%.255s' の退避ができませんでした"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "リンク `%.255s' を読めません"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s' のバックアップ用シンボリックリンクを作成できません"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s' のバックアップ用シンボリックリンクを chown できません"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "新バージョンのインストール前の `%.255s' のバックアップ用リンクを作成できませ"
 "ん"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' の新しいバージョンをインストールできません"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1084,7 +1069,7 @@ msgstr ""
 "dpkg: 警告 - %s の削除において依存関係の問題を無視しています:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1093,7 +1078,7 @@ msgstr ""
 "dpkg: 警告 - %2$s を削除可能にするため、不可欠パッケージ\n"
 " %1$s の設定削除を考慮しています。\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1102,7 +1087,7 @@ msgstr ""
 "dpkg: 失敗。%s は不可欠パッケージです。%s を削除可能に\n"
 " するために、その設定削除を行いません。\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1111,24 +1096,24 @@ msgstr ""
 "dpkg: 失敗、%s を削除できません (--auto-deconfigure を使いましょう):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %2$s を選択するために %1$s の削除を考えています ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s は正しくインストールされていないため、すべての依存関係を無視します。\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: %s は %s を提供するため、削除すると問題があるかもしれません ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1136,17 +1121,22 @@ msgid ""
 msgstr ""
 "dpkg: パッケージ %s は再インストールが必要ですが、要求に従い削除します。\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: パッケージ %s は再インストールが必要です。削除しません。\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: 問題ありません。%2$s を選択するために %1$s を削除します。\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1155,78 +1145,78 @@ msgstr ""
 "dpkg: %s が %s を提供することを考慮すると:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "パッケージの競合 - %.250s のインストールは行いません"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: 警告 - 競合を無視しています。続行します!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive は引数として最低1つのパスが必要です"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "--recursive のための find の実行に失敗しました"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "find のパイプの fdopen に失敗しました"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "find のパイプを読み込み中にエラーが発生しました"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "find のパイプのクローズ中にエラーが発生しました"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive のための find が、処理できないエラー %i を返しました"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "検索しましたが、パッケージ (*.deb にマッチするファイル) が見つかりませんでし"
 "た"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s は引数として最低 1 つのパッケージアーカイブファイルが必要です"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "未選択パッケージ %s を選択しています。\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "未選択パッケージ %s をスキップします。\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 "%2$.250s のバージョン %1$.250s がすでにインストールされています。スキップしま"
 "す。\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - 警告: %.250s のバージョンを %.250s から %.250s にダウングレードしていま"
 "す。\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1603,112 +1593,119 @@ msgstr "conffile プロンプトで標準入力上の EOF です"
 msgid "unable to check for existence of `%.250s'"
 msgstr "`%.250s' の存在を確認できません"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " は以下に依存 (depends) します: "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " は以下に事前依存 (pre-depends) します: "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " は以下を推奨 (recommends) します: "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr "は以下を提案 (suggests) します: "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " は以下を壊します "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " は以下と競合 (conflicts) します: "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr "は以下を提案 (suggests) します: "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " は以下を強化 (enhances) します: "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s は削除されようとしています。\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s は設定が消されようとしています。\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 "  %.250s がインストールされようとしていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s がインストールされていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s は展開されていますが、設定されていません。\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s は展開されていますが、バージョンが %.250s です。\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s の最新設定済みバージョンは %.250s です。\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s は %s です。\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s は %.250s を提供していますが、削除されようとしています。\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s は %.250s を提供していますが、設定が削除されようとしています。\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %2$.250s を提供 (provides) する %1$.250s が %3$s です。\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s はインストールされていません。\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (バージョン %.250s) がインストールされようとしています。\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (バージョン %.250s) が %s です。\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %2$.250s を提供する %1$.250s がインストールされようとしています。\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %2$.250s を提供する %1$.250s が %3$s です。\n"
@@ -2200,7 +2197,9 @@ msgstr ""
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
-msgstr "使い方: %s [<オプション> ...] <コマンド>\n\n"
+msgstr ""
+"使い方: %s [<オプション> ...] <コマンド>\n"
+"\n"
 
 #: src/main.c:61
 #, c-format
@@ -2232,9 +2231,12 @@ msgid ""
 "\n"
 msgstr ""
 "コマンド:\n"
-"  -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
-"  --unpack          <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
-"  -A|--record-avail <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
+"  -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+"> ...\n"
+"  --unpack          <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+"> ...\n"
+"  -A|--record-avail <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+"> ...\n"
 "  --configure       <パッケージ名> ...    | -a|--pending\n"
 "  -r|--remove       <パッケージ名> ...    | -a|--pending\n"
 "  -P|--purge        <パッケージ名> ...    | -a|--pending\n"
@@ -2244,10 +2246,12 @@ msgstr ""
 "  --update-avail <Packages ファイル> 取得可能なパッケージ情報を更新\n"
 "  --merge-avail <Packages ファイル>  ファイルからパッケージ情報を合成\n"
 "  --clear-avail                      既存の取得可能パッケージ情報を消去\n"
-"  --forget-old-unavail               未インストールの利用不可能パッケージ情報の破棄\n"
+"  --forget-old-unavail               未インストールの利用不可能パッケージ情報"
+"の破棄\n"
 "  -s|--status <パッケージ名> ...     パッケージ状態の詳細を表示\n"
 "  -p|--print-avail <パッケージ名> ...取得可能なバージョンの詳細を表示\n"
-"  -L|--listfiles <パッケージ名> ...  パッケージが「所有する」ファイル一覧を表示\n"
+"  -L|--listfiles <パッケージ名> ...  パッケージが「所有する」ファイル一覧を表"
+"示\n"
 "  -l|--list [<パターン> ...]         パッケージの一覧を簡潔に表示\n"
 "  -S|--search <パターン> ...         ファイルを所有するパッケージを検索\n"
 "  -C|--audit                         壊れているパッケージのチェック\n"
@@ -2277,7 +2281,8 @@ msgid ""
 "\n"
 msgstr ""
 "アーカイブの操作には dpkg -b|--build|-c|--contents|-e|--control|-I|--info|\n"
-" -f|--field|-x|--extract|-X|--vextract|--fsys-tarfile を使用すること (%s --help を参照)\n"
+" -f|--field|-x|--extract|-X|--vextract|--fsys-tarfile を使用すること (%s --"
+"help を参照)\n"
 
 #: src/main.c:99
 #, c-format
@@ -2322,17 +2327,23 @@ msgstr ""
 "オプション:\n"
 "  --admindir=<ディレクトリ>  %s の代わりに指定したディレクトリを使用\n"
 "  --root=<ディレクトリ>      ルートディレクトリを別の場所にしてインストール\n"
-"  --instdir=<ディレクトリ>   インストール先のディレクトリを変更 (admindir は除く)\n"
-"  -O|--selected-only         インストール/アップグレードに選択されていないパッケージをスキップ\n"
-"  -E|--skip-same-version     同バージョンがインストール済みのパッケージをスキップ\n"
-"  -G|--refuse-downgrade      インストール済みパッケージより古いバージョンのパッケージをスキップ\n"
+"  --instdir=<ディレクトリ>   インストール先のディレクトリを変更 (admindir は"
+"除く)\n"
+"  -O|--selected-only         インストール/アップグレードに選択されていない"
+"パッケージをスキップ\n"
+"  -E|--skip-same-version     同バージョンがインストール済みのパッケージをス"
+"キップ\n"
+"  -G|--refuse-downgrade      インストール済みパッケージより古いバージョンの"
+"パッケージをスキップ\n"
 "  -B|--auto-deconfigure      ほかのパッケージを壊してでもインストールする\n"
 "  --no-debsig                パッケージの署名の検証をしない\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             何をするか表示して、実際には何もしない\n"
-"  -D|--debug=<8進数>         デバッグモード (-Dhelp または --debug=help を参照)\n"
+"  -D|--debug=<8進数>         デバッグモード (-Dhelp または --debug=help を参"
+"照)\n"
 "  --status-fd <n>            状態変化の更新をファイル記述子 <n> に送る\n"
-"  --log=<ファイル名>         状態変更およびアクションを指定のファイルに記録する\n"
+"  --log=<ファイル名>         状態変更およびアクションを指定のファイルに記録す"
+"る\n"
 "  --ignore-depends=<パッケージ>,... \n"
 "                                 必要とする依存関係を無視\n"
 "  --force-...                    問題を無視 (--force-help を参照)\n"
@@ -2353,14 +2364,17 @@ msgid ""
 msgstr ""
 "--compare-versions 用比較演算子:\n"
 " lt le eq ne ge gt       (バージョンなしはどのバージョンよりも古いと見なす)\n"
-" lt-nl le-nl ge-nl gt-nl (バージョンなしはどのバージョンよりも新しいと見なす)\n"
+" lt-nl le-nl ge-nl gt-nl (バージョンなしはどのバージョンよりも新しいと見な"
+"す)\n"
 " < << <= = >= >> >       (コントロールファイルの構文の互換性のみ)\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いましょう。\n"
+msgstr ""
+"ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いましょ"
+"う。\n"
 
 #: src/main.c:141
 msgid ""
@@ -2573,7 +2587,7 @@ msgstr "`%i' をストリームとしてオープンできませんでした"
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です"
@@ -2643,13 +2657,18 @@ msgstr "  パッケージ %s はまだ設定されていません。\n"
 #: src/packages.c:328
 #, c-format
 msgid "  Package %s which provides %s is not installed.\n"
-msgstr "  パッケージ %s は %s を提供しますが、まだインストールされていません。\n"
+msgstr ""
+"  パッケージ %s は %s を提供しますが、まだインストールされていません。\n"
 
 #: src/packages.c:331
 #, c-format
 msgid "  Package %s is not installed.\n"
 msgstr "  パッケージ %s はまだインストールされていません。\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " は以下に依存 (depends) します: "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr " ...しかし:\n"
@@ -2812,7 +2831,9 @@ msgstr "dpkg-deb tar 出力の読み取り時にエラーが発生しました"
 
 #: src/processarc.c:565
 msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr "壊れているファイルシステム上の tar ファイル - パッケージアーカイブが壊れています"
+msgstr ""
+"壊れているファイルシステム上の tar ファイル - パッケージアーカイブが壊れてい"
+"ます"
 
 #: src/processarc.c:568
 msgid "dpkg-deb: zap possible trailing zeros"
@@ -2844,10 +2865,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "その他の新しいファイル `%.250s' の状態を取得できません"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: 警告 - 古いファイル `%.250s' がいくつかの新しいファイルと同一です (`"
 "%.250s' と `%.250s' の両方)"
@@ -2864,7 +2885,9 @@ msgstr "情報ディレクトリを読み取れません"
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "旧バージョンのパッケージに含まれる `%.250s' で始まる情報ファイル名はあまりにも長すぎます"
+msgstr ""
+"旧バージョンのパッケージに含まれる `%.250s' で始まる情報ファイル名はあまりに"
+"も長すぎます"
 
 #: src/processarc.c:766
 #, c-format
@@ -3045,7 +3068,8 @@ msgstr ""
 "コマンド:\n"
 "  -s|--status <パッケージ名> ...      パッケージ状態の詳細を表示\n"
 "  -p|--print-avail <パッケージ名> ... 利用可能なバージョンの詳細を表示\n"
-"  -L|--listfiles <パッケージ名> ...   パッケージが「所有する」ファイル一覧を表示\n"
+"  -L|--listfiles <パッケージ名> ...   パッケージが「所有する」ファイル一覧を"
+"表示\n"
 "  -l|--list [<パターン> ...]          パッケージの一覧を簡潔に表示\n"
 "  -W|--show <パターン> ...            パッケージの情報の表示\n"
 "  -S|--search <パターン> ...          ファイルを所有するパッケージを検索\n"
@@ -3311,24 +3335,29 @@ msgstr "--forget-old-unavail は引数をとりません"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - エラー: %s (`%s') が数字を含んでいません\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build は引数としてディレクトリが必要です"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build は多くとも 2 つの引数しかとりません"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "アーカイブ `%.250s' の存在を確認できません"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "対象がディレクトリです。コントロールファイル検証をスキップできません"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3337,45 +3366,45 @@ msgstr ""
 "dpkg-deb: 警告、コントロールエリアの内容のチェックを行いません。\n"
 "dpkg-deb: `%s' から不明なパッケージを構築しています。\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "パッケージ名に小文字アルファベット、英数字、`-+.' 以外の文字があります"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "警告、`%s' がユーザ定義の優先度 `%s' を含んでいます\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "警告、`%s' がユーザ定義のフィールド `%s' を含んでいます\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "コントロールファイルに %d 個のエラーがあります"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%2$s' にパッケージ `%1$s' を構築しています。\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "コントロールディレクトリの許可属性 %03lo は不正です (>=0755 かつ <=0775 でな"
 "ければなりません)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "メンテナスクリプト `%.50s' がテキストファイルかシンボリックリンクではありませ"
 "ん。"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3384,134 +3413,136 @@ msgstr ""
 "メンテナスクリプト `%.50s' の許可属性 %03lo は不正です (>=0555 かつ <=0775 で"
 "なければなりません)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "メンテナスクリプト `%.50s' の状態を取得できません"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "conffiles の読み取り中に fgets からの空の文字"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "警告、設定ファイル名 `%.50s...' は長すぎるか、最後の改行がありません\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "警告、設定ファイル `%s' の後ろに空白が付いています\n\n"
+msgstr ""
+"警告、設定ファイル `%s' の後ろに空白が付いています\n"
+"\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "設定ファイル `%.250s' がパッケージ内にありません"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "設定ファイル `%.250s' の状態を取得できません"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "警告、設定ファイル `%s' がテキストファイルではありません\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "conffiles ファイルの読み取り中にエラーが発生しました"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "conffiles ファイルのオープン中にエラーが発生しました"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: コントロールファイルの %d 個の警告を無視します\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "`%.255s' 用のバッファを開放できません"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' ディレクトリへの移動に失敗しました"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ".../DEBIAN ディレクトリへの移動に失敗しました"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "tar -cf の実行に失敗しました"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "一時ファイルの作成に失敗しました (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "一時ファイル %s のオープンに失敗しました (control)"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "一時ファイル %s の unlink に失敗しました (control)"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "一時ファイルの fstat に失敗しました (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "一時ファイルの rewind に失敗しました (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "一時ファイルの作成に失敗しました (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "一時ファイル %s のオープンに失敗しました (data)"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "一時ファイルのアンリンクに失敗しました (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "データ"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "find の実行に失敗しました"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "tar パイプへの書き込みに失敗しました (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "内部エラー: 圧縮形式 `%i' が不明です!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "一時ファイルの rewind に失敗しました (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (データ)"
 
@@ -3595,24 +3626,24 @@ msgstr ""
 "バージョン %.250s のアーカイブは理解不能です、より新しい dpkg-deb を入手して"
 "ください"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "%s からメンバーデータをスキップしました"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "ファイル `%.250s' は理解不能なデータメンバー %.*s を含んでいます。終了します"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 "ファイル `%.250s' は 2 つのコントロールメンバーを含んでいます。終了します"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3621,16 +3652,16 @@ msgstr ""
 " 新形式 debian パッケージ、バージョン %s。\n"
 " サイズ %ld バイト: コントロールアーカイブ = %zi バイト。\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "コントロール情報長"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "アーカイブは不正なコントロール長 `%s' を含んでいます"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3639,15 +3670,15 @@ msgstr ""
 " 旧形式 debian パッケージ, バージョン %s。\n"
 " サイズ %ld バイト: コントロールアーカイブ = %zi、メインアーカイブ = %ld。\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "`ctrlarea' 変数へのメモリ割り当てに失敗しました"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "コントロールエリア"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3656,65 +3687,65 @@ msgstr ""
 "dpkg-deb: おそらく ASCII モードでダウンロードしたためにアーカイブ\n"
 "dpkg-deb:    ファイルが壊れているようです\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' は debian 形式のアーカイブではありません"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "現在のファイル位置の取得に失敗しました"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "現在のファイル位置の設定に失敗しました"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "ペースト中にパイプ記述子 `1' のオープン (fdopen) に失敗しました"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "gzip -dc への書き込みに失敗しました"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "gzip -dc のクローズに失敗しました"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "files アーカイブの位置に lseek できませんでした"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "コピー中にパイプへの書き込みに失敗しました"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "コピー中にパイプのクローズに失敗しました"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "ディレクトリの作成に失敗しました"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "以下のディレクトリへの移動に失敗しました"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "tar の実行に失敗しました"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s は引数として .deb ファイル名が必要です"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3723,12 +3754,12 @@ msgstr ""
 "--%s は引数に対象となるディレクトリが必要です。\n"
 "おそらく、dpkg --install を使おうとしたのでしょう。"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s は最大でも 2 つの引数 (.deb とディレクトリ) しかとりません"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s は引数をひとつ (.debファイル名) だけとります"
@@ -3771,7 +3802,9 @@ msgstr ""
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "(%2$.255s にある) コンポーネント `%1$.255s' のオープン中に予期しない失敗が起こりました"
+msgstr ""
+"(%2$.255s にある) コンポーネント `%1$.255s' のオープン中に予期しない失敗が起"
+"こりました"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3883,7 +3916,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3894,7 +3927,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "オプション:\n"
@@ -3930,7 +3964,7 @@ msgstr ""
 "*.deb ファイルの操作についてのヘルプは dpkg-deb --help を参照;\n"
 "パッケージのインストール、削除については dpkg --help を参照。"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "`%s' は不明な圧縮形式です!"
@@ -3962,17 +3996,21 @@ msgstr "ファイル `%.250s' は壊れています - 情報セクションが n
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "ファイル `%.250s' の形式バージョンは `%.250s' です - 新しい dpkg-split が必要です"
+msgstr ""
+"ファイル `%.250s' の形式バージョンは `%.250s' です - 新しい dpkg-split が必要"
+"です"
 
 #: dpkg-split/info.c:124
 #, c-format
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
-msgstr "ファイル `%.250s' は壊れています - MD5 チェックサム `%.250s' が不正です"
+msgstr ""
+"ファイル `%.250s' は壊れています - MD5 チェックサム `%.250s' が不正です"
 
 #: dpkg-split/info.c:131
 #, c-format
 msgid "file `%.250s' is corrupt - no slash between part numbers"
-msgstr "ファイル `%.250s' は壊れています - パート番号の間にスラッシュがありません"
+msgstr ""
+"ファイル `%.250s' は壊れています - パート番号の間にスラッシュがありません"
 
 #: dpkg-split/info.c:140
 #, c-format
@@ -3982,22 +4020,28 @@ msgstr "ファイル `%.250s' は壊れています - パート番号が不正
 #: dpkg-split/info.c:145
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
-msgstr "ファイル `%.250s' は壊れています - 第 2 ヘッダの最後のマジックナンバーが不正です"
+msgstr ""
+"ファイル `%.250s' は壊れています - 第 2 ヘッダの最後のマジックナンバーが不正"
+"です"
 
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
-msgstr "ファイル `%.250s' は壊れています - 第 2 メンバーがデータメンバーではありません"
+msgstr ""
+"ファイル `%.250s' は壊れています - 第 2 メンバーがデータメンバーではありませ"
+"ん"
 
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "ファイル `%.250s' は壊れています - パート番号がヘッダのサイズ情報と異なります"
+msgstr ""
+"ファイル `%.250s' は壊れています - パート番号がヘッダのサイズ情報と異なります"
 
 #: dpkg-split/info.c:157
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
-msgstr "ファイル `%.250s' は壊れています - サイズがヘッダのパート番号情報と異なります"
+msgstr ""
+"ファイル `%.250s' は壊れています - サイズがヘッダのパート番号情報と異なります"
 
 #: dpkg-split/info.c:163
 #, c-format
@@ -4139,7 +4183,8 @@ msgstr ""
 "オプション:\n"
 "  --depotdir <ディレクトリ> %s/%s の代わりに <ディレクトリ> を使う\n"
 "  -S|--partsize <サイズ>  -s 用に Kb 単位にする (デフォルトは 450)\n"
-"  -o|--output <ファイル>  -j 用 (デフォルトは <パッケージ>-<バージョン>.deb)\n"
+"  -o|--output <ファイル>  -j 用 (デフォルトは <パッケージ>-<バージョン>."
+"deb)\n"
 "  -Q|--npquiet            -a が 1 つのパートでない場合に出力しない\n"
 "  --msdos                 8.3 形式ファイル名を生成\n"
 "\n"
@@ -4304,9 +4349,9 @@ msgstr "ソースファイル `%.250s' がプレーンファイルではあり
 msgid "unable to exec mksplit"
 msgstr "mksplit を実行できません"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s バージョン %s。\n"
@@ -4315,11 +4360,13 @@ msgstr "Debian %s バージョン %s。\n"
 msgid ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
-msgstr "\nCopyright (C) 1996 Kim-Minh Kaplan."
+msgstr ""
+"\n"
+"Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4345,7 +4392,8 @@ msgstr ""
 "\n"
 "オプション:\n"
 "  --unsafe     有益かもしれないいくつかの追加オプションを設定\n"
-"               警告: このオプションは正しいファイルをごちゃごちゃにしてしまうかもしれません。\n"
+"               警告: このオプションは正しいファイルをごちゃごちゃにしてしまう"
+"かもしれません。\n"
 "  --help       このヘルプを表示\n"
 "  --version    バージョン番号を表示\n"
 
@@ -4375,7 +4423,7 @@ msgid "try deleting %s"
 msgstr "%s の削除を試みています"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "%s をオープンできません: %s"
@@ -4402,7 +4450,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s の読み取り後のクローズに失敗しました: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s をクローズできません: %s"
@@ -4422,12 +4470,12 @@ msgstr "%s のインストールに失敗しました; %s として残します:
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: %s のロック解除に失敗しました: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "%s から ENOENT 値を取得できません: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4437,7 +4485,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4479,7 +4527,8 @@ msgstr ""
 "                             パッケージ名\n"
 "  --local                    すべてのパッケージのバージョンが退避される\n"
 "  --divert <退避先>          ほかのパッケージのバージョンで使われる名前\n"
-"  --rename                   実際にファイルを別の場所に移動する (あるいは戻す)\n"
+"  --rename                   実際にファイルを別の場所に移動する (あるいは戻"
+"す)\n"
 "  --admindir <ディレクトリ>  退避ファイルのディレクトリを設定\n"
 "  --test                     何もせず、単にデモを行う\n"
 "  --quiet                    静かな操作として、最小限の出力にする\n"
@@ -4487,92 +4536,94 @@ msgstr ""
 "  --version                  バージョン番号を表示\n"
 "\n"
 "追加時のデフォルトは --local と --divert <オリジナル>.distrib です。\n"
-"削除時は --package または --local と、--divert が (指定されている場合は) 一致している必要があります。\n"
-"パッケージの preinst/postrm スクリプトは --package と --divert を常に指定すべきです。\n"
+"削除時は --package または --local と、--divert が (指定されている場合は) 一致"
+"している必要があります。\n"
+"パッケージの preinst/postrm スクリプトは --package と --divert を常に指定すべ"
+"きです。\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "2 つのモードが指定されました: %s と --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s は退避先の引数が必要です"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "退避先は改行を含んではなりません"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s は引数として <パッケージ> が必要です"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "パッケージは改行を含んではなりません"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s は引数として <ディレクトリ> が必要です"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "不明なオプション `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "diversions ファイルをオープンできませんでした: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "alternatives 名が見つかりません"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "パッケージが見つかりません"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s は引数が 1 つ必要です"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ファイル名 `%s' は絶対パスではありません"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "ファイルは改行を含んでいてはなりません"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "ディレクトリは退避できません"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "`%s' を残します"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' が `%s' と衝突します"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' を追加しています"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4583,7 +4634,7 @@ msgstr ""
 "  `%s' の削除中に\n"
 "  `%s' を発見しました"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4594,37 +4645,37 @@ msgstr ""
 "  `%s' の削除中に\n"
 "  `%s' を発見しました"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "%s を削除しています"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "退避先 `%s' がないので、何も削除されません"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "内部エラー - 不正なモード `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "古い名前 `%s' の状態を取得できません: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "新しい名前 `%s' の状態を取得できません: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' の確認中にエラーが発生しました: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4633,58 +4684,60 @@ msgstr ""
 "名前変更は `%s' を異なるファイル `%s' で上書きすることを伴います。\n"
 "これは許可されていません。"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "名前変更: 重複する古いリンク `%s' を削除してください: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "名前変更: `%s' を `%s' に名前変更します: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new を作成: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new を書き込み: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new をクローズ: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "古い diversions-old を削除: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "新しい diversions-old を作成: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "新しい退避をインストール: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部エラー: %s は壊れています: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
-msgstr "\nCopyright (C) 2000 Wichert Akkerman."
+msgstr ""
+"\n"
+"Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4719,106 +4772,106 @@ msgstr ""
 "  --help                     このヘルプを表示\n"
 "  --version                  バージョン番号を表示\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "モードが指定されていません"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add は 4 つの引数が必要です"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "不正なユーザ %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "存在しないユーザ %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "不正なグループ %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "存在しないグループ %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "不正なモード %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "末尾の / を取り除いています"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\" の override がすでに存在します。"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "しかし、--force が指定されているので無視します。"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "中止しています"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "警告: --update が指定されましたが、%s は存在しません"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "chown %s に失敗しました: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod %s に失敗しました: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "override が提供されていません。"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "警告: --update は --remove には無意味です"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "statoverride ファイルをオープンできません: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "\"%s\" に対する複数の override があります。中止します"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "新しい statoverride ファイルをオープンできません: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "statoverride-old の削除中にエラーが発生しました: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "新しい statoverride-old の作成中にエラーが発生しました: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "新しい statoverride のインストール中にエラーが発生しました: %s"
@@ -4827,7 +4880,9 @@ msgstr "新しい statoverride のインストール中にエラーが発生し
 msgid ""
 "\n"
 "Copyright (C) 1994,1995 Ian Jackson."
-msgstr "\nCopyright (C) 1994,1995 Ian Jackson."
+msgstr ""
+"\n"
+"Copyright (C) 1994,1995 Ian Jackson."
 
 #: scripts/install-info.pl:31
 #, perl-format
@@ -4860,16 +4915,20 @@ msgstr ""
 "\n"
 "オプション:\n"
 "  --section <正規表現> <タイトル>\n"
-"                           <正規表現> にマッチするセクションに新しいエントリを\n"
-"  置くか、存在しない場合は <タイトル> のタイトルを持つ新しいエントリを作成する\n"
+"                           <正規表現> にマッチするセクションに新しいエントリ"
+"を\n"
+"  置くか、存在しない場合は <タイトル> のタイトルを持つ新しいエントリを作成す"
+"る\n"
 "  --menuentry=<テキスト>   メニューエントリを設定する\n"
 "  --description=<テキスト> メニューエントリで使われる記述を設定する\n"
-"  --info-file=<パス>       ディレクトリにインストールするinfo ファイルを指定する\n"
+"  --info-file=<パス>       ディレクトリにインストールするinfo ファイルを指定"
+"する\n"
 "  --dir-file=<パス>        info ディレクトリファイルのファイル名を指定する\n"
 "  --infodir=<ディレクトリ> '--dir-file=<ディレクトリ>/dir' と同じ\n"
 "  --info-dir=<ディレクトリ> 同上\n"
 "  --keep-old               エントリを置き換えず、空のエントリも削除しない\n"
-"  --remove                 <ファイル名> ベース名で指定されたエントリを削除する\n"
+"  --remove                 <ファイル名> ベース名で指定されたエントリを削除す"
+"る\n"
 "  --remove-exactly         <ファイル名> に正確に一致するエントリを削除する\n"
 "  --test                   テストモードを有効化 (実行は行われない)\n"
 "  --debug                  デバッグモードを有効化 (より詳細な情報を表示)\n"
@@ -4910,7 +4969,8 @@ msgstr "%s: テストモード - dir ファイルは更新されません"
 #: scripts/install-info.pl:191
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
-msgstr "%s: 警告、ファイル内のごちゃごちゃになった INFO-DIR-ENTRY を無視しています"
+msgstr ""
+"%s: 警告、ファイル内のごちゃごちゃになった INFO-DIR-ENTRY を無視しています"
 
 #: scripts/install-info.pl:200
 msgid "invalid info entry"
@@ -4930,7 +4990,8 @@ msgstr ""
 #: scripts/install-info.pl:279
 #, perl-format
 msgid "%s: no file %s, retrieving backup file %s."
-msgstr "%s: ファイル %s がありません。バックアップファイル %s を取得しています。"
+msgstr ""
+"%s: ファイル %s がありません。バックアップファイル %s を取得しています。"
 
 #: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
@@ -4940,7 +5001,9 @@ msgstr "%s: %s から %s へのコピーが失敗しました。終了します:
 #: scripts/install-info.pl:288
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
-msgstr "%s: 利用可能なバックアップファイル %s がありません。デフォルトファイルを取得しています。"
+msgstr ""
+"%s: 利用可能なバックアップファイル %s がありません。デフォルトファイルを取得"
+"しています。"
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5032,7 +5095,7 @@ msgstr "%s を読み取れません: %d"
 msgid "dbg: %s"
 msgstr "デバッグ: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5042,8 +5105,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5063,7 +5126,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5088,15 +5151,19 @@ msgstr ""
 "  --install <リンク> <名前> <パス> <優先度>\n"
 "    [--slave <リンク> <名前> <パス>] ...\n"
 "                           システムに alternatives のグループを追加する\n"
-"  --remove <名前> <パス>   <名前> のグループ alternative から <パス> を削除する\n"
-"  --remove-all <名前>      alternatives システムから <名前> のグループを削除する\n"
+"  --remove <名前> <パス>   <名前> のグループ alternative から <パス> を削除す"
+"る\n"
+"  --remove-all <名前>      alternatives システムから <名前> のグループを削除"
+"する\n"
 "  --auto <名前>            マスターリンク <名前> を、自動モードに切り替える\n"
 "  --display <名前>         <名前> グループについての情報を表示する\n"
 "  --list <名前>            <名前> グループのすべてのターゲットを表示する\n"
-"  --config <名前>          <名前> グループの alternatives を表示し、ユーザに\n"
+"  --config <名前>          <名前> グループの alternatives を表示し、ユーザ"
+"に\n"
 "                           使用したいものを尋ねる\n"
 "  --set <名前> <パス>      <名前> の alternative として <パス> を設定する\n"
-"  --all                    すべての alternatives に対して --config を呼び出す\n"
+"  --all                    すべての alternatives に対して --config を呼び出"
+"す\n"
 "\n"
 "<リンク> は /etc/alternatives/<名前> を指すシンボリックリンクです。\n"
 "  (例: /usr/bin/pager)\n"
@@ -5116,159 +5183,162 @@ msgstr ""
 "  --help                      このヘルプを表示\n"
 "  --version                   バージョン番号を表示\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "`%s' は不明な引数です"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "優先度は整数でなければなりません"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s は <名前> <パス> が必要です"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s は <名前> が必要です"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave は<リンク> <名前> <パス> が必要です"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "スレーブ名 %s が重複しています"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "スレーブリンク %s が重複しています"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "名前 %s がプライマリ/スレーブの両方にあります"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "リンク %s がプライマリ/スレーブの両方にあります"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr "--display、--config、--set、--install、--remove、--all、--remove-all、--auto のいずれかが必要です。"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave は --install と一緒のみ許可されています"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manフラグ"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "スレーブ %s が重複しています"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "スレーブリンクがメインリンク %s と同一です"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "スレーブリンク %s が重複しています"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "パス %s が重複しています"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "優先度 %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
-msgstr "%s の alternative が %s を指していますが、発見できませんでした。alternatives のリストから削除しています。"
+msgstr ""
+"%s の alternative が %s を指していますが、発見できませんでした。alternatives "
+"のリストから削除しています。"
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s の alternatives がありません。"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s -状態は %s。"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " リンクは現在 %s を指しています"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr "リンクは現在ありません"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "リンクを読み取れません - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 優先度 %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " スレーブ %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "利用可能なバージョンはありません。"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "現在の `最適' バージョンは %s です。"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "`%s' は不明な引数です"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "優先度は整数でなければなりません"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s は <名前> <パス> が必要です"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s は <名前> が必要です"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave は<リンク> <名前> <パス> が必要です"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "スレーブ名 %s が重複しています"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "スレーブリンク %s が重複しています"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "名前 %s がプライマリ/スレーブの両方にあります"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "リンク %s がプライマリ/スレーブの両方にあります"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"--display、--config、--set、--install、--remove、--all、--remove-all、--auto "
+"のいずれかが必要です。"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave は --install と一緒のみ許可されています"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s の自動選択を設定しています。"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s を削除できません: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5277,76 +5347,80 @@ msgstr ""
 "%s が (手動あるいはスクリプトにより) 変更されました。\n"
 "手動更新のみに切り替えています。"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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 ""
 "%s の利用可能なバージョンを確認し、%s のリンクを更新しています ...\n"
-"(望むなら、これらのシンボリックリンクをあなた自身で変更することもできます。`man ln' を参照してください。)"
+"(望むなら、これらのシンボリックリンクをあなた自身で変更することもできます。"
+"`man ln' を参照してください。)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s のリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s から %s に名前変更できません: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "スレーブリンク名 %s が重複しています"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s のスレーブリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
-msgstr "手動で選択された alternative を削除しています - 自動モードに切り替えています"
+msgstr ""
+"手動で選択された alternative を削除しています - 自動モードに切り替えています"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s の alternative %1$s は登録されていません。削除は行いません。"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "古いスレーブリンク %s を破棄しています (%s)。"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s の自動更新は無効になっています。そのままにしておきます。"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "自動更新に戻るには、`update-alternatives --auto %s' を使ってください。"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "以前に失敗した %s の更新を修復しています ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s を書き込み用にオープンできません: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
-msgstr "%s (%s) を提供する最後のパッケージが削除されました。alternative を削除しています。"
+msgstr ""
+"%s (%s) を提供する最後のパッケージが削除されました。alternative を削除してい"
+"ます。"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5355,51 +5429,53 @@ msgstr ""
 "警告: %s は %s へのシンボリックリンク (あるいは存在しない) であると想定\n"
 "されています; しかし、readlink が失敗しました: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s が存在しないことを確定できません: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s を %s としてインストールできません: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%3$s を指している %1$s (%2$s) をそのままにします。"
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%3$s を指している %1$s (%2$s) を更新しています。"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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"
+msgstr ""
+"警告: %s は %s へのスレーブシンボリックリンク (あるいは存在しない) であると想"
+"定されています; しかし、readlink が失敗しました: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%3$s に適当でない %1$s を削除しています (%2$s)。"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5408,7 +5484,7 @@ msgstr ""
 "%s を提供するプログラムが 1 つしかありません (%s)。\n"
 "設定は行いません。\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5421,45 +5497,57 @@ msgstr ""
 "  選択肢       alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "デフォルト[*] のままにするには Enter、さもなければ選択肢の番号のキーを押してください: "
+msgstr ""
+"デフォルト[*] のままにするには Enter、さもなければ選択肢の番号のキーを押して"
+"ください: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%2$s' を提供するために `%1$s' を使います。"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "alternative `%s' が見つかりません。"
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "標準出力への書き込み中にエラーが発生しました: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives ファイル内での改行は禁止されています (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
-msgstr "%2$s の %1$s の読み取り中にエラーが発生したか eof を読み取りました (%3$s)"
+msgstr ""
+"%2$s の %1$s の読み取り中にエラーが発生したか eof を読み取りました (%3$s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s の後の改行がありません"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "深刻な問題: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: gzip -dc の実行に失敗しました"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: bzip2 -dc の実行に失敗しました"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: bzip2 %s の実行に失敗しました"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "%.250s を作成できません"
 
@@ -5593,63 +5681,85 @@ msgstr "深刻な問題: %s"
 #~ "使用方法: %s [<オプション> ...] <コマンド>\n"
 #~ "\n"
 #~ "コマンド:\n"
-#~ "  -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
-#~ "  --unpack          <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
-#~ "  -A|--record-avail <.deb ファイル名> ... | -R|--recursive <ディレクトリ> ...\n"
+#~ "  -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+#~ "> ...\n"
+#~ "  --unpack          <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+#~ "> ...\n"
+#~ "  -A|--record-avail <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
+#~ "> ...\n"
 #~ "  --configure       <パッケージ名> ...    | -a|--pending\n"
 #~ "  -r|--remove       <パッケージ名> ...    | -a|--pending\n"
 #~ "  -P|--purge        <パッケージ名> ...    | -a|--pending\n"
 #~ "  --get-selections [<パターン> ...]  標準出力にパッケージ選択一覧を表示\n"
-#~ "  --set-selections                   標準入力からパッケージ選択一覧を設定\n"
-#~ "  --clear-selection                  すべての必須でないパッケージを選択解除\n"
+#~ "  --set-selections                   標準入力からパッケージ選択一覧を設"
+#~ "定\n"
+#~ "  --clear-selection                  すべての必須でないパッケージを選択解"
+#~ "除\n"
 #~ "  --update-avail <Packages ファイル> 取得可能なパッケージ情報を更新\n"
 #~ "  --merge-avail <Packages ファイル>  ファイルからパッケージ情報を合成\n"
 #~ "  --clear-avail                      既存の取得可能パッケージ情報を消去\n"
-#~ "  --forget-old-unavail               未インストールの利用不可能パッケージ情報の破棄\n"
+#~ "  --forget-old-unavail               未インストールの利用不可能パッケージ"
+#~ "情報の破棄\n"
 #~ "  -s|--status <パッケージ名> ...     パッケージ状態の詳細を表示\n"
 #~ "  -p|--print-avail <パッケージ名> ...取得可能なバージョンの詳細を表示\n"
-#~ "  -L|--listfiles <パッケージ名> ...  パッケージが「所有する」ファイル一覧を表示\n"
+#~ "  -L|--listfiles <パッケージ名> ...  パッケージが「所有する」ファイル一覧"
+#~ "を表示\n"
 #~ "  -l|--list [<パターン> ...]         パッケージの一覧を簡潔に表示\n"
 #~ "  -S|--search <パターン> ...         ファイルを所有するパッケージを検索\n"
 #~ "  -C|--audit                         壊れているパッケージのチェック\n"
-#~ "  --print-architecture               対象アーキテクチャを表示 (GCC を使用)\n"
+#~ "  --print-architecture               対象アーキテクチャを表示 (GCC を使"
+#~ "用)\n"
 #~ "  --compare-versions <a> <rel> <b>   バージョン番号を比較 - 下記参照\n"
 #~ "  --help                             このヘルプを表示\n"
 #~ "  --version                          バージョン番号を表示\n"
 #~ "  --force-help | -Dh|--debug=help    強制/デバッグオプションのヘルプ\n"
 #~ "  --licence | --licence              ライセンス条項を表示\n"
 #~ "\n"
-#~ "アーカイブの操作には dpkg -b|--build|-c|--contents|-e|--control|-I|--info|\n"
-#~ "-f|--field|-x|--extract|-X|--vextract|--fsys-tarfile を使用すること (%s --help を参照)\n"
+#~ "アーカイブの操作には dpkg -b|--build|-c|--contents|-e|--control|-I|--"
+#~ "info|\n"
+#~ "-f|--field|-x|--extract|-X|--vextract|--fsys-tarfile を使用すること (%s --"
+#~ "help を参照)\n"
 #~ "\n"
 #~ "内部使用法: dpkg --assert-support-predepends | --predep-package |\n"
-#~ "  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
+#~ "  --assert-working-epoch | --assert-long-filenames | --assert-multi-"
+#~ "conrep\n"
 #~ "\n"
 #~ "オプション:\n"
 #~ "  --admindir=<ディレクトリ>  %s の代わりに指定したディレクトリを使用\n"
-#~ "  --root=<ディレクトリ>      ルートディレクトリを別の場所にしてインストール\n"
-#~ "  --instdir=<ディレクトリ>   インストール先のディレクトリを変更 (admindir は除く)\n"
-#~ "  -O|--selected-only         インストール/アップグレードに選択されていないパッケージをスキップ\n"
-#~ "  -E|--skip-same-version     同バージョンがインストール済みのパッケージをスキップ\n"
-#~ "  -G|--refuse-downgrade      インストール済みパッケージより古いバージョンのパッケージをスキップ\n"
-#~ "  -B|--auto-deconfigure      ほかのパッケージを壊してでもインストールする\n"
+#~ "  --root=<ディレクトリ>      ルートディレクトリを別の場所にしてインストー"
+#~ "ル\n"
+#~ "  --instdir=<ディレクトリ>   インストール先のディレクトリを変更 (admindir "
+#~ "は除く)\n"
+#~ "  -O|--selected-only         インストール/アップグレードに選択されていない"
+#~ "パッケージをスキップ\n"
+#~ "  -E|--skip-same-version     同バージョンがインストール済みのパッケージを"
+#~ "スキップ\n"
+#~ "  -G|--refuse-downgrade      インストール済みパッケージより古いバージョン"
+#~ "のパッケージをスキップ\n"
+#~ "  -B|--auto-deconfigure      ほかのパッケージを壊してでもインストールす"
+#~ "る\n"
 #~ "  --no-debsig                パッケージの署名の検証をしない\n"
 #~ "  --no-act|--dry-run|--simulate\n"
 #~ "                             何をするか表示して、実際には何もしない\n"
-#~ "  -D|--debug=<8進数>         デバッグモード (-Dhelp または --debug=help を参照)\n"
+#~ "  -D|--debug=<8進数>         デバッグモード (-Dhelp または --debug=help を"
+#~ "参照)\n"
 #~ "  --status-fd <n>            状態変化の更新をファイル記述子 <n> に送る\n"
-#~ "  --log=<ファイル名>         状態変更およびアクションを指定のファイルに記録する\n"
+#~ "  --log=<ファイル名>         状態変更およびアクションを指定のファイルに記"
+#~ "録する\n"
 #~ "  --ignore-depends=<パッケージ>,...  必要とする依存関係を無視\n"
 #~ "  --force-...                    問題を無視 (--force-help を参照)\n"
 #~ "  --no-force-...|--refuse-...    問題が発生した時点で終了\n"
 #~ "  --abort-after <n>              <n> 回エラーが発生したら中断\n"
 #~ "\n"
 #~ "--compare-versions 用比較演算子:\n"
-#~ " lt le eq ne ge gt       (バージョンなしはどのバージョンよりも古いと見なす)\n"
-#~ " lt-nl le-nl ge-nl gt-nl (バージョンなしはどのバージョンよりも新しいと見なす)\n"
+#~ " lt le eq ne ge gt       (バージョンなしはどのバージョンよりも古いと見な"
+#~ "す)\n"
+#~ " lt-nl le-nl ge-nl gt-nl (バージョンなしはどのバージョンよりも新しいと見な"
+#~ "す)\n"
 #~ " < << <= = >= >> >       (コントロールファイルの構文の互換性のみ)\n"
 #~ "\n"
-#~ "ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いましょう。\n"
+#~ "ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いま"
+#~ "しょう。\n"
 
 #~ msgid "  Package "
 #~ msgstr "  パッケージ "
@@ -5735,7 +5845,8 @@ msgstr "深刻な問題: %s"
 #~ "  --showformat=<フォーマット>  --show に別のフォーマットを使用\n"
 #~ "  -D                           デバッグ情報出力\n"
 #~ "  --old, --new                 アーカイブの形式を制御    \n"
-#~ "  --nocheck コントロールファイルのチェックを抑制 (不良パッケージが作成される)\n"
+#~ "  --nocheck コントロールファイルのチェックを抑制 (不良パッケージが作成され"
+#~ "る)\n"
 #~ "  -z#                          構築時の圧縮レベルを設定\n"
 #~ "  -Z<type>                     構築時の圧縮形式を設定\n"
 #~ "                               可能な値: bzip, bzip2, none\n"
@@ -5783,7 +5894,8 @@ msgstr "深刻な問題: %s"
 #~ "オプション:\n"
 #~ "  --depotdir <ディレクトリ> (デフォルトは %s/%s)\n"
 #~ "  -S|--partsize <サイズ>    (Kb単位, -s 用, デフォルトは 450)\n"
-#~ "  -o|--output <ファイル>    (-j 用, デフォルトは <package>-<version>.deb)\n"
+#~ "  -o|--output <ファイル>    (-j 用, デフォルトは <package>-<version>."
+#~ "deb)\n"
 #~ "  -Q|--npquiet              (-a がひとつのパートでない場合に出力しない)\n"
 #~ "  --msdos                   (8.3 形式ファイル名を生成)\n"
 #~ "\n"
diff --git a/po/km.po b/po/km.po
index 46214b0b..1b24caed 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -59,72 +59,57 @@ msgstr "គ្មាន​កំហុស​ប្រព័ន្ធលេខ%d"
 msgid "Signal no.%d"
 msgstr "សញ្ញា​លេខ%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s ៖ បាន​បរាជ័​យក្នុ​ងការប្រតិបត្តិ gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s ៖ កំហុស​ gzip ខាងក្នុង​ ៖ `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s ៖ កំហុស bzip2 ខាង​ក្នុង ៖ `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s ៖ មិន​បង្ហាប់​"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s ៖ កំហុស gzip ខាងក្នុង ៖ អាន ៖ `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s ៖: កំហុស gzip ខាងក្នុង ៖ សរសេរ ៖ `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s ៖ កំហុស gzip ខាងក្នុង ៖ អាន(%i) != សរសេរ(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s ៖ បាន​បរាជ័​យក្នុ​ងការប្រតិបត្តិ gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s ៖ កំហុស bzip2 ខាងក្នុង ៖ `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s ៖ កំហុស bzip2 ខាងក្នុង ៖ សរសេរ ៖ `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s ៖ កំហុស bzip2 ខាងក្នុង ៖ អាន(%i) != សរសេរ(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s ៖ បាន​បរាជ័​យក្នុ​ងការ​ប្រតិបត្តិ bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s ៖ បង្ហាប់​"
@@ -152,7 +137,8 @@ msgstr "ថតភាព​ទាន់សម័យ​មានឯកសារ `%
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr "ធ្វើ​ឲ្យទាន់សម័​យនូវថត​ដែ​លមានឯកសារ ដែលមានឈ្មោះប្រវែងខុសគ្នា (ទាំង %d និង %d)"
 
 #: lib/dbmodify.c:77
@@ -165,7 +151,7 @@ msgstr "មិន​អា​ចវិ​ភាគ​រកថតដែលទា
 msgid "failed to remove incorporated update file %.255s"
 msgstr "បាន​បរាជ័​យក្នុ​ងការយកឯ​កសារទា​ន់​សម័យ​ដែលបានចូលរួមចេញ %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "មិន​អាច​បង្កើត​ `%.255s'"
@@ -415,7 +401,8 @@ msgstr "ថត​មេ ឬ ថតទទេដែលត្រូវបាន​
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr "វាល `%s' ឈ្មោះ​កញ្ចប់​ដែល​បាត់ ឬ អ្វី​ដែលនៅសល់ ដែល​ឈ្មោះកញ្ចប់​ត្រូវបាន​រំពឹងទុក"
 
 #: lib/fields.c:340
@@ -884,158 +871,160 @@ msgstr "ការ​បិទរ៉ាត់ បាត់​ក្នុង​
 msgid "failed to realloc for variable buffer"
 msgstr "​"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  មិនបង្ហាញ !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "កំហុស​ក្នុ​ងការ​អាន​ពី​បំពង់ dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់ត្រា​ពេល​វេលា​របស់ `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់ `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​សិទ្ធិ​របស់ `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
-msgstr "ព្យាយាម​សរសេរ​ជាន់​លើ `%.250s' ដែល​ជា​កំណែ​ដែល​បាន​បំបែរ​របស់ `%.250s'%.10s%.100s%.10s"
+msgstr ""
+"ព្យាយាម​សរសេរ​ជាន់​លើ `%.250s' ដែល​ជា​កំណែ​ដែល​បាន​បំបែរ​របស់ `%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (កញ្ចប់ ៖ "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "មិន​អាច​ចាប់ផ្ដើម `%.255s' (ដែល​ខ្ញុំ​រៀប​នឹង​ដំឡើង)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr "មិន​អាច​សម្អាត​ភាព​រាយប៉ាយ​នៅ​ជុំវិញ `%.255s' មុនពេល​ដំឡើង​កំណែ​ផ្សេងៗ​ទៀត"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "មិន​អាច​ចាប់​ផ្ដើម​ស្ដារ `%.255s' មុន​ពេល​ដំឡើង​កំណែ​ផ្សេងៗ​ទៀត"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "ប័ណ្ណសារ​​បាន​ផ្ទុក​វត្ថុ `%.255s' នៃ​ប្រភេទ​ដែល​មិន​ស្គាល់ 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "កំពុង​ជំនួស​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ចាស់ %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "បាន​ជំនួស​ដោយ​ឯកសារ​នៅ​ក្នុង​កញ្ចប់​ដែល​បាន​ដំឡើង %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "ព្យាយាម​សរសេរជាន់​លើ​ថត `%.250s' នៅ​ក្នុង​កញ្ចប់ %.250s ដែល​គ្មាន​ថត"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "ព្យាយាម​សរសេរជាន់​លើ `%.250s' ដែល​មាន​នៅ​ក្នុង​កញ្ចប់ %.250s ផង​ដែរ"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "បញ្ចប់ឯកសារ​ដែល​បានជំនួស `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "កម្មវិធី​​​ខា​ងក្រោ​យ​របស់​ dpkg-deb​ កំឡុង​ពេល​ `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "កំហុស​ក្នុ​​ងការបិទ/សរសេរ `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​បំពង់ `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ឧបករណ៍ `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណរឹង `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណ​និមិត្ត​សញ្ញា `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​កំណត់​ភាព​ជា​ម្ចាស់​របស់​តំណ​និមិត្ត​សញ្ញា `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ថត `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "មិន​អាច​ផ្លាស់ទី​ផ្នែក `%.255s' ដើម្បី​ដំឡើង​កំណែ​ថ្មី"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "មិន​អាច​អាន​តំណ `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "មិន​អាច chown តំណ​និមិត្ត​សញ្ញា​ព័ត៌មាន​បម្រុង​ទុក​សម្រាប់ `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "មិន​អាច​បង្កើត​តំណ​ព័ត៌មាន​បម្រុងទុក​របស់ `%.255s' មុន​ពេល​ដំឡើង​កំណែ​ថ្មី"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "មិន​អាច​ដំឡើង​កំណែ​ថ្មី​របស់ `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1044,7 +1033,7 @@ msgstr ""
 "dpkg ៖ ការព្រមាន - មិន​អើពើ​បញ្ហា​ភាព​អាស្រ័យ​ដោយ​ការ​យក %s ចេញ ៖\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1053,7 +1042,7 @@ msgstr ""
 "dpkg ៖ ការព្រមាន - ចាត់ទុក​ការមិនកំណត់​រចនាសម្ព័ន្ធនៃ​កញ្ចប់ %s ចាំបាច់\n"
 " ដើម្បីអនុញ្ញាត​ឲ្យ​យកចេញ​នៃ %s ។\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1062,7 +1051,7 @@ msgstr ""
 "dpkg ៖ គ្មាន %s គឺចាំបាច់ នឹងមិនកំណត់​រចនា​សម្ព័ន្ធ\n"
 " វា​ដើម្បីអនុញ្ញាត​ឲ្យយកចេញ​នៃ %s ។\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1071,39 +1060,44 @@ msgstr ""
 "dpkg ៖ គ្មាន មិនអាច​យក %s ចេញ (--auto-deconfigure នឹងជួយ) ៖\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg ៖ ការពិនិត្យ​ការយកចេញ %s នៅក្នុងការពេញចិត្ត​នៃ %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s មិន​ត្រូវ​បាន​ដំឡើង​យ៉ាង​ត្រឹមត្រូវ - មិន​អើពើ​ភាព​អាស្រ័យ​មួយ​ចំនួន​នៅ​លើ​វា ។\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg ៖ ប្រហែល​ជាមានបញ្ហា​ក្នុងការ​យក​ %s ចេញ នៅពេល​ដែល​វា​ផ្ដល់​ %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ឲ្យ​ដំឡើង​ម្ដងទៀត ប៉ុន្តែ វា​នឹង​យកចេញ​ នៅពេល​ដែល​អ្នក​ស្នើ ។\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg ៖ កញ្ចប់ %s ទាមទារ​ការ​ដំឡើ​ងឡើង​វិញ នឹង​មិន​យកចេញ​ទេ ។\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg ៖ បាទ នឹង​យក %s ចេញ នៅក្នុង ការពេញចិត្ត​នៃ​ %s ។\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1112,72 +1106,72 @@ msgstr ""
 "dpkg ៖ គិតថា​ %s មានចំណុះ​ %s ៖\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "ការ​ប៉ះទង្គិច​កញ្ចប់ - មិន​ដំឡើង %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg ៖ ការ​ព្រមាន - មិន​អើពើ​ការ​ប៉ះទង្គិច ទោះ​ជា​យ៉ាងណាក៏​ដោយ​អាច​ធ្វើ​បន្ត​បាន !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --រង្វិលជុំ ត្រូវការ​យ៉ាងហោចណាស់​​អាគុយម៉ង់​ផ្លូវ​មួ"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "បានបរាជ័យក្នុងការប្រតិបត្តិរក --រង្វិលជុំ"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "បរាជ័យ​ក្នុងការ​ fdopen បំពង់​របស់​ការរក"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "កំហុស​ក្នុង​ការអាន​បំពង់​របស់​ការ​រក"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "កំហុស​ក្នុង​ការ​បិទ​បំពង់​របស់​ការ​រក"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "រកមើល --រង្វិលជុំ បានត្រឡប់​កំហុស​ដែលមិនបាន​ដោះស្រាយ %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "បានស្វែងរក ប៉ុន្តែរកមិនឃើញកញ្ចប់ (ការផ្គូផ្គងឯកសារ *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s ត្រូវ​ការ​យ៉ាងហោច​ណាស់​អាគុយម៉ង់​ឯកសារ​ប័ណ្ណសារ​កញ្ចប់​មួយ"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "ជ្រើស​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ពី​មុន %s ។\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "​រំលង​កញ្ចប់​ដែល​មិន​បាន​ជ្រើស​ %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "កំណែ %.250s នៃ %.250s បានដំឡើងរួចហើយ រំលង ។\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - ព្រមាន ៖ កំពុងបន្ទាប %.250s ពី %.250s ទៅ %.250s ។\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "នឹង​មិន​បន្ទាប %.250s ពី​កំណែ %.250s ទៅ %.250s រំលង ។\n"
@@ -1289,7 +1283,8 @@ msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​ប្ដូរ​ឈ្មោះ `%.250s' ទៅ​ជា `%.250s' ៖ %s\n"
+msgstr ""
+"dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​ប្ដូរ​ឈ្មោះ `%.250s' ទៅ​ជា `%.250s' ៖ %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1299,12 +1294,14 @@ msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក​កំណែ​ចែកចាយ​ចាស់​របស់ `%.250s' ចេញ ៖ %s\n"
+msgstr ""
+"dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក​កំណែ​ចែកចាយ​ចាស់​របស់ `%.250s' ចេញ ៖ %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក `%.250s' ចេញ (មុន​ពេល​សរសេរ​ជាន់​លើ) ៖ %s\n"
+msgstr ""
+"dpkg ៖ %s ៖ ព្រមាន - បាន​បរាជ័យ​ក្នុង​ការ​យក `%.250s' ចេញ (មុន​ពេល​សរសេរ​ជាន់​លើ) ៖ %s\n"
 
 #: src/configure.c:267
 #, c-format
@@ -1362,7 +1359,8 @@ msgstr ""
 msgid ""
 "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
 "s')\n"
-msgstr "dpkg ៖ %s ៖ ព្រមាន - conffile `%.250s' មិនមែនជា​ឯកសារធម្មតា ឬ symlink (= `%s')\n"
+msgstr ""
+"dpkg ៖ %s ៖ ព្រមាន - conffile `%.250s' មិនមែនជា​ឯកសារធម្មតា ឬ symlink (= `%s')\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1541,110 +1539,117 @@ msgstr "EOF នៅលើ stdin នៅប្រអប់​បញ្ចូល con
 msgid "unable to check for existence of `%.250s'"
 msgstr "មិន​អាច​ពិនិត្យ​ភាព​មាន​ស្រាប់​របស់ `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr "អាស្រ័យ​លើ​"
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " ភាពអាស្រ័យ​ជាមុន​នៅលើ "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " ផ្ដល់អនុសាសន៍ "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " ផ្ដល់យោបល់ "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " បំបែក "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " ប៉ះទង្គិច​ជាមួយ​នឹង "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " ផ្ដល់យោបល់ "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " បន្ថែម "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s មិន​ត្រូវ​បាន​យកចេញ​ទេ ។\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s ត្រូវតែបានកំណត់រចនាសម្ព័ន្ធ ។\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​តែ​បាន​ដំឡើង ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​តែ​បាន​ដំឡើង ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ត្រូវ​បាន​ពន្លា ប៉ុន្តែ​មិន​ដែល​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ទេ ។\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ត្រូវ​បាន​ពន្លា ប៉ុន្តែ​គឺ​ជា​កំណែ %.250s ។\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s កំណែ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​ចុង​ក្រោយ​គឺ %.250s ។\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s គឺជា %s ។\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែ​ត្រូវតែ​បាន​យក​ចេញ ។\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែ​ត្រូវតែ​បាន​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ផ្ដល់ %.250s ប៉ុន្តែជា %s ។\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s មិន​ត្រូវ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (កំណែ %.250s) ត្រូវតែ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (កំណែ %.250s) គឺជា %s ។\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ផ្ដល់ %.250s និង​ត្រូវតែ​បាន​ដំឡើង ។\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s ផ្ដល់ %.250s និង​គឺជា %s ។\n"
@@ -1756,7 +1761,8 @@ msgid "--print-architecture does not take any argument"
 msgstr "--ការ​បោះពុម្ព​ស្ថាបត្យកម្ម​មិន​ត្រូវការ​អាគុយម៉ង់​ទេ"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--ការ​ប្រៀបធៀប​កំណែ​ត្រូវការ​​អាគុយម៉ង់​បី ៖ <version> <relation> <version>"
 
 #: src/enquiry.c:424
@@ -1778,7 +1784,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr "dpkg ៖ បាន​បរាជ័យ​ក្នុង​ការ​បម្រុង​ទុក​សតិ សម្រាប់​ធាតុថ្មី​នៅ​ក្នុង​បញ្ជី​របស់​កញ្ចប់​ដែល​បាន​បរាជ័យ ។"
 
 #: src/errors.c:91
@@ -1801,7 +1808,8 @@ msgstr "កញ្ចប់ %s កំពុង​រង់ចាំ ម្យ៉
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "កញ្ចប់ %s កំពុង​រង់ចាំ មិន​ប៉ះពាល់​វា ។  ប្រើ --force-ដើម្បី​បដិសេធ ។\n"
 
 #: src/errors.c:125
@@ -1869,7 +1877,8 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​សមកាលកម្ម​ឯកសារ​ដែល​បាន​ធ្វើឲ្យទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
+msgstr ""
+"បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​សមកាលកម្ម​ឯកសារ​ដែល​បាន​ធ្វើឲ្យទាន់​សម័យ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ %s"
 
 #: src/filesdb.c:257
 #, c-format
@@ -2493,7 +2502,7 @@ msgstr "មិនអាចបើក​ `%i' សម្រាប់​ស្ទ្
 msgid "unexpected eof before end of line %d"
 msgstr "ចុង​ឯកសា​រដែល​មិន​បាន​រំពឹង​ទុក​មុន​ចុង​បន្ទាត់ %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "ត្រូវ​ការ​ជម្រើស​សកម្មភាព​មួយ"
@@ -2512,7 +2521,8 @@ msgstr "--%s ត្រូវការ​យ៉ាងហោច​ណាស់​
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
-msgstr "អ្នក​ត្រូវតែ​បញ្ជាក់​កញ្ចប់​តាម​ឈ្មោះ​ផ្ទាល់​របស់​ពួកវា មិនមែន​តាម​សម្រង់​ឈ្មោះ​របស់​ឯកសារ​ដែល​ពួក​វា​មាន​ទេ"
+msgstr ""
+"អ្នក​ត្រូវតែ​បញ្ជាក់​កញ្ចប់​តាម​ឈ្មោះ​ផ្ទាល់​របស់​ពួកវា មិនមែន​តាម​សម្រង់​ឈ្មោះ​របស់​ឯកសារ​ដែល​ពួក​វា​មាន​ទេ"
 
 #: src/packages.c:150
 #, c-format
@@ -2568,6 +2578,10 @@ msgstr "  កញ្ចប់ %s ដែល​ផ្ដល់ %s មិន​ត
 msgid "  Package %s is not installed.\n"
 msgstr "  កញ្ចប់ %s មិនត្រូវ​បាន​ដំឡើង​នៅ​ឡើយ​ទេ ។\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr "អាស្រ័យ​លើ​"
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; ទោះ​ជា​យ៉ាងណា​ក៏ដោយ ៖\n"
@@ -2756,10 +2770,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឯកសារ​ថ្មី​ផ្សេង​ទៀត​ទេ `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg ៖ ព្រមាន - ឯកសារ​ចាស់ `%.250s' គឺ​ដូចគ្នា​នឹង​ឯកសារ​ថ្មី​ជា​ច្រើន !  (ទាំង `%.250s' និង `"
 "%.250s')"
@@ -2998,7 +3012,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr "dpkg - ព្រមាន ៖ មិ​នអើពើ​សំណើ​ដើម្បី​យក %.250s ចេញ ដែល​មិន​ត្រូវ​បាន​ដំឡើង ។\n"
 
 #: src/remove.c:100
@@ -3083,7 +3098,8 @@ msgstr "មិន​អាច​លុប​ឯកសារ​ព័ត៌មា
 msgid ""
 "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
 "removed.\n"
-msgstr "dpkg - ព្រមាន ៖ ខណៈពេល​យក %.250s ចេញ ថត `%.250s' មិន​ទទេ ដូច្នេះ​មិនបាន​យកចេញ ។\n"
+msgstr ""
+"dpkg - ព្រមាន ៖ ខណៈពេល​យក %.250s ចេញ ថត `%.250s' មិន​ទទេ ដូច្នេះ​មិនបាន​យកចេញ ។\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3207,24 +3223,29 @@ msgstr "--forget-old-មិន​ត្រូវ​ការ​អាគុយ
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - កំហុស ៖ %s (`%s') មិនមាន​តួ​លេខ​ណា​មួយ\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build ត្រូវ​ការ​អាគុយម៉ង់​ថត​មួយ"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build ត្រូវ​ការ​អាគុយម៉ង់​ច្រើន​បំផុត​ពីរ"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "មិន​អាច​ពិនិត្យ​ភាព​មាន​ស្រាប់​របស់​ប័ណ្ណសារ `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "គោលដៅគឺជាថត - មិន​អាច​រំលង​ការ​ពិនិត្យ​ឯកសារ​វត្ថុ​បញ្ជា"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3233,174 +3254,175 @@ msgstr ""
 "dpkg-deb ៖ ព្រមាន មិន​ពិនិត្យ​មាតិកា​របស់​ផ្ទៃ​វត្ថុ​បញ្ជា ។\n"
 "dpkg-deb ៖ ស្ថាបនា​កញ្ចប់​ដែល​មិនស្គាល់​មួយ​នៅ​ក្នុង `%s' ។\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "ឈ្មោះ​កញ្ចប់​មាន​តួអក្សរ​ដែល​មិនមែន​ជា​អក្សរ​ក្រម​លេខ​អក្សរតូច ឬ `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "ការ​ព្រមាន `%s' មាន​តម្លៃ​អាទិភាព​ដែល​បាន​កំណត់​ដោយ​អ្នក​ប្រើ `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "ការព្រមាន `%s' មាន​វាល​ដែល​បាន​កំណត់​ដោយ​អ្នក​ប្រើ `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d កំហុស​នៅ​​ក្នុ​ង​ឯក​សារ​វត្ថុបញ្ជា​"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb ៖ ការ​ស្ថាបនា​កញ្ចប់ `%s' នៅ​ក្នុង `%s' ។\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "ថត​វត្ថុបញ្ជា​មាន​សិទ្ធិ​មិន​ល្អ %03lo (ត្រូវ​តែ >=0755 និង <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "ស្គ្រីប​អ្នក​ថែទាំ `%.50s' មិនមែន​ជា​ឯកសារ​អត្ថបទ​ធម្មតា ឬតំណ​និមិត្ត​សញ្ញា​ទេ"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr "ស្គ្រីប​អ្នក​ថែទាំ `%.50s' មាន​សិទ្ធិ​មិន​ល្អ %03lo (ត្រូវតែ >=0555 និង <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "ស្គ្រីបអ្នកថែទាំ `%.50s' មិនស្ថិតស្ថេរ"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "ខ្សែអក្សរទទេពីការអាន fgets conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "ព្រមាន ឈ្មោះ​របស់ conffile `%.50s...' គឺ​វែង​ពេក ឬ បាត់​បន្ទាត់​ថ្មី​ចុង​ក្រោយ\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "ព្រមាន ឈ្មោះឯកសារ conffile `%s' មានកន្ទុយជាចន្លោះមិនឃើញ\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "conffile `%.250s' មិន​បង្ហាញ​នៅ​ក្នុង​កញ្ចប់"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "conffile `%.250s' មិន​ស្ថិតស្ថេរ"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "ការព្រមាន conffile `%s' គ្មានឯកសារអត្ថបទធម្មតា\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "កំហុស​ក្នុង​ការ​អាន​ឯកសារ conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "កំហុស​ក្នុង​ការ​បើក​ឯកសារ conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb ៖ មិន​អើពើ %d ការ​ព្រមាន​អំពី​ឯកសារ​វត្ថុបញ្ជា\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "មិន​អាច​កំណត់​សតិ​បណ្ដោះ​អាសន្ន `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "បាន​បរាជ័យ​ក្នុង chdir ទៅជា`%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "បាន​បរាជ័យ​ក្នុង chdir ទៅជា .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត tmpfile (វត្ថុបញ្ជា)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "បានបរាជ័យក្នុងការបើក tmpfile (វត្ថុបញ្ជា) %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "បានបរាជ័យក្នុងការមិនតភ្ជាប់ tmpfile (វត្ថុបញ្ជា) %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "វត្ថុបញ្ជា​"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "បាន​បរាជ័យ fstat tmpfile (វត្ថុបញ្ជា)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ខា tmpfile ថយ​ក្រោយ (វត្ថុបញ្ជា)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត tmpfile (ទិន្នន័យ)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក tmpfile (ទិន្នន័យ) %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "បានបរាជ័យក្នុងការមិនតភ្ជាប់ tmpfile (ទិន្នន័យ) %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "ទិន្នន័យ"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "បាន​បរាជ័យ​ក្នុងកា​ររក​ការ​ប្រតិបត្តិ"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ឈ្មោះ​ឯកសារ​ទៅជា​បំពង់ tar (ទិន្នន័យ)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "កំហុស​​​ខាងក្នុង​, compress_type `%i' មិនស្គាល់ ​!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ខា tmpfile ថយ​ក្រោយ (ទិន្នន័យ)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (ទិន្នន័យ​)"
 
@@ -3477,22 +3499,22 @@ msgstr "ប័ណ្ណសារ​គ្មាន​សញ្ញា (.) នៅ
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "មិន​យល់​កំណែ​ប័ណ្ណសារ %.250s  យក dpkg-deb ថ្មី​ជាង"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "បាន​រំលង​ទិន្នន័យ​សមាជិក​ពី %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "ឯកសារ `%.250s' មាន​សមាជិក​ទិន្នន័យ​ដែល​មិន​យល់ %.*s, បោះបង់"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "ឯកសារ `%.250s' មាន​សមាជិក​វត្ថុ​​បញ្ជា​ពីរ បោះបង់"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3501,16 +3523,16 @@ msgstr ""
 " កញ្ចប់ដេបៀនថ្មី កំណែ %s ។\n"
 " ទំហំ %ld បៃ ៖ ប័ណ្ណសារវត្ថុបញ្ជា= %zi bytes ។\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "ប្រវែង​ព័ត៌មាន​វត្ថុ​បញ្ជា"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "ប័ណ្ណសារ​​មាន​ប្រវែង​វត្ថុបញ្ជា​ malformatted `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3519,15 +3541,15 @@ msgstr ""
 " កញ្ចប់​ដេបៀន​ចាស់ កំណែ %s ។\n"
 " ទំហំ %ld បៃ ៖ ប័ណ្ណសារ​វត្ថុបញ្ជា= %zi, main archive= %ld ។\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បម្រុងទុក​សតិ​សម្រាប់​អថេរ `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "តំបន់​វត្ថុបញ្ជា​"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3536,65 +3558,65 @@ msgstr ""
 "dpkg-deb ៖ ឯកសារ​មើល​ទៅ អាច​ទុក​វា​ជា​ប័ណ្ណសារ ដែល​ត្រូវ​បាន\n"
 "dpkg-deb:    ធ្វើឲ្យ​ខូច​ដោយ​កំពុង​ទាញយក​ជា​របៀប ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' មិនមែន​ជា​ប័ណ្ណសារ​ទ្រង់ទ្រាយ​របស់​ដេបៀន"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ទទួល​យក​ទីតាំង​ឯកសារ​បច្ចុប្បន្ន"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​កំណត់​ទីតាំង​ឯកសារ​បច្ចុប្បន្ន"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឧបករណ៍​ពិពណ៌នា​បំពង់ `1' ជា​ការ​បិទភ្ជាប់"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ទៅ​ជា gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "បាន​បរាជ័យ syscall lseek ទៅចំណែក​ប័ណ្ណសារ"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​សរសេរ​ទៅ​បំពង់​ជា​ការ​ចម្លង"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បិទ​បំពង់ជា​ការ​ចម្លង"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "បាន​បរាជ័យ chdir ទៅ​ថត"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "បាន​បរាជ័យ​ទៅ exec tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ឈ្មោះ​ឯកសារ .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3603,12 +3625,12 @@ msgstr ""
 "--%s ត្រូវការ​ថត​គោលដៅ​មួយ ។\n"
 "ប្រហែល​ជា​អ្នក​កំពុង​ប្រើ dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ច្រើន​បំផុត (.deb និង​ថត)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ត្រូវការ​តែ​អាគុយម៉ង់​តែ​មួយ​ប៉ុណ្ណោះ (ឈ្មោះ​ឯកសារ .deb)"
@@ -3762,7 +3784,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3773,7 +3795,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "ជម្រើស ៖\n"
@@ -3808,7 +3831,7 @@ msgstr ""
 "វាយ dpkg-deb --help សម្រាប់​ជា​ជំនួយ​អំពី​ការ​គណនា​ឯកសារ *.deb\n"
 "វាយ dpkg --help សម្រាប់​ជា​ជំនួយ​អំពី​ការដំឡើង និង​មិន​ដំឡើង​កញ្ចប់ ។"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "មិនស្គាល់​ប្រភេទ​បង្ហាប់ `%s' !"
@@ -4181,9 +4204,9 @@ msgstr "ឯកសារ​ប្រភព `%.250s' មិនមែន​ជា
 msgid "unable to exec mksplit"
 msgstr "មិន​អាច​ប្រតិបត្តិ mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "ដេបៀន %s កំណែ %s ។\n"
@@ -4196,9 +4219,9 @@ msgstr ""
 "\n"
 "រក្សាសិទ្ធិ​ឆ្នាំ ១៩៩៦ ដោយ Kim-Minh Kaplan ។"
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4253,7 +4276,7 @@ msgid "try deleting %s"
 msgstr "ព្យាយាម​លុប %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "មិន​អាច​បើក %s ៖ %s"
@@ -4280,7 +4303,7 @@ msgid "unable to close %s after read: %s"
 msgstr "មិន​អាច​បិទ %s បន្ទាប់​ពី​អាន ៖ %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "មិន​អាច​បិទ %s ៖ %s"
@@ -4300,12 +4323,12 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំឡ
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ដោះសោ %s ៖ %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "មិន​អាច​ទទួល​តម្លៃ ENOENT ពី %s ៖ %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4315,7 +4338,7 @@ msgstr ""
 "រក្សាសិទ្ធិឆ្នាំ ១៩៩៥ ដោយ Ian Jackson ។\n"
 "រក្សាសិទ្ធិឆ្នាំ ២០០០-២០០១ ដោយ Wichert Akkerman ។"
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4368,89 +4391,89 @@ msgstr ""
 "នៅ​ពេល​យកចេញ --package ឬ --local និង --divert ត្រូវតែ​ផ្គូផ្គង ប្រសិន​បើ​បាន​បញ្ជាក់ ។\n"
 "ស្គ្រីប​កញ្ចប់ preinst/postrm គួរតែ​បញ្ជា​ជា​និច្ច --package និង --divert ។\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "មាន​ពីរ​របៀប​បាន​បញ្ជាក់ ៖ %s និង --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s ត្រូវ​ការ​អាគុយម៉ង់​បង្វែរ"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "បង្វែរ​មិន​អាច​មាន​បន្ទាត់​ថ្មី"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់ <កញ្ចប់>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "កញ្ចប់​មិនអាច​មាន​បន្ទាត់​ថ្មី"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់ <ថត>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "មិន​​ស្គា​ល់​ជម្រើស​ `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "មិន​អាច​បើក​ការ​បង្វែរ ៖ %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "បាត់ altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "បាត់​កញ្ចប់"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​តែ​មួយ"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ឈ្មោះ​ឯកសារ \"%s\" មិន​ពេញលេញ"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "ឯកសារ​មិន​អាច​មាន​បន្ទាត់ថ្មី"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "មិន​អាច​បង្វែរ​ថត"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "ទុកចោល​`%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' ប៉ះអង្គិច​ជា​មួយ `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "បន្ថែម​ `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4461,7 +4484,7 @@ msgstr ""
 "  នៅ​ពេ​លយក `%s' ចេញ\n"
 "  រកឃើញ `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4472,37 +4495,37 @@ msgstr ""
 "  នៅ​ពេលយក `%s' ចេញ\n"
 "  រកឃើញ `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "យក `%s' ចេញ"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "គ្មាន​ការ​បង្វែរ `%s' គ្មាន​អ្វី​បាន​យក​ចេញ"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "កំហុស​ខាង​ក្នុង - របៀប​មិន​ត្រឹមត្រូវ `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឈ្មោះ​ថ្មី `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "កំហុស​ក្នុង​ការ​ពិនិត្យ `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4511,52 +4534,52 @@ msgstr ""
 "ប្ដូរ​ឈ្មោះ​ពាក់ព័ន្ធ​នឹង​ការ​សរសេរ​ជាន់​លើ `%s' ដោយ\n"
 "  ឯកសារ​ផ្សេង `%s' មិន​បាន​អនុញ្ញាត"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "ប្ដូរឈ្មោះ ៖ យក​តំណ​ចាស់​ដែល​ស្ទួន​ចេញ `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "ប្ដូរឈ្មោះ ៖ ប្ដូរឈ្មោះ `%s' ទៅជា `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "បង្កើត​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "សរសេរ​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "បិទ​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "យក​ការ​បង្វែរ​ចាស់​ចេញ ៖ %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "បង្កើត​ការ​បង្វែរ​ចាស់ ៖ %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "ដំឡើង​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "កំហុស​ខាង​ក្នុង ៖ %s ខូច ៖ %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4564,7 +4587,7 @@ msgstr ""
 "\n"
 "រក្សាសិទ្ធិ​ឆ្នាំ២០០០ ដោយ Wichert Akkerman ។"
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4599,106 +4622,106 @@ msgstr ""
 "  --help                   បង្ហាញ​សារ​ជំនួយ​នេះ ។\n"
 "  --version                បង្ហាញ​កំណែ ។\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "គ្មាន​របៀប​បាន​បញ្ជាក់​"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add ត្រូវការ​អាគុយម៉ង់​បួន"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​%s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "គ្មាន​អ្នក​ប្រើ​ដែល​មាន​ស្រាប់ %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ក្រុម​មិន​ត្រឹមត្រូវ %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "គ្មាន​ក្រុម​ដែល​មាន​ស្រាប់ %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "របៀប​មិន​ត្រឹមត្រូវ​ %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "ស្នាម​ឆ្នូត​ /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "ការ​បដិសេធ​សម្រាប់ \"%s\" មាន​រួច​ហើយ"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "ប៉ុន្តែ --force បាន​បញ្ជាក់ ដូច្នេះ​អាច​មិន​អើពើ​វា ។"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "បោះបង់"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "ព្រមាន ៖ --update បាន​ផ្ដល់ ប៉ុន្តែ %s មិន​ទាន់​មាន"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "បាន​បរាជ័យ​ដើម្បី chown %s ៖ %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "បាន​បរាជ័យ​ដើម្បី chmod %s ៖ %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "គ្មាន​ការ​បដិសេធ​លេច​ឡើង ។"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "ព្រមាន ៖ --update គឺ​គ្មាន​ប្រយោជន៍​សម្រាប់ --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "មិន​អាច​បើក​ statoverride ៖%s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "ការ​បដិសេធ​ជា​ច្រើន​សម្រាប់ \"%s\" បោះបង់"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "មិន​អាច​បើ​​​ឯកសារ​ statoverride ថ្មី​បានទេ​ ៖ %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "កំហុស​ក្នុង​ការ​យក statoverride-old ៖ %s ចេញ"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត statoverride-old ថ្មី ៖ %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "កំហុស​ក្នុង​ការ​ដំឡើង statoverride ថ្មី ៖ %s"
@@ -4914,7 +4937,7 @@ msgstr "មិន​អាច​អាន %s ៖ %d"
 msgid "dbg: %s"
 msgstr "dbg ៖ %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4924,8 +4947,8 @@ msgstr ""
 "រក្សាសិទ្ធិ​ឆ្នាំ ១៩៩៥ ដោយ Ian Jackson ។\n"
 "រក្សាសិទ្ធិ​ឆ្នាំ ២០០០-២០០២ ដោយ Wichert Akkerman ។"
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4945,7 +4968,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4994,161 +5017,160 @@ msgstr ""
 "  --help                   បង្ហាញ​សារ​ជំនួយ​នេះ ។\n"
 "  --version                បង្ហាញ​កំណែ ។\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "មិន​ស្គាល់​អាគុយម៉ង់​ `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ> <អាទិភាព>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "អាទិភាព​ត្រូវតែ​ជា​ចំនួន​គត់"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s ត្រូវការ <ឈ្មោះ> <ផ្លូវ>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s ត្រូវការ <ឈ្មោះ>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "ឈ្មោះ​កូនចៅ %s បាន​ស្ទួន​"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "តំណ​កូនចៅ​ %s បាន​ស្ទួន​"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "ឈ្មោះ %s គឺ​ទាំង​មេ និង​កូនចៅ"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "តំណ %s គឺ​ទាំង​មេ និង​កូនចៅ"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"ត្រូវការ --display, --config, --set, --install, --remove, --all, --remove-all "
-"ឬ --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave បាន​អនុញ្ញាត​តែ​ជា​មួយ --install ប៉ុណ្ណោះ"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "ស្ទួន​កូនចៅ%s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "តំណ​កូនចៅ​ដូច​តំណ​មេ %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "ស្ទួន​តំណ​កូន​ចៅ %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "ស្ទួន​ផ្លូវ %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "អាទិភាព %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr "ជម្រើសសម្រាប់ %s ចង្អុលទៅ %s - ដែលរកមិនឃើញ ។  យក​ចេញ​ពី​បញ្ជី​របស់​ជម្រើស ។"
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "គ្មាន​ជម្រើ​សម្រាប់ %s ។"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - ស្ថានភាព​គឺ​ជា %s ។"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " តំណ​បច្ចុប្បន្ន​ចង្អុល​ទៅ %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " គ្មាន​​តំណ​បច្ចុប្បន្ន"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " តំណ​ដែល​មិន​អាច​អាន​បាន - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - អាទិភាព %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " កូនចៅ %s ៖ %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "គ្មានកំណែ ។"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "កំណែ `ល្អ​បំផុត' បច្ចុប្បន្ន​គឺ %s ។"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "មិន​ស្គាល់​អាគុយម៉ង់​ `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ> <អាទិភាព>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "អាទិភាព​ត្រូវតែ​ជា​ចំនួន​គត់"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s ត្រូវការ <ឈ្មោះ> <ផ្លូវ>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s ត្រូវការ <ឈ្មោះ>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "ឈ្មោះ​កូនចៅ %s បាន​ស្ទួន​"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "តំណ​កូនចៅ​ %s បាន​ស្ទួន​"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "ឈ្មោះ %s គឺ​ទាំង​មេ និង​កូនចៅ"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "តំណ %s គឺ​ទាំង​មេ និង​កូនចៅ"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"ត្រូវការ --display, --config, --set, --install, --remove, --all, --remove-all "
+"ឬ --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave បាន​អនុញ្ញាត​តែ​ជា​មួយ --install ប៉ុណ្ណោះ"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "រៀបចំ​ជម្រើស​ស្វ័យប្រវត្តិ​របស់ %s ។"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "មិន​អាច​យក %s ៖ %s ចេញ"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5157,7 +5179,7 @@ msgstr ""
 "%s ត្រូវ​បាន​ផ្លាស់ប្ដូរ (ដោយ​ដៃ ឬ​ដោយ​ស្គ្រីប) ។\n"
 "ប្ដូរទៅ​ជា​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ដៃ​តែ​ប៉ុណ្ណោះ ។"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5166,67 +5188,67 @@ msgstr ""
 "កំពុងពិនិត្យមើលកំណែដែលមានរបស់ %s ធ្វើឲ្យតំណទាន់សម័យក្នុង %s ...\n"
 "(អ្នកអាចកែប្រែតំណនិមិត្តសញ្ញានៅទីនោះ ប្រសិនបើអ្នកចង់បាន - មើល `man ln' ។)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ %s ទៅ​ជា %s ៖ %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "ឈ្មោះ​តំណ​កូន​ចៅ​ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ​កូនចៅ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "យក​ជម្រើស​ដែល​បាន​ជ្រើស​ចេញ​ដោយ​ដៃ - ប្ដូរ​ទៅ​ជា​របៀប​ស្វ័យប្រវត្តិ"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "ជម្រើស %s សម្រាប់ %s មិន​បាន​ចុះ​ឈ្មោះ មិន​យក​ចេញ​ទេ"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "បោះបង់​តំណ​កូន​ចៅ​ដែល​លែង​ប្រើ %s (%s) ។"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ​របស់ %s ត្រូវ​បាន​មិន​អនុញ្ញាត ទុក​វា​ឲ្យ​នៅ​តែឯង ។"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "ដើម្បី​ត្រឡ​ប់ទៅ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ ប្រើ `ជម្រើស​ធ្វើ​ឲ្យទាន់​សម័យ --auto %s'."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "កំពុង​សង្គ្រោះ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដែល​បាន​បរាជ័យ​ពី​មុន​របស់ %s ឡើង​វិញ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "មិន​អាច​បើក %s ដើម្បី​សរសេរ ៖ %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "ការ​ផ្ដល់​កញ្ចប់​ចុង​ក្រោយ %s (%s) បាន​យក​ចេញ លុប​វា ។"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5235,38 +5257,38 @@ msgstr ""
 "ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​ទៅ %s\n"
 " (ឬ​មិ​នទាន់​មាន) ទោះ​ជា​យ៉ាង​ណា​ក៏​ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "មិន​អាច​ប្រាកដ​ថា %s មិន​ទាន់​មាន ៖ %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "ទុកឲ្យ %s (%s) ចង្អុលទៅ %s ។"
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "ធ្វើ​ឲ្យ %s (%s) ទាន់​សម័យ ដើម្បី​ចង្អុល​ទៅ %s ។"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5275,13 +5297,13 @@ msgstr ""
 "ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​កូនចៅ​ទៅ\n"
 " %s ឬ​មិន​ទាន់​មាន ទោះ​ជា​យ៉ាងណាក៏ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "យក %s (%s) ចេញ មិន​សម​នឹង %s ។"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5290,7 +5312,7 @@ msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5303,42 +5325,50 @@ msgstr ""
 "  ជម្រើស    ជំនួស\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "សង្កត់​គ្រាប់ចុច បញ្ចូល ដើម្បី​រក្សា​លំនាំដើម[*] ឬ​វាយ​លេខ​ជម្រើស ៖ "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "ការ​ប្រើ `%s' ដើម្បី​ផ្ដល់ `%s' ។"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "មិន​អាច​រក​ជម្រើស `%s' ។"
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "កំហុស​ក្នុង​ការ​សរសេរ stdout ៖ %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "បន្ទាត់​ថ្មី​បាន​ហាមឃាត់​ក្នុង​ឯកសារ​ជម្រើស​ធ្វើឲ្យ​ទាន់​សម័យ (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ការ​អាន​កំហុស ឬ ចុង​ឯកសារ %s សម្រាប់ %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "បាត់​បន្ទាត់​ថ្មី​បន្ទាប់​ពី %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "បញ្ហាធ្ងន់ធ្ងរ ៖ %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s ៖ បាន​បរាជ័​យក្នុ​ងការ​ប្រតិបត្តិ bzip2 %s"
diff --git a/po/ko.po b/po/ko.po
index b1a1a5f5..13232fd0 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-12-31 21:12+0200\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -57,72 +57,57 @@ msgstr "시스템 오류 %d번"
 msgid "Signal no.%d"
 msgstr "시그널 %d번"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: gzip 실행 실패: %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: 내부 gzip 오류: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: gzip -dc 실행 실패"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: 내부 bzip2 오류: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: bzip2 -dc 실행 실패"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: 압축 풀기"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: 내부 gzip 오류: 읽기: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: 내부 gzip 오류: 쓰기 `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: 내부 gzip 오류: 읽기(%i) != 쓰기(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: gzip 실행 실패: %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: 내부 bzip2 오류: 읽기: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: 내부 bzip2 오류: 쓰기: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: 내부 bzip2 오류: 읽기(%i) != 쓰기(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: bzip2 %s 실행 실패"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: 압축"
@@ -167,7 +152,7 @@ msgstr "업데이트 디렉토리 `%.255s'을(를) 읽을 수 없습니다"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "합병한 업데이트 파일 %.255s을(를) 지우는 데 실패했습니다"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s'을(를) 만들 수 없습니다"
@@ -895,30 +880,30 @@ msgstr "형식에서 중괄호 닫기가 (`}') 빠졌습니다\n"
 msgid "failed to realloc for variable buffer"
 msgstr "변수 버퍼의 realloc이 실패했습니다"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... 이미 없어졌습니다 !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb 파이프에서 읽기 오류가 발생했습니다"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "`%.255s' 타임스탬프 설정하는 데 오류가 발생했습니다"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s'의 소유권을 설정하는 데 오류가 발생했습니다"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s'의 권한을 설정하는 데 오류가 발생했습니다"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -927,16 +912,16 @@ msgstr ""
 "`%.250s' 덮어쓰기를 시도합니다.  이 버전은 `%.250s'%.10s%.100s%.10s의 전환된 "
 "버전입니다"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (꾸러미: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "`%.255s' 파일의 정보를 읽을 수 없습니다 (지금 설치하려는 파일)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -944,28 +929,28 @@ msgid ""
 msgstr ""
 "다른 버전을 설치하기에 앞서 `%.255s' 관련 필요없는 파일들을 지울 수 없습니다"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "다른 버전을 설치하기에 앞서 복구한 `%.255s' 파일 정보를 읽을 수 없습니다"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "아카이브 안의 `%.255s' 오브젝트의 타입이 알 수 없는 0x%x입니다"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "과거 꾸러미 %s의 파일을 대체합니다...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "설치된 꾸러미 %s의 파일들로 대체합니다...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -973,88 +958,88 @@ msgstr ""
 "디렉토리가 없는 `%2$.250s' 꾸러미의 `%1$.250s' 디렉토리를 덮어쓰기를 시도합니"
 "다"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 "`%.250s'의 덮어쓰기를 시도합니다.  이 파일은 %.250s 꾸러미에도 들어있습니다"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "뭔가가 파일 `%.250s' 대체했습니다"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "`%.255s' 작업을 하는 동안에 백엔드 dpkg-deb"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "`%.255s'을(를) 닫기/쓰기하는 데 오류가 발생했습니다"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "`%.255s' 파이프를 만드는 데 오류가 발생했습니다"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "`%.255s' 장치를 만드는 데 오류가 발생했습니다"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "`%.255s' 하드 링크를 만드는 데 오류가 발생했습니다"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "`%.255s' 심볼릭 링크를 만드는 데 오류가 발생했습니다"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "`%.255s' 심볼릭 링크의 소유권을 설정하는 데 오류가 발생했습니다"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "`%.255s' 디렉토리를 만드는 데 오류가 발생했습니다"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "새 버전을 설치할 때 `%.255s'을(를) 옮겨 놓을 수 없습니다"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "`%.255s' 링크를 읽을 수 없습니다"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "`%.255s'에 대한 백업 심볼릭 링크를 만들 수 없습니다"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "`%.255s'의 백업 심볼릭 링크의 소유자를 바꿀 수 없습니다"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "새 버전을 설치하기 전 `%.255s'의 백업 링크를 만들 수 없습니다"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s'의 새 버전을 설치할 수 없습니다"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1063,7 +1048,7 @@ msgstr ""
 "dpkg: 경고 - %s 꾸러미를 지우는 데 의존성 문제를 무시합니다:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1072,7 +1057,7 @@ msgstr ""
 "dpkg: 경고 - 꼭 필요한 꾸러미 %s의 설정 해제 고려\n"
 " (%s의 지우기를 위해).\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1081,7 +1066,7 @@ msgstr ""
 "dpkg: 아니오, 꼭 필요한 %s 꾸러미는 설정 해제하지 않습니다\n"
 " (%s의 지우기를 위해).\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1091,26 +1076,26 @@ msgstr ""
 "될 것입니다):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %s 꾸러미를 지우고 %s 꾸러미를 설치하려 합니다...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
-"%s은(는) 올바르게 설치되지 않았습니다 - 꾸러미에 대한 모든 의존관계 무시"
-"합니다.\n"
+"%s은(는) 올바르게 설치되지 않았습니다 - 꾸러미에 대한 모든 의존관계 무시합니"
+"다.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: %s 꾸러미를 지울 때 문제가 있을 수 있습니다. 이 꾸러미가 %s을(를) 제공"
 "하기 때문입니다 ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1118,17 +1103,22 @@ msgid ""
 msgstr ""
 "dpkg: %s 꾸러미는 다시 설치해야 합니다. 하지만 어쨌든 요청한 대로 지웁니다.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: %s 꾸러미는 다시 설치해야 합니다.  지우지 않습니다.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: 네, %s 꾸러미는 지우고 %s 꾸러미를 설치합니다.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1137,76 +1127,76 @@ msgstr ""
 "dpkg: %2$s 꾸러미가 들어 있는 %1$s 파일 고려:\n"
 "%3$s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "꾸러미 충돌 - %.250s 꾸러미를 설치하지 않습니다"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: 경고 - 충돌 무시, 어쨌든 계속 진행합니다 !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive 옵션은 적어도 하나의 경로 인수가 필요합니다"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "--recursive를 위해 find 실행 실패했습니다"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "find의 파이프를 fdopen하는 데 실패했습니다"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "find의 파이프를 읽는 데 오류가 발생했습니다"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "find의 파이프를 닫는 데 오류가 발생했습니다"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "--recursive를 위한 find 프로그램이 처리할 수 없는 오류(%i)를 리턴했습니다"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "꾸러미를 찾을 수 없습니다 (*.deb과 일치하는 파일들)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s 옵션은 적어도 하나의 꾸러미 아카이브 파일 인수를 필요로 합니다"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "전에 선택하지 않은 %s 꾸러미를 선택합니다.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "선택하지 않은 %s 꾸러미는 넘어갑니다.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 "%2$.250s 꾸러미의 %1$.250s 버전이 이미 설치되어 있습니다. 넘어갑니다.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - 경고: %.250s 꾸러미를 %.250s 버전에서 %.250s 버전으로 다운그레이드 합니"
 "다.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1581,110 +1571,117 @@ msgstr "설정파일 프롬프트에서 표준 입력에 파일이 끝났습니
 msgid "unable to check for existence of `%.250s'"
 msgstr "`%.250s' 파일이 있는 지 검사할 수 없습니다"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " 꾸러미는 다음 꾸러미에 의존: "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " 꾸러미는 다음 꾸러미에 선의존: "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " 꾸러미는 다음 꾸러미 설치를 추천: "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " 꾸러미는 다음 꾸러미 설치를 제안: "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " 꾸러미는 다음 꾸러미를 망가뜨림: "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " 꾸러미는 다음 꾸러미와 충돌: "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " 꾸러미는 다음 꾸러미 설치를 제안: "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " 꾸러미는 다음 꾸러미를 개선: "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s 꾸러미는 지울 예정입니다.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s 꾸러미는 설정 해제할 에정입니다.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr " %.250s 꾸러미는 설치할 예정이지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr " %.250s 꾸러미는 설치되었지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s 꾸러미는 풀려있지만, 설정된 적이 없습니다.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s 꾸러미는 풀려있지만, 버전이 %.250s입니다.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s 꾸러미의 최근 설정된 버전은 %.250s입니다.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 꾸러미는 %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 꾸러미는 %.250s을(를) 제공하지만 지울 에정입니다.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 꾸러미는 %.250s을(를) 제공하지만 설정 해제할 예정입니다.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 꾸러미는 %.250s을(를) 제공하지만 %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 꾸러미는 설치하지 않았습니다.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s 꾸러미(버전 %.250s)를 설치할 예정입니다.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s 꾸러미(버전 %.250s)는 %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 꾸러미는 %.250s을(를) 제공하며 설치할 예정입니다.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s 꾸러미는 %.250s을(를) 제공하며 %s.\n"
@@ -2210,16 +2207,21 @@ msgstr ""
 "  -P|--purge         <package> ... | -a|--pending\n"
 "  --get-selections [<pattern> ...] 선택 목록을 표준출력으로 보냅니다.\n"
 "  --set-selections                 선택 목록을 표준입력으로 받습니다.\n"
-"  --clear-selections               필수가 아닌 꾸러미는 모두 dselect 처리합니다.\n"
+"  --clear-selections               필수가 아닌 꾸러미는 모두 dselect 처리합니"
+"다.\n"
 "  --update-avail <Packages-file>   사용할 수 있는 꾸러미 정보를 대체합니다.\n"
 "  --merge-avail <Packages-file>    파일에 있는 정보와 합칩니다.\n"
 "  --clear-avail                    기존 정보를 지웁니다.\n"
-"  --forget-old-unavail             사용할 수 없고 설치가 안 된 꾸러미 목록을 지웁니다.\n"
-"  -s|--status <package> ...        사용할 수 있는 꾸러미 세부사항을 보여줍니다.\n"
+"  --forget-old-unavail             사용할 수 없고 설치가 안 된 꾸러미 목록을 "
+"지웁니다.\n"
+"  -s|--status <package> ...        사용할 수 있는 꾸러미 세부사항을 보여줍니"
+"다.\n"
 "  -p|--print-avail <package> ...   사용할 수 있는 버전 정보를 보여줍니다.\n"
-"  -L|--listfiles <package> ...     꾸러미가 '소유하고 있는' 파일의 목록을 보여줍니다.\n"
+"  -L|--listfiles <package> ...     꾸러미가 '소유하고 있는' 파일의 목록을 보"
+"여줍니다.\n"
 "  -l|--list [<pattern> ...]        꾸러미들을 간결하게 보여줍니다.\n"
-"  -S|--search <pattern> ...        파일들을 소유하고 있는 꾸리미들을 찾습니다.\n"
+"  -S|--search <pattern> ...        파일들을 소유하고 있는 꾸리미들을 찾습니"
+"다.\n"
 "  -C|--audit                       망가진 꾸러미를 찾습니다.\n"
 "  --print-architecture             dpkg의 구조를 보여줍니다.\n"
 "  --compare-versions <a> <op> <b>  버전 정보를 비교합니다 - 아래 참조.\n"
@@ -2295,21 +2297,23 @@ msgstr ""
 "명령:\n"
 "  --admindir=<directory>     %s 대신에 <directory>을(를) 사용합니다.\n"
 "  --root=<directory>         다른 루트 디렉토리에 설치합니다.\n"
-"  --instdir=<directory>      관리 디렉토리를 변경하지 않고 설치 디렉토리를 "
-"변경합니다.\n"
-"  -O|--selected-only         설치하거나 업그레이드하기로 한 꾸러미는"
-"생략합니다.\n"
+"  --instdir=<directory>      관리 디렉토리를 변경하지 않고 설치 디렉토리를 변"
+"경합니다.\n"
+"  -O|--selected-only         설치하거나 업그레이드하기로 한 꾸러미는생략합니"
+"다.\n"
 "  -E|--skip-same-version     같은 버전이 설치된 꾸러미는 생략합니다.\n"
-"  -G|--refuse-downgrade      설치된 것보다 이전 버전인 꾸러미는 "
-"생략합니다.\n"
-"  -B|--auto-deconfigure      다른 꾸러미를 망가뜨릴 수 있더라도 "
-"설치합니다.\n"
+"  -G|--refuse-downgrade      설치된 것보다 이전 버전인 꾸러미는 생략합니다.\n"
+"  -B|--auto-deconfigure      다른 꾸러미를 망가뜨릴 수 있더라도 설치합니다.\n"
 "  --no-debsig                꾸러미 서명을 확인하지 않습니다.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                             할 행동을 보여주기만 하고 실제로 하지는 않습니다.\n"
-"  -D|--debug=<octal>         디버깅을 활성화합니다(-Dhelp이나 --debug=help 참조).\n"
-"  --status-fd <n>            File descriptor <n>으로 상태 변경 내역을 보냅니다.\n"
-"  --log=<filename>           상태 변경이나 행동을 <filename>에 로그로 남깁니다.\n"
+"                             할 행동을 보여주기만 하고 실제로 하지는 않습니"
+"다.\n"
+"  -D|--debug=<octal>         디버깅을 활성화합니다(-Dhelp이나 --debug=help 참"
+"ì¡°).\n"
+"  --status-fd <n>            File descriptor <n>으로 상태 변경 내역을 보냅니"
+"다.\n"
+"  --log=<filename>           상태 변경이나 행동을 <filename>에 로그로 남깁니"
+"다.\n"
 "  --ignore-depends=<package>,...\n"
 "                             <package>와 관련된 의존관계를 무시합니다.\n"
 "  --force-...                문제점을 무시합니다(--force-help 참조).\n"
@@ -2332,14 +2336,15 @@ msgstr ""
 "--compare-versions에서 사용하는 비교 연산자:\n"
 "  lt le eq ne ge gt       (버전이 없는 경우 항상 이전 버전으로 취급)\n"
 "  lt-nl le-nl ge-nl gt-nl (버전이 없는 경우 항상 이후 버전으로 취급)\n"
-"  < << <= = >= >> >       (control 파일의 형식과의 호환성을 위해서만 "
-"사용).\n"
+"  < << <= = >= >> >       (control 파일의 형식과의 호환성을 위해서만 사용).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "사용자 친화적인 꾸러미 관리를 위해서는 'deselect'나 'aptitude'을 사용하십시오.\n"
+msgstr ""
+"사용자 친화적인 꾸러미 관리를 위해서는 'deselect'나 'aptitude'을 사용하십시"
+"오.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2354,12 +2359,13 @@ msgid ""
 "Options marked [*] produce a lot of output - pipe it through `less' or "
 "`more' !"
 msgstr ""
-"꾸러미 설치 및 지우기에 관한 도움말을 보려면 dpkg --help를 실행하십시오 [*].\n"
+"꾸러미 설치 및 지우기에 관한 도움말을 보려면 dpkg --help를 실행하십시오 "
+"[*].\n"
 "편리한 꾸러미 관리 시스템을 사용하려면 dselect나 aptitude을 사용하십시오.\n"
 "dpkg 디버그 플래그 값을 보려면 dpkg -Dhelp를 입력하십시오.\n"
 "강제 옵션에 대해 알아보려면 dpkg --force-help를 입력하십시오.\n"
-"저작권 관련 내용(GNU GPL)과 보증 안되는 내용을 보려면 dpkg --license를 "
-"입력하십시오 [*].\n"
+"저작권 관련 내용(GNU GPL)과 보증 안되는 내용을 보려면 dpkg --license를 입력하"
+"십시오 [*].\n"
 "\n"
 "[*]표로 표시된 옵션은 출력하는 내용이 많습니다. - `less'나 `more'를 이용하십"
 "시오!"
@@ -2549,7 +2555,7 @@ msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다"
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "명령 옵션이 필요합니다"
@@ -2624,6 +2630,10 @@ msgstr "  %s 꾸러미는 %s을(를) 제공하지만 설치하지 않았습니
 msgid "  Package %s is not installed.\n"
 msgstr "  %s 꾸러미는 설치하지 않았습니다.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " 꾸러미는 다음 꾸러미에 의존: "
+
 # FIXME: bad msgid
 #: src/packages.c:402
 msgid "; however:\n"
@@ -2794,7 +2804,9 @@ msgstr "dpkg-deb: 뒤에 나오는 0을 잘라 버립니다"
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: 경고 - 오래된 파일 `%.250s'의 정보를 읽을 수 없으므로 지우지 않습니다: %s"
+msgstr ""
+"dpkg: 경고 - 오래된 파일 `%.250s'의 정보를 읽을 수 없으므로 지우지 않습니다: "
+"%s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2807,8 +2819,8 @@ msgid ""
 "dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
 "been deleted)\n"
 msgstr ""
-"dpkg: %s: 경고 - 오래된 설정 파일 `%.250s'은(는) 빈 디렉토리였으며 이제 "
-"지워졌습니다\n"
+"dpkg: %s: 경고 - 오래된 설정 파일 `%.250s'은(는) 빈 디렉토리였으며 이제 지워"
+"졌습니다\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2816,10 +2828,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "새로운 파일 `%.250s'의 정보를 읽을 수 없습니다"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: 경고 - 오래된 파일 `%.250s' 몇가지 새로운 파일과 같습니다(%.250s와 "
 "%.250s 모두)!"
@@ -3050,9 +3062,11 @@ msgstr ""
 "출력형식의 형식:\n"
 "  출력형식은 각 꾸러미에서 출력될 문자열입니다. 출력형식은 \\n(새줄입력), \n"
 "  \\r(복귀문자), \\\\(일반 역슬래시) 등 표준 익스케이프 문자열을 사용할 수 \n"
-"  있습니다. ${var[;width]} 형식의 꾸러미 변수를 이용하여 꾸러미 정보를 입력할 \n"
-"  수 있습니다. 폭이 음수가 아니라면 변수들은 오른쪽 정렬이 될 것이고, 음수라면 \n"
-"왼쪽 정렬이 됩니다.\n" 
+"  있습니다. ${var[;width]} 형식의 꾸러미 변수를 이용하여 꾸러미 정보를 입력"
+"할 \n"
+"  수 있습니다. 폭이 음수가 아니라면 변수들은 오른쪽 정렬이 될 것이고, 음수라"
+"ë©´ \n"
+"왼쪽 정렬이 됩니다.\n"
 
 #: src/query.c:514
 msgid ""
@@ -3281,24 +3295,29 @@ msgstr "--forget-old-unavail 옵션은 인수를 받지 않습니다"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - 오류: %s(`%s')에는 숫자가 들어 있지 않습니다\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build 옵션은 디렉토리 인수가 필요합니다"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build 옵션은 최대 두 개의 인수를 받습니다"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "`%.250s' 아카이브가 있는 지 여부를 검사할 수 없습니다"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "대상이 디렉토리입니다 - 컨트롤 파일 검사를 건너 뛸 수 없습니다"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3307,43 +3326,43 @@ msgstr ""
 "dpkg-deb: 경고, 컨트롤 영역의 내용을 검사하지 않습니다.\n"
 "dpkg-deb: `%s'에 알 수 없는 꾸러미를 만듭니다.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "꾸러미 이름에 영문 소문자나 숫자나 `-+.'이 아닌 문자가 들어 있습니다"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "경고, '%s'에 사용자 정의 우선순위 값 `%s'이(가) 들어 있습니다.\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "경고, '%s'에 사용자 정의 필드 `%s'이(가) 들어 있습니다.\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "컨트롤 파일에 %d개의 오류가 발생했습니다"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: `%s' 꾸러미 빌드하는 중입니다 (`%s'에서).\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "컨트롤 디렉토리의 권한이 잘못되었습니다 : %03lo (>=0755 및 <=0775이어야 합니"
 "다)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "관리자 스크립트 `%.50s'은(는) 일반 파일이 아니거나 심볼릭 링크입니다"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3352,16 +3371,16 @@ msgstr ""
 "관리자 스크립트 `%.50s'의 권한이 잘못되었습니다 : %03lo (>=0555 및 <=0775이어"
 "야 합니다)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "관리자 스크립트 `%.50s'의 정보를 읽을 수 없습니다"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "정보 파일을 읽는 fgets에서 빈 문자열을 리턴했습니다"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3369,119 +3388,119 @@ msgstr ""
 "경고, 설정파일의 이름(`%.50s...')이 너무 길거나 마지막에 줄바꿈 문자가 빠졌습"
 "니다\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "경고, 설정파일의 이름 `%s' 끝에 공백문자가 있습니다\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "`%.250s' 설정파일이 꾸러미 안에 없습니다"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "`%.250s' 설정 파일의 정보를 읽을 수 없습니다"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "경고, `%.250s' 설정 파일이 일반 파일이 아닙니다\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "conffile 파일을 읽는 데 오류가 발생했습니다"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "conffile 파일을 여는 데 오류가 발생했습니다"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: 컨트롤 파일과 관련된 %d개의 경고를 무시합니다\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "`%.255s'의 버퍼를 없앨 수 없습니다"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' 디렉토리로 이동하는 데 실패했습니다"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ".../DEBIAN 디렉토리로 이동하는 데 실패했습니다"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "tar -cf 실행에 실패했습니다"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "임시파일을 만드는 데 실패했습니다 (컨트롤)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "임시파일을 여는 데 실패했습니다 (컨트롤), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "임시파일을 지우는 데 실패했습니다 (컨트롤), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "컨트롤"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "임시파일의 정보를 읽는 데 실패했습니다 (컨트롤)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "임시파일의 앞으로 이동하는 데 실패했습니다 (컨트롤)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "임시파일을 만드는 데 실패했습니다 (데이터)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "임시파일을 여는 데 실패했습니다 (데이터), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "임시파일을 지우는 데 실패했습니다 (데이터), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "데이터"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "find 실행이 실패했습니다"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "파일이름을 tar 파이프에 쓰는 데 실패했습니다 (데이터)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "내부 오류, 압축 종류 `%i' 알 수 없습니다!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "임시파일의 앞으로 이동하는 데 실패했습니다 (데이터)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (데이터)"
 
@@ -3565,23 +3584,23 @@ msgstr ""
 "아카이브의 %.250s 버전 형식을 알지 못합니다. 더 최신의 dpkg-deb을 이용하십시"
 "오"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "%s에서 멤버 데이터를 건너 뜁니다"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "`%.250s' 파일에 이해할 수 없는 데이터 멤버(%.*s)가 있습니다. 포기합니다"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "`%.250s' 파일에 두 개의 컨트롤 멤버가 있습니다. 포기합니다"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3590,16 +3609,16 @@ msgstr ""
 " 새 데비안 꾸러미, 버전 %s.\n"
 " 크기 %ld바이트: 컨트롤 아카이브= %zi바이트\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "컨트롤 정보 길이"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "아카이브의 컨트롤 길이 `%s'의 형식이 틀렸습니다"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3608,15 +3627,15 @@ msgstr ""
 " 옛날 데비안 꾸러미, 버전 %s.\n"
 " 크기 %ld바이트: 컨트롤 아카이브= %zi, 주 아카이브= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "'cfgarea'에 필요한 메모리를 할당하는 데 오류 발생"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "컨트롤 영역"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3625,65 +3644,65 @@ msgstr ""
 "dpkg-deb: 파일이 마치 ASCII 모드로 내려받는 과정에서\n"
 "dpkg-deb:    손상된 아카이브로 보입니다\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s'은(는) 데비안 형식의 아카이브가 아닙니다"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "파일의 현재위치를 구하는데 실패했습니다"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "파일의 현재위치를 지정하는데 실패했습니다"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "붙여 넣기에서 pipe descriptor '1'을 여는데 실패했습니다"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "gzip -dc에 쓰는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "gzip -dc를 닫는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "파일 아카이브 위치로 lseek 시스템 콜이 실패했습니다"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "복사할 때 파이프에 쓰는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "복사할 때 파이프를 닫는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "디렉토리를 만드는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "디렉토리를 만든 다음에 거기로 이동하는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "디렉토리로 이동하는 데 실패했습니다"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "tar 실행이 실패했습니다"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 옵션에는 .deb 파일이름 인수가 필요합니다"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3692,12 +3711,12 @@ msgstr ""
 "--%s 옵션에는 대상 디렉토리가 필요합니다.\n"
 "혹시 dpkg --install을 하려고 했던 것 아닌가요?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 옵션에는 최대 두 개의 인수를 받습니다 (.deb 및 디렉토리)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 옵션에는 오직 한 개의 인수만 받습니다 (.deb 파일이름)"
@@ -3851,7 +3870,7 @@ msgstr ""
 "<cfield>는 컨프롤 파일에 있는 필드의 이름을 뜻합니다.\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3862,14 +3881,17 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "옵션:\n"
-"  --showformat=<format>            --show에서 사용할 형식을 따로 지정합니다.\n"
+"  --showformat=<format>            --show에서 사용할 형식을 따로 지정합니"
+"다.\n"
 "  -D                               디버그 정보를 출력하도록 설정합니다.\n"
 "  --old, --new                     아카이브 형식을 지정합니다.\n"
-"  --nocheck                        control 파일의 검사를 하지 않습니다(잘못된 \n"
+"  --nocheck                        control 파일의 검사를 하지 않습니다(잘못"
+"된 \n"
 "                                     꾸러미 빌드)\n"
 "  -z#                              빌드할 때 사용할 압축 수준을 지정합니다.\n"
 "  -Z<type>                         빌드할 때 사용할 압축 형식을 지정합니다.\n"
@@ -3886,7 +3908,8 @@ msgid ""
 msgstr ""
 "\n"
 "시스템에 꾸러미를 설치하거나 시스템에서 꾸러미를 지울 때 'dpkg'를 사용하시\n"
-"거나, 사용자 친화적인 꾸러미 관리자인 'dselect'나 'aptitude'를 사용하십시오.\n"
+"거나, 사용자 친화적인 꾸러미 관리자인 'dselect'나 'aptitude'를 사용하십시"
+"오.\n"
 "'dpkg-deb --extract'로 압축 풀린 꾸러미들은 설치가 제대로 되지 않습니다!\n"
 
 #: dpkg-deb/main.c:115
@@ -3897,7 +3920,7 @@ msgstr ""
 "*.deb 파일 조작에 관한 도움말을 보려면 dpkg-deb --help를 실행하십시오.\n"
 "꾸러미 설치와 설치 해제에 관한 도움말을 보려면 dpkg --help를 실행하십시오."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "알 수 없는 압축 종류 `%s'!"
@@ -4281,9 +4304,9 @@ msgid "unable to exec mksplit"
 msgstr "mksplit 실행이 실패했습니다"
 
 # FIXME: bad msgid
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "데비안 %s 버전 %s.\n"
@@ -4296,9 +4319,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4353,7 +4376,7 @@ msgid "try deleting %s"
 msgstr "%s을(를) 지워보십시오"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "%s 열 수 없습니다: %s"
@@ -4380,7 +4403,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s 읽은 후에 닫는 데 실패했습니다: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s 닫을 수 없습니다: %s"
@@ -4400,12 +4423,12 @@ msgstr "%s 파일을 설치하는데 실패했습니다. %s 파일로 그대로
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: %s에 대한 잠금을 해제할 수 없습니다: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "%s에서 ENOENT 값을 가져올 수 없습니다: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4415,7 +4438,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4465,92 +4488,92 @@ msgstr ""
 "\n"
 "추가할 때는 --local와 --divert <original>.distrib이 기본입니다.\n"
 "지울 때는 --package나 --local와 --divert이 지정되었을 경우 일치하는 항목이 \n"
-"있어야 합니다. 꾸러미의 preinst, postrm 스크립트는 언제나 --package와 --divert을 "
-"지정하는 것이 좋습니다.\n"
+"있어야 합니다. 꾸러미의 preinst, postrm 스크립트는 언제나 --package와 --"
+"divert을 지정하는 것이 좋습니다.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "두 가지 모드가 지정되었습니다: %s와 --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s 옵션은 divert-to 인수가 필요합니다"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to에는 새줄문자가 있어서는 안 됩니다"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s 옵션은 <package> 인수가 필요합니다"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "꾸러미에 새줄문자가 있어서는 안 됩니다"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 옵션은 <directory> 인수가 필요합니다"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "알 수 없는 옵션 '%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "diversions 파일을 여는 데 실패했습니다: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "altname이 없습니다"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "꾸러미가 없습니다"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s 옵션은 인수를 하나만 받습니다"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "\"%s\" 파일의 이름은 절대적이지 않습니다"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "파일에 새줄문자가 있어서는 안 됩니다"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "디렉토리를 우회처리할 수는 없습니다"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "'%s'에서 나갑니다"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s'은(는) %s와 충돌합니다"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "'%s' 추가하는 중"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4561,7 +4584,7 @@ msgstr ""
 "  '%s' 지우던 도중\n"
 "  '%s' 발견"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4572,37 +4595,37 @@ msgstr ""
 "  '%s' 지우던 도중\n"
 "  '%s' 발견"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "'%s' 지우는 중"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "우회경로 '%s' 없으므로 아무것도 안 지웠음"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "내부 오류 - 잘못된 모드 '%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "예전 이름 '%s'의 정보를 읽을 수 없습니다 : %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "새 이름 '%s'의 정보를 읽을 수 없습니다 : %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "'%s' 검사하는 데 오류가 발생했습니다: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4611,52 +4634,52 @@ msgstr ""
 "rename은 '%s'을(를) 다른 파일 '%s'(으)로 \n"
 "  덮어씌우는 작업이므로 허용하지 않습니다"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: 중복된 예전 링크 '%s' 지웁니다: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: '%s' 파일을 '%s' 파일로 이름 바꿉니다: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new 생성합니다: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new 씁니다: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new 닫습니다: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "예전 diversions-old 지웁니다: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "새로운 diversions-old 생성합니다: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "새로운 우회경로(diversions) 설치합니다: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "내부 오류: '%s' 망가졌습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4664,7 +4687,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4689,7 +4712,8 @@ msgstr ""
 "  --add <owner> <group> <mode> <file>\n"
 "                           데이터베이스에 새 항목을 추가합니다.\n"
 "  --remove <file>          데이터베이스에서 파일을 지웁니다.\n"
-"  --list [<glob-pattern>]  데이터베이스에 현재 있는 override 항목들을 보여줍니다.\n"
+"  --list [<glob-pattern>]  데이터베이스에 현재 있는 override 항목들을 보여줍"
+"니다.\n"
 "\n"
 "Options:\n"
 "  --admindir <directory>   statoverride 파일이 있는 디렉토리를 지정합니다.\n"
@@ -4699,106 +4723,106 @@ msgstr ""
 "  --help                   이 도움말 메시지를 보여줍니다.\n"
 "  --version                버전을 보여줍니다.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "지정된 모드가 없습니다"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add 옵션은 인수가 4개 필요합니다"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "불법 사용자 %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "없는 사용자 %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "불법 그룹 %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "없는 그룹 %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "불법 모드 %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "맨 끝에 있는 /를 지웁니다"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\"을(를) 위한 override가 이미 존재함, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "하지만 --force가 지정되었으므로 무시합니다."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "중단하는 중"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "경고: --update 옵션을 지정하였지만 %s이(가) 없습니다"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "chown %s 실행에 실패했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod %s 실행에 실패했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "override가 없습니다."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "경고: --remove에서는 --update 무의미합니다."
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "statoverride 파일을 여는 데 실패했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "\"%s\"을(를) 위한 override가 중복으로 지정되었으므로 중단합니다."
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "새로운 statoverride 파일을 여는 데 실패했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "statoverride-old를 지우는데 오류가 발생했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "새로운 statoverride-old 만드는 데 오류가 발생했습니다: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "새로운 statoverride를 설치하는데 오류가 발생했습니다: %s"
@@ -4851,15 +4875,16 @@ msgstr ""
 "  --infodir=<directory>    '--dir-file=<directory>/dir'와 같습니다.\n"
 "  --info-dir=<directory>   마찬가지로 같습니다.\n"
 "  --keep-old               항목을 대체하거나 빈 항목을 지우지 않습니다.\n"
-"  --remove                 기본 이름 <filename>(으)로 지정된 항목을 지웁니다.\n"
+"  --remove                 기본 이름 <filename>(으)로 지정된 항목을 지웁니"
+"다.\n"
 "  --remove-exactly         이름이 정확히 <filename>인 항목을 지웁니다.\n"
 "  --test                   테스트 모드를 사용합니다(실제 작업은 하지 않음).\n"
-"  --debug                  디버그 모드를 사용합니다(더 많은 정보를 보여줍니다).\n"
+"  --debug                  디버그 모드를 사용합니다(더 많은 정보를 보여줍니"
+"다).\n"
 "  --quiet                  메시지를 출력하지 않습니다.\n"
 "  --help                   이 도움말 메시지를 보여줍니다.\n"
 "  --version                버전을 보여줍니다.\n"
 
-
 #: scripts/install-info.pl:97
 #, perl-format
 msgid "could not open stderr for output! %s"
@@ -5015,7 +5040,7 @@ msgstr "%s을(를) 읽을 수 없습니다: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5025,8 +5050,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5046,7 +5071,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5071,7 +5096,8 @@ msgstr ""
 "  --install <link> <name> <path> <priority>\n"
 "    [--slave <link> <name> <path>] ...\n"
 "                           시스템에 대체항목들을 추가합니다.\n"
-"  --remove <name> <path>   <name> 그룹 대체항목에서 <path>을(를) 제거합니다.\n"
+"  --remove <name> <path>   <name> 그룹 대체항목에서 <path>을(를) 제거합니"
+"다.\n"
 "  --remove-all <name>      <name> 그룹을 대체항목 시스템에서 제거합니다.\n"
 "  --auto <name>            마스터 연결 <name>을(를) 자동모드로 바꿉니다.\n"
 "  --display <name>         <name> 그룹에 관한 정보를 보여줍니다.\n"
@@ -5099,163 +5125,162 @@ msgstr ""
 "  --help                   이 도움말 메시지를 보여줍니다.\n"
 "  --version                버전을 보여줍니다.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "알 수 없는 인수 '%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install은 <link> <name> <path> <priority>를 필요로 합니다"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "priority는 정수여야 합니다"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s 옵션은 <name> <path>을(를) 필요로 합니다"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s 옵션은 <name>을(를) 필요로 합니다"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave는 <link> <name> <path>를 필요로 합니다"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "슬레이브의 이름 %s이(가) 중복되었습니다"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "슬레이브 연결 %s 중복되었습니다"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "이름 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "연결 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"--display이나 --config, --set, --install, --remove, --all, --remove-all, "
-"--auto를 필요로 합니다."
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave는 --install와 함께 사용해야 합니다"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "중복된 슬레이브 '%s'"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "슬레이브 연결이 메인 연결 %s와 같습니다"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "중복된 슬레이브 연결 '%s'"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "중복된 경로 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "우선순위 %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
-"%s의 대체 항목은 %s을(를) 가리키지만 찾지 못했습니다. 대체 항목의 목록에서 "
-"지웁니다."
+"%s의 대체 항목은 %s을(를) 가리키지만 찾지 못했습니다. 대체 항목의 목록에서 지"
+"웁니다."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s의 대체 항목이 없습니다."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 상태는 %s입니다."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 연결 현재 %s을(를) 가리키는 중"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " 연결 현재 없음"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " 연결 읽을 수 없습니다 - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 우선순위 %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " 슬레이브 %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "버전 없음."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "현재 가장 '좋은' 버전은 %s입니다."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "알 수 없는 인수 '%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install은 <link> <name> <path> <priority>를 필요로 합니다"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "priority는 정수여야 합니다"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s 옵션은 <name> <path>을(를) 필요로 합니다"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s 옵션은 <name>을(를) 필요로 합니다"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave는 <link> <name> <path>를 필요로 합니다"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "슬레이브의 이름 %s이(가) 중복되었습니다"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "슬레이브 연결 %s 중복되었습니다"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "이름 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "연결 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"--display이나 --config, --set, --install, --remove, --all, --remove-all, --"
+"auto를 필요로 합니다."
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave는 --install와 함께 사용해야 합니다"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s의 자동 선택을 설정하는 중입니다."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s을(를) 지울 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5264,7 +5289,7 @@ msgstr ""
 "%s 변경되었습니다(수동으로 직접, 혹은 스크립트로).\n"
 "수동 업데이트만 사용하기로 변경합니다."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5273,68 +5298,70 @@ msgstr ""
 "%s의 사용할 수 있는 버전들을 확인하고 %s에 있는 연결들을 업데이트하는 중...\n"
 "(원한다면 거기에 있는 symlink들을 직접 조작할 수 있습니다 - 'man ln' 참조)."
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s 연결을 %s에서 %s으(로) 이름을 바꿉니다."
 
 # FIXME: bad msgid
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s을(를) %s(으)로 이름을 바꿀 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "슬레이브 연결의 이름 %s 중복되었습니다"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "슬레이브 연결 %s의 이름을 %s에서 %s(으)로 변경하는 중입니다."
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "수동으로 선택한 대체 항목을 지우는 중 - 자동 모드로 변경합니다"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s의 대체 항목 %1$s 등록되지 않았으므로 지우지 않습니다."
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "사용 중지된 슬레이브 연결 %s 없애는 중(%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s의 자동 업데이트가 중지되었으므로 가만히 둡니다."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
-msgstr "다시 자동업데이트를 사용하려면 'update-alternatives --auto %s'을(를) 사용하십시오."
+msgstr ""
+"다시 자동업데이트를 사용하려면 'update-alternatives --auto %s'을(를) 사용하십"
+"시오."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "전에 실패했던 %s의 업데이트에서 복구하는 중..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "'%s' 쓰기 위해 열 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s을(를) 제공하던 마지막 꾸러미(%s)가 제거되었으므로 지웁니다."
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5343,38 +5370,38 @@ msgstr ""
 "경고: %s은(는) %s로의 symlink이어야 하거나 \n"
 "없어야 하지만 readlink가 실패했습니다. %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s이(가) 없다는 것을 확인할 수 없습니다. %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s(%s)이(가) %s을(를) 계속 가리키도록 둡니다."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s(%s)이(가) %s을(를) 가리키도록 바꿉니다."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5383,13 +5410,13 @@ msgstr ""
 "경고: %s은(는) %s(으)로의 슬레이브 symlink이거나 존재하지\n"
 "않아야하지만 readlink가 실패했습니다. %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%3$s에 적절하지 않으므로 %1$s(%2$s) 지우는 중."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5398,7 +5425,7 @@ msgstr ""
 "%s(%s)을(를) 제공하는 프로그램이 하나만 있습니다.\n"
 "설정할 것이 없습니다.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5411,45 +5438,55 @@ msgstr ""
 "  선택번호     대체항목\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "기본 사항[*]을 사용하려면 엔터, 다른 것을 사용하려면 번호를 입력하십시오: "
+msgstr ""
+"기본 사항[*]을 사용하려면 엔터, 다른 것을 사용하려면 번호를 입력하십시오: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "'%s'이(가) %s을(를) 제공하도록 하는 중."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "대체항목 '%s' 찾을 수 없습니다."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout에 쓰는 데 오류가 발생했습니다: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 파일(%s)에는 줄바꿈이 금지되어 있습니다."
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s에서 %1$s 읽는데 오류가 발생했거나 eof가 있었습니다(%3$s)."
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s 다음에 줄바꿈이 없습니다"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "심각한 문제: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: gzip -dc 실행 실패"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: bzip2 -dc 실행 실패"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: bzip2 %s 실행 실패"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "%.250s 파일을 만들 수 없습니다"
 
diff --git a/po/nb.po b/po/nb.po
index 2eff7ace..3d8aa08d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-15 23:32+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -58,72 +58,57 @@ msgstr "Systemfeil nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal nr. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: Klarte ikke kjøre gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: klarte ikke kjøre «gzip -dc»"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: klarte ikke kjøre «bzip2 -dc»"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: Intern gzip-feil: Leste: «%s»"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: Intern gzip-feil: Skrev: «%s»"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: Intern gzip-feil: lese(%i) != skrive(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: Klarte ikke kjøre gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: Intern bzip2-feil: Leste: «%s»"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: Intern bzip2-feil: Skrev: «%s»"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: Intern bzip2-feil: lese(%i) != skrive(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: Klarte ikke kjøre bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
@@ -144,13 +129,19 @@ msgstr "klarte ikke skrive under «hashreport»"
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "oppdateringskatalogen inneholder fila «%.250s», som har for langt navn (lengde=%d, maks=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"oppdateringskatalogen inneholder fila «%.250s», som har for langt navn "
+"(lengde=%d, maks=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "oppdateringskatalogen inneholder filer med ulike navnelengder (både %d og %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"oppdateringskatalogen inneholder filer med ulike navnelengder (både %d og %d)"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -162,9 +153,7 @@ msgstr "klarte ikke skanne oppdateringskatalogen «%.255s»"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "klarte ikke fjerne den innlagte oppdateringsfila %.255s"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "klarte ikke opprette «%.255s»"
@@ -273,7 +262,8 @@ 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
@@ -391,7 +381,8 @@ msgstr "foreldet «Revision»- eller «Package-Revision»-felt brukt"
 
 #: lib/fields.c:219
 msgid "value for `config-version' field not allowed in this context"
-msgstr "verdien for «config-version»-feltet kan ikke brukes i denne sammenhengen"
+msgstr ""
+"verdien for «config-version»-feltet kan ikke brukes i denne sammenhengen"
 
 #: lib/fields.c:223
 #, c-format
@@ -414,8 +405,10 @@ msgstr "rot- eller null-katalog er nevnt som oppsettsfil"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "«%s»-felt, manglende pakkenavn eller rot der det skulle være et pakkenavn"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"«%s»-felt, manglende pakkenavn eller rot der det skulle være et pakkenavn"
 
 #: lib/fields.c:340
 #, c-format
@@ -460,10 +453,10 @@ msgid ""
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 "«%s»-felt, referanse til «%.255s»:\n"
-" versjonsverdien starter med et ikke-alfanumerisk tegn, foreslår å legge til et mellomrom"
+" versjonsverdien starter med et ikke-alfanumerisk tegn, foreslår å legge til "
+"et mellomrom"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon inneholder «%c»"
@@ -513,8 +506,7 @@ msgstr "klarte ikke låse dpkg-statusdatabasen"
 msgid "malloc failed (%ld bytes)"
 msgstr "minnetildeling mislyktes (%ld byte)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "nytildeling mislyktes (%ld byte)"
@@ -557,8 +549,7 @@ msgstr "underprosessen %s returnerte feilstatus %d"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: Advarsel - %s drept med signal (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ",  lagret minnet"
 
@@ -667,8 +658,7 @@ msgstr "lesefeil i oppsettsfila «%.255s»"
 msgid "error closing configuration file `%.255s'"
 msgstr "feil ved lukking av oppsettsfila «%.255s»"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Feil ved tilordning av minne for cfgfilename"
 
@@ -750,17 +740,20 @@ msgstr "feltnavnet «%.*s» skal følges av et kolon"
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "slutt på fil før verdien til feltet «%.*s» (mangler linjeskift til slutt)"
+msgstr ""
+"slutt på fil før verdien til feltet «%.*s» (mangler linjeskift til slutt)"
 
 #: lib/parse.c:174
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
-msgstr "MSDOS-tegn for slutt på fil i verdien for feltet «%.*s» (mangler linjeskift?)"
+msgstr ""
+"MSDOS-tegn for slutt på fil i verdien for feltet «%.*s» (mangler linjeskift?)"
 
 #: lib/parse.c:188
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
-msgstr "slutt på fil i verdien for feltet «%.*s» (mangler avsluttende linjeskift)"
+msgstr ""
+"slutt på fil i verdien for feltet «%.*s» (mangler avsluttende linjeskift)"
 
 #: lib/parse.c:211
 #, c-format
@@ -887,159 +880,168 @@ msgstr "Høyreparentes mangler i formatet\n"
 msgid "failed to realloc for variable buffer"
 msgstr "klarte ikke tildele på nytt for variabel buffer"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  forsvunnet allerede!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "feil ved lesing fra dpkg-deb-rør"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "feil ved setting av tidsmerke for «%.255s»"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "feil ved setting av eierskap for «%.255s»"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "feil ved setting av rettigheter for «%.255s»"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "prøver å skrive over «%.250s», som er den omdirigerte versjonen av «%.250s»%.10s%.100s%.10s"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"prøver å skrive over «%.250s», som er den omdirigerte versjonen av "
+"«%.250s»%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakke: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "fant ikke «%.255s» (som jeg skulle til å installere)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
-msgstr "klarte ikke rydde opp i rotet rundt «%.255s» før en annen versjon skulle installeres"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
+msgstr ""
+"klarte ikke rydde opp i rotet rundt «%.255s» før en annen versjon skulle "
+"installeres"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "fant ikke gjenopprettet «%.255s» før en annen versjon skulle installeres"
+msgstr ""
+"fant ikke gjenopprettet «%.255s» før en annen versjon skulle installeres"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet inneholdt objektet «%.255s» med ukjent type 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Bytter ut filer i den gamle pakken %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Byttet ut med filer i den installerte pakken %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "prøver å skrive over katalogen «%.250s» i pakken %.250s med noe annet enn en katalog"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"prøver å skrive over katalogen «%.250s» i pakken %.250s med noe annet enn en "
+"katalog"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "prøver å skrive over «%.250s», som også finnes i pakken %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "gobble byttet ut fil «%.255s»"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "feil ved lukking/skriving av «%.255s»"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "feil ved oppretting av rør «%.255s»"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "feil ved oppretting av enhet «%.255s»"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "feil ved oppretting av hard lenke «%.255s»"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "feil ved oppretting av symbolsk lenke «%.255s»"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "feil ved setting av eierskap for den symbolske lenken «%.255s»"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "feil ved oppretting av katalogen «%.255s»"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "klarte ikke flytte «%.255s» for å installere en ny versjon"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "klarte ikke lese lenken «%.255s»"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "klarte ikke lage sikringskopi av den symbolske lenken «%.255s»"
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "klarte ikke endre eierskap til den symbolske lenken «%.255s»"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "klarte ikke lage sikringskopi av lenken «%.255s» før en ny versjon skulle installeres"
+msgstr ""
+"klarte ikke lage sikringskopi av lenken «%.255s» før en ny versjon skulle "
+"installeres"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "klarte ikke installere ny versjon av «%.255s»"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1048,7 +1050,7 @@ msgstr ""
 "dpkg: Advarsel - ignorerer kravproblem ved fjerning av %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1057,7 +1059,7 @@ msgstr ""
 "dpkg: Advarsel - vurderer fjerning av oppsett for den nødvendige\n"
 " pakken %s for å kunne fjerne %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1066,7 +1068,7 @@ msgstr ""
 "dpkg: Nei, %s er nødvendig. Vil ikke fjerne oppsettet\n"
 " for å kunne fjerne %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1075,37 +1077,47 @@ msgstr ""
 "dpkg: Nei, kan ikke fjerne %s (--auto-deconfigure kan hjelpe):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: Vurderer å fjerne %s til fordel for %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s er ikke skikkelig installert - ignorerer pakkekrav.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: Kan få problemer med å fjerne %s, siden den tilbyr %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
-msgstr "dpkg: Pakken %s krever installasjon på nytt, men blir fjernet likevel, siden du ønsker det.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
+msgstr ""
+"dpkg: Pakken %s krever installasjon på nytt, men blir fjernet likevel, siden "
+"du ønsker det.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
-msgstr "dpkg: Pakken %s krever installasjon på nytt, så den blir ikke fjernet.\n"
+msgstr ""
+"dpkg: Pakken %s krever installasjon på nytt, så den blir ikke fjernet.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: Ja, fjerner %s til fordel for %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1114,80 +1126,85 @@ msgstr ""
 "dpkg: Knytt til %s, som inneholder %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pakker i konflikt - installerer ikke %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: Advarsel - ignorerer konflikt, men kan fortsette likevel.\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive trenger minst én sti-parameter"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "klarte ikke kjøre «find» for --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "klarte ikke utføre «fdopen» på find-røret"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "klarte ikke lese find-røret"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "klarte ikke lukke find-røret"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerte den uforutsette feilen %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søkte, men fant ingen pakker (filer med navn *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s trenger minst én pakkearkivfil som parameter"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Velger den tidligere fravalgte pakken %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hopper over den fravalgte pakken %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versjon %.250s av %.250s er installert fra før, hopper over.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - Advarsel: Nedgraderer %.250s fra %.250s til %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "Vil ikke nedgradere %.250s fra versjon %.250s til %.250s, hopper over.\n"
+msgstr ""
+"Vil ikke nedgradere %.250s fra versjon %.250s til %.250s, hopper over.\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "klarte ikke fjerne den nyinstallerte versjonen av «%.250s» for å kunne installere sikringskopien på nytt"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"klarte ikke fjerne den nyinstallerte versjonen av «%.250s» for å kunne "
+"installere sikringskopien på nytt"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1263,8 +1280,7 @@ msgstr "Setter opp %s (%s) ...\n"
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "fant ikke den nye distribusjonsoppsettsfila «%.250s»"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "fant ikke den installerte oppsettsfila «%.250s»"
@@ -1283,12 +1299,15 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: Advarsel - klarte ikke fjerne den gamle sikringskopien «%.250s»: %s\n"
+msgstr ""
+"dpkg: %s: Advarsel - klarte ikke fjerne den gamle sikringskopien «%.250s»: %"
+"s\n"
 
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: Advarsel - klarte ikke endre navnet på «%.250s» til «%.250s»: %s\n"
+msgstr ""
+"dpkg: %s: Advarsel - klarte ikke endre navnet på «%.250s» til «%.250s»: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1298,12 +1317,15 @@ msgstr "dpkg: %s: Advarsel - klarte ikke fjerne «%.250s»: %s\n"
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: Advarsel - klarte ikke fjerne den tidligere distribuerte versjonen «%.250s»: %s\n"
+msgstr ""
+"dpkg: %s: Advarsel - klarte ikke fjerne den tidligere distribuerte versjonen "
+"«%.250s»: %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: Advarsel - klarte ikke fjerne «%.250s» (før overskriving): %s\n"
+msgstr ""
+"dpkg: %s: Advarsel - klarte ikke fjerne «%.250s» (før overskriving): %s\n"
 
 #: src/configure.c:267
 #, c-format
@@ -1358,8 +1380,12 @@ msgstr ""
 
 #: src/configure.c:393
 #, c-format
-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"
+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"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1373,7 +1399,8 @@ msgstr "dpkg: %s: Advarsel - klarte ikke åpne oppsettsfila %s for nøkkel: %s\n
 #: src/configure.c:435
 #, c-format
 msgid "unable to change ownership of new dist conffile `%.250s'"
-msgstr "klarte ikke endre eierskap til den nye distribusjonsoppsettsfila «%.250s»"
+msgstr ""
+"klarte ikke endre eierskap til den nye distribusjonsoppsettsfila «%.250s»"
 
 #: src/configure.c:438
 #, c-format
@@ -1385,8 +1412,7 @@ msgstr "klarte ikke sette modus til den nye distribusjonsoppsettsfila «%.250s»
 msgid "failed to run %s (%.250s)"
 msgstr "klarte ikke kjøre %s (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "venting på skall mislyktes"
 
@@ -1401,7 +1427,8 @@ msgstr "klarte ikke kjøre skall (%.250s)"
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Ikke glem å sette denne prosessen i forgrunnen («fg») når du er ferdig.\n"
+msgstr ""
+"Ikke glem å sette denne prosessen i forgrunnen («fg») når du er ferdig.\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1498,7 +1525,8 @@ msgstr ""
 "    Y eller I  : Installer pakkevedlikeholderens versjon.\n"
 "    N eller O : Ta vare på den versjonen som er installert.\n"
 "        D     : Vis forskjellen mellom versjonene.\n"
-"        Z     : Send denne prosessen til bakgrunnen for å undersøke nærmere.\n"
+"        Z     : Send denne prosessen til bakgrunnen for å undersøke "
+"nærmere.\n"
 
 #: src/configure.c:619
 #, c-format
@@ -1539,118 +1567,122 @@ msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 msgid "unable to check for existence of `%.250s'"
 msgstr "klarte ikke sjekke om «%.250s» finnes"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " krever "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " før-krever "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " tilrår "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " foreslår "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " avbryter"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " er i konflikt med "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " foreslår "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " forbedrer "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s skal fjernes.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  Oppsettet av %.250s skal fjernes.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s skal installeres, men versjonen er %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installert, men versjonen er %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er pakket ut, men er aldri satt opp.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er pakket ut, men versjonen er %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s siste oppsatte versjon er %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "%.250s er %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernes.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernes.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tilbyr %.250s, men er %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikke installert.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versjon %.250s) vil bli installert.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versjon %.250s) er %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tilbyr %.250s og skal installeres.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s tilbyr %.250s og er %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(ingen beskrivelse tilgjengelig)"
 
@@ -1691,8 +1723,10 @@ msgid ""
 "the packages can be removed using dselect or dpkg --remove:\n"
 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"
+"problemer under installasjonen. Installasjonen kan sannsynligvis "
+"gjennomføres\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"
@@ -1732,7 +1766,8 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg er ikke registrert som installert. Kan ikke undersøke epokestøtte.\n"
+msgstr ""
+"dpkg er ikke registrert som installert. Kan ikke undersøke epokestøtte.\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1757,15 +1792,15 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture  tar ingen parametre"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--compare-versions tar tre argumenter: <versjon> <relasjon> <versjon>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions ugyldig relasjon"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: versjon «%s» har ugyldig syntaks: %s\n"
@@ -1780,8 +1815,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: Klarte ikke tildele minne for ny oppføring i lista over mislykte pakker."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: Klarte ikke tildele minne for ny oppføring i lista over mislykte "
+"pakker."
 
 #: src/errors.c:91
 #, c-format
@@ -1799,12 +1837,16 @@ msgstr "Behandlingen ble stoppet på grunn av for mange feil.\n"
 #: src/errors.c:112
 #, c-format
 msgid "Package %s was on hold, processing it anyway as you request\n"
-msgstr "Pakken %s var holdt tilbake, men blir behandlet likevel siden du ønsker det\n"
+msgstr ""
+"Pakken %s var holdt tilbake, men blir behandlet likevel siden du ønsker det\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "Pakken %s er holdt tilbake, og blir ikke rørt. Bruk --force-hold for å tvinge gjennom behandling.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"Pakken %s er holdt tilbake, og blir ikke rørt. Bruk --force-hold for å "
+"tvinge gjennom behandling.\n"
 
 #: src/errors.c:125
 msgid ""
@@ -1821,8 +1863,12 @@ msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
-msgstr "dpkg: Alvorlig advarsel: Fillistefila for pakken «%.250s» mangler, Går ut fra at pakken ikke har noen filer installert.\n"
+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"
 
 #: src/filesdb.c:145
 #, c-format
@@ -1932,8 +1978,7 @@ msgstr "uventet slutt på fil i omdirigeringsfila [ii]"
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "«fgets» ga en tom streng fra omdirigeringsfila [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "omdirigeringsfila har en for lang linje eller slutt på fil [ii]"
 
@@ -1952,7 +1997,8 @@ msgstr "«fgets» ga en tom streng fra omdirigeringsfila [iii]"
 #: src/filesdb.c:504
 #, c-format
 msgid "conflicting diversions involving `%.250s' or `%.250s'"
-msgstr "omdirigeringer i konflikt med hverandre, involverer «%.250s» eller «%.250s»"
+msgstr ""
+"omdirigeringer i konflikt med hverandre, involverer «%.250s» eller «%.250s»"
 
 #: src/filesdb.c:513
 msgid "read error in diversions [i]"
@@ -2025,9 +2071,7 @@ msgstr "klarte ikke sette kjøretillatelse på «%.250s»"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "fant ikke det installerte %s-skriptet «%.250s»"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "klarte ikke kjøre %s"
@@ -2084,8 +2128,7 @@ msgstr "fjerne lenke"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "slette"
 
@@ -2094,8 +2137,7 @@ msgstr "slette"
 msgid "failed to %s `%%.255s'"
 msgstr "klarte ikke %s «%%.255s»"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "klarte ikke kjøre «rm» for opprydding"
 
@@ -2104,10 +2146,7 @@ msgstr "klarte ikke kjøre «rm» for opprydding"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian «%s» brukergrensesnitt for pakkehåndtering versjon %s.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2118,10 +2157,7 @@ msgstr ""
 "GNU General Public Licence versjon 2 eller nyere. Det finnes INGEN garanti.\n"
 "Se «%s --licence» for opphavsrett og lisensdetaljer.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2168,16 +2204,21 @@ msgstr ""
 "  -P|--purge         <pakke> ... | -a|--pending\n"
 "  --get-selections [<mønster> ...] send liste over valgene til standard-ut.\n"
 "  --set-selections                 oppgi pakkevalgene fra standard-inn.\n"
-"  --clear-selections               fjern alle valgte ikke-essensielle pakker.\n"
-"  --update-avail <Packages-file>   bytt ut informasjon om tilgjengelige pakker.\n"
+"  --clear-selections               fjern alle valgte ikke-essensielle "
+"pakker.\n"
+"  --update-avail <Packages-file>   bytt ut informasjon om tilgjengelige "
+"pakker.\n"
 "  --merge-avail <Packages-file>    flett med informasjon fra fil.\n"
-"  --clear-avail                    slett eksisterende info om tilgjengelige pakker.\n"
-"  --forget-old-unavail             glem utilgjengelige, ikke installerte pakker.\n"
+"  --clear-avail                    slett eksisterende info om tilgjengelige "
+"pakker.\n"
+"  --forget-old-unavail             glem utilgjengelige, ikke installerte "
+"pakker.\n"
 "  -s|--status <pakke> ...        vis detaljer om pakkestatus.\n"
 "  -p|--print-avail <pakke> ...    vis tilgjengelig versjoner.\n"
 "  -L|--listfiles <pakke> ...     vis de filene som kommer fra pakke(r).\n"
 "  -l|--list [<mønster> ...]        vis oversiktlig pakkeliste.\n"
-"  -S|--search <mønster> ...        finn pakke/pakker som inneholder file(r).\n"
+"  -S|--search <mønster> ...        finn pakke/pakker som inneholder file"
+"(r).\n"
 "  -C|--audit                       sjekk for ødelagte pakke(r).\n"
 "  --print-architecture             vis målarkitektur.\n"
 "  --compare-versions <a> <op> <b>  sammenlikne versjonsnummer, se nedenfor.\n"
@@ -2185,10 +2226,7 @@ msgstr ""
 "  -Dh|--debug=help                 vis hjelp om avlusing.\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2198,7 +2236,8 @@ msgid ""
 msgstr ""
 "  -h|--help                        Viser denne hjelpmeldingen.\n"
 "  --version                        Viser versjonsnummeret.\n"
-"  --license|--licence              Viser lisensbetingelsene for opphavsretten.\n"
+"  --license|--licence              Viser lisensbetingelsene for "
+"opphavsretten.\n"
 "\n"
 
 #: src/main.c:94
@@ -2229,16 +2268,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2250,18 +2294,27 @@ msgid ""
 msgstr ""
 "Opsjoner:\n"
 "  --admindir=<katalog>     Bruk <katalog> i stedet for %s.\n"
-"  --root=<katalog>           Installer på alternativt system med en annen filrot.\n"
-"  --instdir=<katalog>        Skift installasjonsrot uten å skifte administrasjonskatalog.\n"
-"  -O|--selected-only         Hopp over pakker som ikke er valgt for installasjon/oppgradering.\n"
-"  -E|--skip-same-version     Hopp over pakker der den samme versjonen er installert fra før.\n"
-"  -G|--refuse-downgrade      Hopp over pakker med lavere versjonsnummer enn den installerte.\n"
-"  -B|--auto-deconfigure      Installer selv om det kommer til å ødelegge andre pakker.\n"
+"  --root=<katalog>           Installer på alternativt system med en annen "
+"filrot.\n"
+"  --instdir=<katalog>        Skift installasjonsrot uten å skifte "
+"administrasjonskatalog.\n"
+"  -O|--selected-only         Hopp over pakker som ikke er valgt for "
+"installasjon/oppgradering.\n"
+"  -E|--skip-same-version     Hopp over pakker der den samme versjonen er "
+"installert fra før.\n"
+"  -G|--refuse-downgrade      Hopp over pakker med lavere versjonsnummer enn "
+"den installerte.\n"
+"  -B|--auto-deconfigure      Installer selv om det kommer til å ødelegge "
+"andre pakker.\n"
 "  --no-debsig                Ikke prøv å bekrefte pakkesignaturer.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                                   Vis bare det som kommer til å skje - uten å gjøre det.\n"
+"                                   Vis bare det som kommer til å skje - uten "
+"å gjøre det.\n"
 "  -D|--debug=<oktal>         Slå på avlusing - se -Dhelp eller --debug=help\n"
-"  --status-fd <n>            Send statusendringsoppdateringer til fildeskriptor <n>.\n"
-"  --log=<filnavn>            Logg statusendringer og handlinger til <filnavn>.\n"
+"  --status-fd <n>            Send statusendringsoppdateringer til "
+"fildeskriptor <n>.\n"
+"  --log=<filnavn>            Logg statusendringer og handlinger til "
+"<filnavn>.\n"
 "  --ignore-depends=<pakke>,...   Ignorer pakkekrav med pakken <pakke>.\n"
 "  --force-...                    Tving gjennom operasjon (se --force-help).\n"
 "  --no-force-...|--refuse-...    Stopp når problem oppstår.\n"
@@ -2272,21 +2325,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "Sammenlikningsoperatorer til --compare-versions er:\n"
-"  lt le eq ne ge gt       (se på «ingen versjon» som eldre enn andre versjoner);\n"
-"  lt-nl le-nl ge-nl gt-nl (se på «ingen versjon» som nyere enn andre versjoner);\n"
-"  < << <= = >= >> >       (bare for kompatibilitet med syntaksen i kontrollfila).\n"
+"  lt le eq ne ge gt       (se på «ingen versjon» som eldre enn andre "
+"versjoner);\n"
+"  lt-nl le-nl ge-nl gt-nl (se på «ingen versjon» som nyere enn andre "
+"versjoner);\n"
+"  < << <= = >= >> >       (bare for kompatibilitet med syntaksen i "
+"kontrollfila).\n"
 "\n"
 
 #: 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 ""
@@ -2295,23 +2354,26 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
-"Skriv «dpkg --help» for hjelp om installasjon og avinstallasjon av pakker [*];\n"
+"Skriv «dpkg --help» for hjelp om installasjon og avinstallasjon av pakker "
+"[*];\n"
 "Bruk «dselect» eller «aptitude» for brukervennlig pakkehåndtering;\n"
 "Skriv «dpkg -Dhelp» for en liste over avlusingsfunksjonene til dpkg;\n"
-"Skriv «dpkg --force-help» for info om hvordan operasjoner kan tvinges gjennom;\n"
+"Skriv «dpkg --force-help» for info om hvordan operasjoner kan tvinges "
+"gjennom;\n"
 "Skriv «dpkg-deb --help» for hjelp om endring av *.deb-filer;\n"
-"Skriv «dpkg --licence» for opphavsretter og fraskriving av garanti (GNU GPL) [*].\n"
+"Skriv «dpkg --licence» for opphavsretter og fraskriving av garanti (GNU GPL) "
+"[*].\n"
 "\n"
-"Valg markert med [*] gir mye tekst - bruk «less» eller «more» for å lese informasjonen!"
+"Valg markert med [*] gir mye tekst - bruk «less» eller «more» for å lese "
+"informasjonen!"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "handlinger i konflikt -%c (--%s) og -%c (--%s)"
@@ -2347,12 +2409,14 @@ msgstr ""
 "     1  general           Generell framgangsinformasjon\n"
 "     2  scripts           Utføring og status for vedlikeholdsskript\n"
 "    10  eachfile          Vis melding for hver fil som blir behandlet\n"
-"   100  eachfiledetail    Vis mye informasjon for hver fil som blir behandlet\n"
+"   100  eachfiledetail    Vis mye informasjon for hver fil som blir "
+"behandlet\n"
 "    20  conff             Vis melding for hver oppsettsfil\n"
 "   200  conffiledetail    Vis mye informasjon for hver oppsettsfil\n"
 "    40  depcon            Vis pakkekrav og konflikter\n"
 "   400  depcondetail      Vis mye informasjon om pakkekrav og konflikter\n"
-"  1000  veryverbose       Veldig mye informasjon om f.eks. katalogen dpkg/info\n"
+"  1000  veryverbose       Veldig mye informasjon om f.eks. katalogen dpkg/"
+"info\n"
 "  2000  stupidlyverbose   Ufattelig mye informasjon\n"
 "\n"
 "Avlusingsopsjonene kan kombineres med logisk eller.\n"
@@ -2370,10 +2434,10 @@ msgstr "tomt pakkenavn i den kommadelte lista til --ignore-depends «%.250s»"
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
-msgstr "--ignore-depends krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %s"
+msgstr ""
+"--ignore-depends krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heltall for --%s: «%.250s»"
@@ -2389,23 +2453,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2420,10 +2489,12 @@ msgstr ""
 "  downgrade [*]          Bytt ut en pakke med en tidligere versjon\n"
 "  configure-any          Sett opp alle pakker som kan hjelpe denne\n"
 "  hold                   HÃ¥ndter pakker selv om de er holdt tilbake\n"
-"  bad-path               Stien (PATH) mangler viktige programmer, forvent problemer\n"
+"  bad-path               Stien (PATH) mangler viktige programmer, forvent "
+"problemer\n"
 "  not-root               Pråv å (av)installere ting uten å være root\n"
 "  overwrite              Skriv over en fil fra en pakke med en annen\n"
-"  overwrite-diverted     Skriv over en omdirigert fil med en som ikke er omdirigert\n"
+"  overwrite-diverted     Skriv over en omdirigert fil med en som ikke er "
+"omdirigert\n"
 "  bad-verify             Installer pakke, selv om den ikke kan godkjennes\n"
 "  depends-version [!]    Gjør alle versjonskrav til advarsler\n"
 "  depends [!]            Gjør alle pakkekrav til advarsler\n"
@@ -2436,7 +2507,8 @@ msgstr ""
 "  confmiss [!]           Installer alltid oppsettsfiler som mangler\n"
 "  conflicts [!]          Tillat installasjon av pakker som er i konflikt\n"
 "  architecture [!]       Håndter også pakker med feil arkitektur\n"
-"  overwrite-dir [!]      Skriv over kataloger fra en pakke med filer fra en annen\n"
+"  overwrite-dir [!]      Skriv over kataloger fra en pakke med filer fra en "
+"annen\n"
 "  remove-reinstreq [!]   Fjern pakker som krever re-installasjon\n"
 "  remove-essential [!]   Fjern en nødvendig pakke\n"
 "\n"
@@ -2453,14 +2525,11 @@ msgstr "ukjent tvangs-/avvisningsopsjon «%.*s»"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Advarsel: Foreldet tvang/nekt alternativ  «%s»\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikke utføre «malloc» i execbackend"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "klarte ikke utføre «strdup» i execbackend"
 
@@ -2491,10 +2560,7 @@ msgstr "klarte ikke åpne «%i» for strøm"
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av linje %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "trenger et handlingsvalg"
@@ -2504,15 +2570,17 @@ msgstr "trenger et handlingsvalg"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tar ingen argumenter som ikke er opsjoner"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s trenger minst ett pakkenavn som parameter"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
-msgstr "du må gi selve navnet på pakkene, ikke navnene på filene som pakkene ligger i"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du må gi selve navnet på pakkene, ikke navnene på filene som pakkene ligger i"
 
 #: src/packages.c:150
 #, c-format
@@ -2568,6 +2636,10 @@ msgstr "Pakken %s som gir %s er ikke installert.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "Pakken %s er ikke installert.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " krever "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ". Men:\n"
@@ -2583,7 +2655,9 @@ msgstr "klarte ikke sikre at «%.250s» ikke finnes"
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "klarte ikke kjøre «dpkg-split» for å se om pakken er en del av en flerdelt pakke"
+msgstr ""
+"klarte ikke kjøre «dpkg-split» for å se om pakken er en del av en flerdelt "
+"pakke"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2736,7 +2810,8 @@ msgstr "dpkg-deb: Fjern eventuelle avsluttande nuller"
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: Advarsel - fant ikke den gamle fila «%.250s» så den slettes ikke: %s"
+msgstr ""
+"dpkg: Advarsel - fant ikke den gamle fila «%.250s» så den slettes ikke: %s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2745,8 +2820,12 @@ msgstr "dpkg: Advarsel - klarte ikke slette den gamle katalogen «%.250s»: %s\n
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg:Advarsel - den gamle oppsettsfila «%.250s» var en tom katalog (og er nå slettet)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg:Advarsel - den gamle oppsettsfila «%.250s» var en tom katalog (og er nå "
+"slettet)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2754,25 +2833,29 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "fant ikke annen ny fil «%.250s»"
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
-msgstr "dpkg: Advarsel - den gamle oppsettsfila «%.250s» er den samme som flere nye filer! (Både «%.250s» og «%.250s».)"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: Advarsel - den gamle oppsettsfila «%.250s» er den samme som flere nye "
+"filer! (Både «%.250s» og «%.250s».)"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: Advarsel - klarte ikke slette den gamle fila «%.250s»: %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "klarte ikke lese infokatalogen"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "den gamle versjonen av pakken har et altfor langt filnavn som startar på «%.250s»"
+msgstr ""
+"den gamle versjonen av pakken har et altfor langt filnavn som startar på "
+"«%.250s»"
 
 #: src/processarc.c:766
 #, c-format
@@ -2791,7 +2874,8 @@ msgstr "klarte ikke åpne den midlertidige kontrollkatalogen"
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "pakken inneholder et altfor langt informasjonsfilnavn (starter med «%.50s»)"
+msgstr ""
+"pakken inneholder et altfor langt informasjonsfilnavn (starter med «%.50s»)"
 
 #: src/processarc.c:790
 #, c-format
@@ -2827,11 +2911,13 @@ msgstr "klarte ikke slette den forsvinnende kontrollinformasjonsfila «%.250s»"
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "Ønsket=Ukjent/Installer/Fjern/Rens ut/Hold tilbake\n"
 "| Status=Ikke/Installert/Oppsettsfiler/Utpakket/Oppsettsfeil/Halvinstallert\n"
-"|/ Feil?=(ingen)/Holdt tilbake/Må inst. på nytt/X=begge-deler (Status,Feil: versalar=dumt)\n"
+"|/ Feil?=(ingen)/Holdt tilbake/Må inst. på nytt/X=begge-deler (Status,Feil: "
+"versalar=dumt)\n"
 
 #: src/query.c:164
 msgid "Name"
@@ -2845,9 +2931,7 @@ msgstr "Versjon"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Fant ingen pakker som passer til «%s».\n"
@@ -2882,7 +2966,8 @@ msgstr "dpkg: fant ikke %s.\n"
 #: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
-msgstr "Pakken «%s» er ikke installert og det finnes ingen informasjon om den.\n"
+msgstr ""
+"Pakken «%s» er ikke installert og det finnes ingen informasjon om den.\n"
 
 #: src/query.c:350
 #, c-format
@@ -2960,23 +3045,23 @@ msgstr ""
 "  --admindir=<katalog>       Bruk <katalog> i steden for %s\n"
 "  -f|--showformat=<format>      Bruk alternativt format for --show\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Formatsyntaks:\n"
 "  Et format er den strengen som blir brukt for å vise en pakke. Formatet\n"
-"  kan inneholde de vanlige escape-sekvensene \\n"
-" (linjeskift), \\r (vognretur)\n"
+"  kan inneholde de vanlige escape-sekvensene \\n (linjeskift), \\r "
+"(vognretur)\n"
 "  eller \\\\ (ren omvendt skråstrek). Pakkeopplysninger kan tas med ved\n"
 "  å sette inn variabelreferanser til pakkefelt med syntaksen\n"
 "  ${var[;bredde]}. Feltene vil være høyrejusterte, med mindre bredden er \n"
@@ -2994,8 +3079,11 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - advarsel: Ignorerer ønsket om å fjerne %.250s som ikke er installert.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - advarsel: Ignorerer ønsket om å fjerne %.250s som ikke er "
+"installert.\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3050,14 +3138,16 @@ msgstr "Ville fjerne eller rense ut %s ...\n"
 msgid "Removing %s ...\n"
 msgstr "Fjerner %s ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - advarsel: Ved fjerning av %.250s kunne ikke katalogen «%.250s» fjernes: %s - katalogen kan være et monteringspunkt.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - advarsel: Ved fjerning av %.250s kunne ikke katalogen «%.250s» "
+"fjernes: %s - katalogen kan være et monteringspunkt.\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "klarte ikke fjerne «%.250s»"
@@ -3074,8 +3164,12 @@ msgstr "klarte ikke slette kontrollinformasjonsfila «%.250s»"
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - advarsel: Ved fjerning av %.250s var katalogen «%.250s» ikke tom. den ble derfor ikke fjernet.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - advarsel: Ved fjerning av %.250s var katalogen «%.250s» ikke tom. den "
+"ble derfor ikke fjernet.\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3095,7 +3189,9 @@ msgstr "klarte ikke lese oppsettsfilkatalogen «%.250s» (fra «%.250s»)"
 #: src/remove.c:504
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
-msgstr "klarte ikke fjerne den gamle sikringskopien av oppsettsfila «%.250s» (fra «%.250s»)"
+msgstr ""
+"klarte ikke fjerne den gamle sikringskopien av oppsettsfila «%.250s» (fra "
+"«%.250s»)"
 
 #: src/remove.c:540
 #, c-format
@@ -3169,11 +3265,14 @@ msgstr "--%s trenger akkurat én «Packages»-fil som parameter"
 
 #: src/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
-msgstr "klarte ikke få tilgang til dpkg-statusområdet for rå tilgjengelighetsoppdatering"
+msgstr ""
+"klarte ikke få tilgang til dpkg-statusområdet for rå "
+"tilgjengelighetsoppdatering"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "rå tilgjengelighetsoppdatering krever skrivetilgang til dpkg-statusområdet"
+msgstr ""
+"rå tilgjengelighetsoppdatering krever skrivetilgang til dpkg-statusområdet"
 
 #: src/update.c:66
 #, c-format
@@ -3199,24 +3298,29 @@ msgstr "--forget-old-unavail tar ingen argumenter"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - feil: %s («%s») inneholder ingen sifre\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build krever en katalogparameter"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build tar høyst to parametre"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "klarte ikke sjekke om arkivet «%.250s» fins"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "målet er en katalog - kan ikke hoppe over kontrollfilsjekk"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3225,178 +3329,181 @@ msgstr ""
 "dpkg-deb: Advarsel, sjekker ikke innholdet i kontrollområdet.\n"
 "dpkg-deb: Bygger en ukjent pakke i «%s».\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "pakkenavnet har tegn som verken er små bokstaver, tall eller «-+.»"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "advarsel, «%s» inneholder brukerdefinert prioritetsverdi «%s»\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "advarsel, «%s» inneholder brukerdefinert felt «%s»\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d feil i kontrollfila"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Bygger pakken «%s» i «%s».\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "kontrollkatalogen har feil rettighet %03lo (må være >=0755 og <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
-msgstr "vedlikeholderskriptet «%.50s» er verken en ren fil eller en symbolsk lenke"
+msgstr ""
+"vedlikeholderskriptet «%.50s» er verken en ren fil eller en symbolsk lenke"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "vedlikeholderskriptet «%.50s» har feil rettighet %03lo (må være >=0555 og <=0775)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"vedlikeholderskriptet «%.50s» har feil rettighet %03lo (må være >=0555 og "
+"<=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "finner ikke vedlikeholderskriptet «%.50s»"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "tom streng fra «fgets» ved lesing av oppsettsfiler"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "advarsel, navnet på oppsettsfila «%.50s...» er for langt eller mangler linjeskift til slutt\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"advarsel, navnet på oppsettsfila «%.50s...» er for langt eller mangler "
+"linjeskift til slutt\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "advarsel, navnet på oppsettsfila «%s» inneholder avsluttende blanktegn\n"
+msgstr ""
+"advarsel, navnet på oppsettsfila «%s» inneholder avsluttende blanktegn\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "oppsettsfila «%.250s» finnes ikke i pakken"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "finner ikke oppsettsfila «%.250s»"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "advarsel, oppsettsfila «%s» er ikke en vanlig fil\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "feil ved lesing av «conffiles»-fila"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "feil ved åpning av «conffiles»-fila"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: Ignorerer %d advarsler om kontrollfilene\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "klarte ikke lukke mellomlager for «%.255s»"
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "klarte ikke skifte katalog til «%.255s»"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "klarte ikke skifte katalog til .../DEBIAN"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "klarte ikke kjøre «tar -cf»"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "klarte ikke opprette midlertidig fil (kontroll)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "klarte ikke åpne midlertidig fil (kontroll), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "klarte ikke fjerne lenke til midlertidig fil (kontroll), %s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "kontroll"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "klarte ikke kjøre «fstat» på midlertidig fil (kontroll)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "klarte ikke hoppe tilbake i midlertidig fil (kontroll)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "klarte ikke opprette midlertidig fil (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "klarte ikke åpne midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "klarte ikke fjerne lenke til midlertidig fil (data), %s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "klarte ikke kjøre «find»"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "klarte ikke skrive filnavn til tar-rør (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Intern feil, compress_type «%i» ukjent!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "klarte ikke hoppe tilbake i midlertidig fil (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3414,14 +3521,12 @@ msgstr "feil ved lesing av %s fra fil %.255s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "uventet slutt på fil i %s i %.255s"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "fila «%.250s» er ødelagt - lengden på %.250s inneholder nullar"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "fila «%.250s» er ødelagt - ugyldig siffer (kode %d) i %s"
@@ -3443,11 +3548,11 @@ msgstr "versjonsnummer"
 msgid "between members"
 msgstr "mellom medlemmer"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "fila «%.250s» er ødelagt - ugyldig magisk nummer sist i det første hodet"
+msgstr ""
+"fila «%.250s» er ødelagt - ugyldig magisk nummer sist i det første hodet"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3476,23 +3581,23 @@ msgstr "arkivet mangler punktum i versjonsnummeret"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "skjønner ikke arkivversjonen %.250s. Du trenger en nyere dpkg-deb"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "hoppet over medlemsdata fra %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
-msgstr "fila «%.250s» inneholder et datamedlem %.*s som jeg ikke skjønner. Gir opp"
+msgstr ""
+"fila «%.250s» inneholder et datamedlem %.*s som jeg ikke skjønner. Gir opp"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "fila «%.250s» inneholder to kontrollmedlemmer. Gir opp"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3501,16 +3606,16 @@ msgstr ""
 " ny Debian-pakke, versjon %s.\n"
 " størrelse %ld byte: kontrollarkiv = %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "kontrollinformasjonslengde"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arkivet har en misformatert kontrollengde «%s»"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3519,15 +3624,15 @@ msgstr ""
 " gammel Debian-pakke, versjon %s.\n"
 " størrelse %ld byte: kontrollarkiv = %zi, hovedarkiv = %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "klarte ikke tilordne minne for variabel «ctrlarea»"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "kontrollområde"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3536,67 +3641,65 @@ msgstr ""
 "dpkg-deb: Det ser ut til at fila er et arkiv som har blitt\n"
 "dpkg-deb:    ødelagt fordi det er lastet ned i ASCII-modus.\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» er ikke et arkiv i Debian-format"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "klarte ikke finne den nåværende filposisjonen"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "klarte ikke sette den nåværende filposisjonen"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "klarte ikke åpne rørdeskriptor «1» i innsetting"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "klarte ikke skrive til «gzip -dc»"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "klarte ikke lukke «gzip -dc»"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "klarte ikke utføre systemkallet «lseek» på arkivfildelen"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "klarte ikke skrive til røret i «copy»"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "klarte ikke lukke røret i «copy»"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "klarte ikke opprette katalog"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "klarte ikke skifte til katalogen etter å ha opprettet den"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "klarte ikke skifte til katalog"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "klarte ikke kjøre «tar»"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s krever et .deb-filnavn som parameter"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3605,12 +3708,12 @@ msgstr ""
 "--%s krever en målkatalog.\n"
 "Kanskje du mente å bruke «dpkg --install»?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s tar høyst to parametre (.deb og katalog)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tar bare én parameter (.deb-filnavn)"
@@ -3764,7 +3867,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3773,8 +3876,10 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opsjoner:\n"
@@ -3783,7 +3888,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, ingen\n"
 "\n"
 
@@ -3808,7 +3914,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installere og avinstallere pakker."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjent koprimeringstype «%s»!"
@@ -3840,7 +3946,8 @@ msgstr "fila «%.250s» er ødelagt - nuller 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 trenger en nyere dpkg-split"
+msgstr ""
+"fila «%.250s» har formatversjon «%.250s» - du trenger en nyere dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3860,7 +3967,9 @@ msgstr "fila «%.250s» er ødelagt - ugyldig delnummer"
 #: dpkg-split/info.c:145
 #, 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"
+msgstr ""
+"fila «%.250s» er ødelagt - ugyldig magisk nummer til slutt i det andre "
+"hovudet"
 
 #: dpkg-split/info.c:147
 #, c-format
@@ -3870,7 +3979,8 @@ msgstr "fila «%.250s» er ødelagt - det andre medlemmet er ikke et datamedlem"
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "fila «%.250s» er ødelagt - feil antall deler i forhold til opplysningane"
+msgstr ""
+"fila «%.250s» er ødelagt - feil antall deler i forhold til opplysningane"
 
 #: dpkg-split/info.c:157
 #, c-format
@@ -3887,8 +3997,7 @@ msgstr "klarte ikke kjøre «fstat» på delfila «%.250s»"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "fila «%.250s» er ødelagt - for kort"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "klarte ikke åpne arkivdelfila «%.250s»"
@@ -4007,7 +4116,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4090,7 +4200,8 @@ 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
@@ -4114,8 +4225,7 @@ msgstr "--listq tar ingen parametre"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Søplefiler som ligger igjen i depotkatalogen:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "fant ikke «%.250s»"
@@ -4180,11 +4290,9 @@ msgstr "kildefila «%.250s» er ikke en vanlig fil"
 msgid "unable to exec mksplit"
 msgstr "klarte ikke kjøre «mksplit»"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versjon %s.\n"
@@ -4197,11 +4305,9 @@ msgstr ""
 "\n"
 "Opphavsrett (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4226,30 +4332,27 @@ msgstr ""
 "\n"
 "Alternativer:\n"
 "  --unsafe     setter noen ekstra muligens nyttige alternativer.\n"
-"               advarsel: dette alternativet kan ødelegge en ellers korrekt fil.\n"
+"               advarsel: dette alternativet kan ødelegge en ellers korrekt "
+"fil.\n"
 "  --help       viser denne hjelpmeldingen.\n"
 "  --version    viser versjonsnummeret.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: Advarsel - klarte ikke fjerne lås for %s: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: ukjent opsjon «%s»"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: for mange argumenter"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: klarte ikke låse katalog for redigering! %s"
@@ -4259,48 +4362,40 @@ msgstr "%s: klarte ikke låse katalog for redigering! %s"
 msgid "try deleting %s"
 msgstr "prøver å slette %s"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "klarte ikke åpne %s: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "klarte ikke opprette %s: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "klarte ikke skrive %s: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "klarte ikke lese %s: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "klarte ikke lukke %s etter lesing: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikke lukke %s: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "klarte ikke sikkerhetskopiere gammel %s, gir opp: %s"
@@ -4315,13 +4410,12 @@ msgstr "klarte ikke installere %s; den blir værende som %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: Klarte ikke fjern lås på %s: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Klarer ikke få ENOENT-verdi fra %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4331,7 +4425,7 @@ msgstr ""
 "Opphavsrett (C) 1995 Ian Jackson.\n"
 "Opphavsrett (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4343,7 +4437,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4356,7 +4451,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "Bruk: %s [<opsjon> ...] <kommand>\n"
 "\n"
@@ -4371,7 +4467,8 @@ msgstr ""
 "                             blir omdirigert.\n"
 "  --local                  alle pakkenes versjoner er omdirigert.\n"
 "  --divert <omdiriger-til>     navnet brukt av andre pakkers versjoner.\n"
-"  --rename                 faktisk flytte filen ut av veien (eller tilbake).\n"
+"  --rename                 faktisk flytte filen ut av veien (eller "
+"tilbake).\n"
 "  --admindir <katalog>   sett katalogen med omdirigeringsfilene.\n"
 "  --test                   ikke gjør noe, bare demonstrer.\n"
 "  --quiet                  stille operasjon, mimimalt med utskrift.\n"
@@ -4382,97 +4479,89 @@ msgstr ""
 "Når man fjerner må --package eller --local og --divert stemme hvis oppgitt.\n"
 "Pakke preinst/postrm skript skal alltid oppgi --package og --divert.\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "to modi oppgitt: %s og --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s krever et omdirigeringsargument"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "omdirigering kan ikke inneholde linjeskift"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s krever et <pakke> argument"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pakke kan ikke  inneholde linjeskift"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s krever et <katalog> argument"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent opsjon «%s»"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "klarte ikke åpne omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "mangler alternativt navn"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "mangler pakke"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s krever et enkelt argument"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filenavn «%s» er ikke absolutt"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "fil kan ikke inneholde linjeskift"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Kan ikke omdirigere kataloger"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Forlater «%s»"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "«%s» er i konflikt med «%s»"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Legger til «%s»"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4483,7 +4572,7 @@ msgstr ""
 "  under sletting av «%s»\n"
 "  ble «%s» funnet"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4494,37 +4583,37 @@ msgstr ""
 "  under sletting av «%s»\n"
 "  ble «%s» funnet"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Fjerner «%s»"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Ingen omdirigering «%s», ingenting fjernet"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "intern feil - feil modus «%s»"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "fant ikke gammelt navn «%s»: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "fant ikke nytt navn «%s»: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "feilkontroll «%s»: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4533,53 +4622,52 @@ msgstr ""
 "endring av navn innebærer at «%s» overskrives av\n"
 "  annen fil «%s», ikke tillatt"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "endre navn: fjerner duplikat gammel lenke «%s»: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: endre navnet på «%s» til «%s»: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "opprett omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriv omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "lukk omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "fjerner gamle omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "opprett ny omdirigeringer-gammel: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installer nye omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern feil: %s korrupt: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4587,7 +4675,7 @@ msgstr ""
 "\n"
 "Opphavsrett (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4622,107 +4710,106 @@ msgstr ""
 "  --help                   vis denne hjelpmeldingen.\n"
 "  --version                vis versjonen.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "ingen modus oppgitt"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add krever fire argumenter"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ulovlig bruker %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "ikke-eksisterende bruker %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ulovlig gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "ikke-eksisterende gruppe %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "ulovlig modus %s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "fjerner avsluttende /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "En tilsidesettelse for «%s» eksisterer allerede, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "men --force oppgitt så det vil bli ignorert."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "avbryter"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "advarsel: --update oppgitt men %s eksisterer ikke"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "klarte ikke chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "klarte ikke chmod %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Ingen tilsidesettelse tilstede."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "advarsel: --update er meningsløs for --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "klarte ikke åpne «statoverride»-fila: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Flere tilsidesettelse for «%s», avbryter"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "klarte ikke åpne ny «statoverride»-fil: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "feil ved sletting av statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "feil ved opprettelse av «statoverride»-gammel: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "feil ved installering av ny statoverride: %s"
@@ -4743,15 +4830,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4763,19 +4853,24 @@ msgstr ""
 "\n"
 "Opsjoner:\n"
 "  --section <regexp> <tittel>\n"
-"                           sett den nye oppføringen i avsnittet som stemmer med <regex>\n"
-"                           eller opprett nytt med <tittel> hvis det ikke finnes.\n"
+"                           sett den nye oppføringen i avsnittet som stemmer "
+"med <regex>\n"
+"                           eller opprett nytt med <tittel> hvis det ikke "
+"finnes.\n"
 "  --menuentry=<tekst>       sett menyoppføringen.\n"
-"  --description=<tekst>     sett beskrivelsen som skal brukes i menyoppføringen.\n"
+"  --description=<tekst>     sett beskrivelsen som skal brukes i "
+"menyoppføringen.\n"
 "  --info-file=<sti>       oppgi info-fil som skal installeres i katalogen.\n"
 "  --dir-file=<sti>        oppgi filnavnet på  infokatalog-filen.\n"
 "  --infodir=<katalog>    samme som '--dir-file=<katalog>/dir'.\n"
 "  --info-dir=<katalog>   ditto.\n"
 "  --keep-old               ikke bytt ut oppføringer eller fjern tomme.\n"
-"  --remove                 fjern oppføringen spesifisert ved <filenavn> basenavn.\n"
+"  --remove                 fjern oppføringen spesifisert ved <filenavn> "
+"basenavn.\n"
 "  --remove-exactly         fjern den eksakte <filenavn> oppføringen.\n"
 "  --test                   aktiverer testmodus (ingen handlinger utføres).\n"
-"  --debug                  aktiverer avlusingsmodus (viser mer informasjon).\n"
+"  --debug                  aktiverer avlusingsmodus (viser mer "
+"informasjon).\n"
 "  --quiet                  ikke vis meldinger på standard-ut.\n"
 "  --help                   vis denne hjelpmeldingen.\n"
 "  --version                vis versjonen.\n"
@@ -4835,8 +4930,7 @@ msgstr ""
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: ingen fil %s, henter sikkerhetskopi %s."
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: klarte ikke kopierere %s til %s, gir opp: %s"
@@ -4936,7 +5030,7 @@ msgstr "klarte ikke lese %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4946,8 +5040,8 @@ msgstr ""
 "Opphavsrett (C) 1995 Ian Jackson.\n"
 "Opphavsrett (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4956,22 +5050,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -5005,174 +5102,176 @@ 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"
 "  --altdir <katalog>     endre katalogen for alternativer.\n"
 "  --admindir <katalog>   endre den administrative katalogen.\n"
 "  --test                   aktiverer testmodus (ingen handlinger utføres).\n"
-"  --debug                  aktiverer avlusingsmodus (viser mer informasjon).\n"
+"  --debug                  aktiverer avlusingsmodus (viser mer "
+"informasjon).\n"
 "  --quiet                  ikke vis meldinger på standard-ut.\n"
 "  --help                   vis denne hjelpmeldingen.\n"
 "  --version                vis versjonen.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "ukjent argument «%s»"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install trenger <lenke> <navn> <sti> <prioritet>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioritet må være et heltall"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s krever <navn> <sti>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s krever <navn>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave trenger <lenke> <navn> <sti>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "slave-navn %s duplisert"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "slave-lenke %s duplisert"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "navn %s er både primær og slave"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "lenke %s er både primær og slave"
-
-#: scripts/update-alternatives.pl:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "trenger --display, --config, --set, --install, --remove, --all, --remove-all eller --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave bare tillatt med --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "man-flagg"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "duplikat slave %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "slave-lenke samme som hovedlenke %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "duplikat slavelenke %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "duplisert sti %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioritet %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "Alernativ for %s peker til %s - som ikke ble funnet. Fjernes fra listen over alternativ."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"Alernativ for %s peker til %s - som ikke ble funnet. Fjernes fra listen over "
+"alternativ."
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativ for %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status er %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lenke peker for øyeblikket til %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " lenke er borte for øyeblikket "
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "lenke uleselig - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Ingen versjoner tilgjengelig."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Nåværende  «beste» versjon er %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "ukjent argument «%s»"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install trenger <lenke> <navn> <sti> <prioritet>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioritet må være et heltall"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s krever <navn> <sti>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s krever <navn>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave trenger <lenke> <navn> <sti>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "slave-navn %s duplisert"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "slave-lenke %s duplisert"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "navn %s er både primær og slave"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "lenke %s er både primær og slave"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"trenger --display, --config, --set, --install, --remove, --all, --remove-all "
+"eller --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave bare tillatt med --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Setter opp automatisk valg av %s."
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "klarte ikke fjerne %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5181,7 +5280,7 @@ msgstr ""
 "%s har blitt endret (manuelt eller av et skript).\n"
 "Bytter over til kun manuelle oppdateringer."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5190,69 +5289,69 @@ msgstr ""
 "Sjekker tilgjengelige versjoner av %s, oppdaterer lenker i %s ...\n"
 "(Du kan endre de symbolske lenkene der selv hvis du ønsker - se «man ln».)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Endrer navn på %s lenke fra %s til %s."
 
-#: scripts/update-alternatives.pl:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "klarte ikke endre navn på %s til %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slave-lenkenavn %s er duplisert"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgte alternativ - bytter til automatisk modus"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kasserer foreldet slavelenke %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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»."
+msgstr ""
+"For å gå tilbake til automatiske oppdateringer bruk «update-alternatives --"
+"auto %s»."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Gjenoppretter fra tidligere feilet oppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikke åpne %s for skriving: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5261,48 +5360,38 @@ msgstr ""
 "advarsel: %s skal være en symbolsk lenke til %s\n"
 "(eller ikke-eksisterende); likevel feilet lesing av lenke: %s"
 
-#: scripts/update-alternatives.pl:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "klarte ikke forsikre at %s ikke eksisterer: %s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "klarte ikke installere %s som %s: %s"
 
-#: scripts/update-alternatives.pl:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Forlater %s (%s) pekende til %s."
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Oppdaterer %s (%s) til å peke til %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5311,14 +5400,13 @@ msgstr ""
 "advarsel: %s skal være en slave symbolsk lenke til\n"
 "%s eller ikke-eksisterende; likevel feilet lesing av lenke: %s"
 
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Fjerner %s (%s), siden det ikke passer med %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5327,7 +5415,7 @@ msgstr ""
 "Det er bare et program som tilbyr %s\n"
 "(%s). Det er ingenting å konfigurere.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5340,49 +5428,57 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Bruker «%s» for å tilby «%s»'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Klarte ikke finne alternativ «%s»."
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving til standard ut: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift forbudt i update-alternatives filer (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "mangler linjeskift etter %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorlig problem: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: klarte ikke kjøre «gzip -dc»"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: klarte ikke kjøre «bzip2 -dc»"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: Klarte ikke kjøre bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "klarte ikke opprette %.250s"
+
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
 #~ msgstr "«%s»-felt, referanse til «%.255s»: versjon inneholder « »"
 
@@ -5439,6 +5535,7 @@ msgstr "Alvorlig problem: %s"
 #, fuzzy
 #~ msgid "unable to install %s as %s"
 #~ msgstr "klarte ikke installere «%.250s» som «%.250s»"
+
 #~ msgid "version a has bad syntax: %s\n"
 #~ msgstr "versjon a har ugyldig syntaks: %s\n"
 
@@ -5611,22 +5708,31 @@ msgstr "Alvorlig problem: %s"
 #~ "\n"
 #~ "Bruk «dselect» eller «aptitude»for en litt mer brukervennlig "
 #~ "pakkehåndtering.\n"
+
 #~ msgid "  Package "
 #~ msgstr "  Pakken "
+
 #~ msgid " which provides "
 #~ msgstr " som tilbyr "
+
 #~ msgid " is to be removed.\n"
 #~ msgstr " skal fjernes.\n"
+
 #~ msgid "  Version of "
 #~ msgstr "  Versjonen av "
+
 #~ msgid " on system is "
 #~ msgstr " på systemet er "
+
 #~ msgid " is not installed.\n"
 #~ msgstr " er ikke installert.\n"
+
 #~ msgid " to: %s\n"
 #~ msgstr " til: %s\n"
+
 #~ msgid "fgetpos failed"
 #~ msgstr "«fgetpos» mislyktes"
+
 #~ msgid "fsetpos failed"
 #~ msgstr "«fsetpos» mislyktes"
 
@@ -5753,4 +5859,3 @@ msgstr "Alvorlig problem: %s"
 #~ "      --msdos                   (lag 8.3-filnavn)\n"
 #~ "\n"
 #~ "Avslutningstatus: 0 = OK;  1 = -a er ikke en del;  2 = problem!\n"
-
diff --git a/po/ne.po b/po/ne.po
index dcdf000c..629ba947 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-08 16:32+0545\n"
 "Last-Translator: Shiva Prasad Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -60,72 +60,57 @@ msgstr "प्रणाली त्रुटि नम्बर.%d"
 msgid "Signal no.%d"
 msgstr "संकेत नम्बर.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: gzip कार्यन्वयन गर्न असफल %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: आन्तरिक gzip त्रुटि: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: gzip -dc कार्यान्वयन गर्न असफल"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: bzip2 -dc कार्यान्वयन गर्न असफल"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: असङ्कुचन"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: आन्तरिक gzip त्रुटि: पढ्नुहोस्: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: आन्तरिक gzip त्रुटि: लेख्नुहोस्: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: आन्तरिक gzip त्रुटि: पढ्नुहोस्(%i) != लेख्नुहोस्(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: gzip कार्यन्वयन गर्न असफल %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: पढ्नुहोस्: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: लेख्नुहोस्: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: आन्तरिक bzip2 त्रुटि: पढ्नुहोस्(%i) != लेख्नुहोस्(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: bzip2 कार्यन्वयन गर्न असफल %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: सङ्कुचन"
@@ -155,7 +140,8 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr "अद्यावधिक डाइरेक्टरीले भिन्न लम्बाई नामहरू (%d र %d दुबै) फाइलहरू समावेश गर्दछ ।"
 
 #: lib/dbmodify.c:77
@@ -168,7 +154,7 @@ msgstr "अद्यावधिक डाइरेक्टरी `%.255s' स
 msgid "failed to remove incorporated update file %.255s"
 msgstr "समाहित अद्यावधिक फाइल %.255s हटाउन असफल भयो ।"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "`%.255s' सिर्जना गर्न अक्षम"
@@ -418,7 +404,8 @@ msgstr "मूल वा शुन्य डाइरेक्टरी कन
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr "`%s' फाँट, हराएको प्याकेज नाम, वा फोहर जहाँ प्याकेज नाम आशा गरियो"
 
 #: lib/fields.c:340
@@ -887,30 +874,30 @@ msgstr "ढाँचामा बन्द गर्ने जुँगे क
 msgid "failed to realloc for variable buffer"
 msgstr "चल बफरका लागि पून बाँडफाड गर्न असफल"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "सङ्ग्रह प्रक्रिया ...  पहिल्यै हराइ सकेको छ !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "dpkg-deb पाइपबाट पढ्दा त्रुटि"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "`%.255s' को टाइमस्टाम्पहरू सेटिङ् गर्दा त्रुटि"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "`%.255s' को स्यामित्व सेट गर्दा त्रुटि"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "`%.255s'को सेटिङ् अनुमति त्रुटि"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -919,128 +906,129 @@ msgstr ""
 "`%.250s' अधिलेखन गर्न प्रयास गर्दै, जुन `%.250s'%.10s%.100s%.10s को फेरिएको संस्करण "
 "हो ।"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (प्याकेज: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "`%.255s' (जुन मैले स्थापना गर्न लागेको थिए) लाई तोक्न अक्षम"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr "अन्य संस्करण स्थापना गर्नुभन्दा पहिले `%.255s' वरिपरिको वातावरणहरू हटाउन अक्षम"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "अन्य संस्करण स्थापना गर्नु पहिले पूर्वावस्थामा ल्याएको `%.255s' तोक्न अक्षम"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "सङ्ग्रहले अज्ञात प्रकारको वस्तु `%.255s' समावेश गर्यो 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "पुरानो संस्करणमा फाइलहरू बदल्दै %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "स्थापना गरिएको प्याकेजमा फाइलहरू द्रारा प्रतिस्थापित गरियो %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "डाइरेक्टरी बिनाको प्याकेज`%.250s'मा डाइरेक्टरी %.250s अधावधिक गर्न प्रयास गर्दै"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "`%.250s'अधावधिक गर्न प्रयास गर्दै, जुन प्याकेज %.250s मा पनि छ"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "गोबल फाइल `%.255s' प्रतिस्थापन गर्यो"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb `%.255s' बेलामा ब्याकइन्ड"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "बन्द गर्दा/लेख्दा `%.255s' त्रुटि"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "पाइप `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "यन्त्र `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "हार्ड लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "प्रतिकात्मक लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "सिमलिङ्क `%.255s'को स्वामित्व सेट गर्दा त्रुटि"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "डाइरेक्टरी `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "नयाँ संस्करण स्थापना गर्न `%.255s' लाई छेउमा सार्न अक्षम"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "लिङ्क`%.255s' पढ्न अक्षम"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "सिमलिङ्क `%.255s' का लागि जगेडा बनाउन अक्षम"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "सिमलिङ्क `%.255s' का लागि जगेडा स्वामित्व परिवर्तन गर्न अक्षम"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "नयाँ संस्करण स्थापना गर्न पहिले जगेडा लिङ्क`%.255s' बनाउन अक्षम"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "`%.255s' को नयाँ संस्करण स्थापना गर्न अक्षम"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1049,7 +1037,7 @@ msgstr ""
 "dpkg: चेतावनी - %s को हटाउने सँग निर्भरता समस्या अवज्ञा गर्दै:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1058,7 +1046,7 @@ msgstr ""
 "dpkg: चेतावनी - अत्यावश्यक\n"
 " प्याकेज %s को डिकन्फिगरेसन ध्यान दिदै , %sको हटाउने सक्षम पार्न ।\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1067,7 +1055,7 @@ msgstr ""
 "dpkg: होइन, %s आवश्यक छैन, डिकन्फिगर गरिएको छैन\n"
 "यो हटाउने %s को सक्षम गर्न  क्रममा छ ।\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1076,22 +1064,22 @@ msgstr ""
 "dpkg: होइन, %s हटाउन सक्दैन (--स्वत डिकन्फिगरले मद्दत गर्नेछ):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: %sको पक्षमा %s हटाउन विचार गर्दै ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s राम्रो सँग स्थापना गरिएको छैन - यसमा कुनै निर्भरताहरू अवज्ञा गर्दै ।\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: %s हटाउदा झन्झट हुन सक्छ, यसले यस रुपमा प्रदान गर्दछ %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1100,17 +1088,22 @@ msgstr ""
 "dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, तर जे भए पनि तपाईँको अनुरोध अनुसार हटाउनुछ "
 "।\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: प्याकेज %s लाई पून स्थापना आवश्यक छ, हट्ने छैन\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: हो, %s को पक्षमा %s हट्नेछ ।\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1119,72 +1112,72 @@ msgstr ""
 "dpkg: %s समावेश गर्दै %s ध्यान दिदै:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "परस्पर-विरोधी प्याकेजहरू %.250s स्थापना नगर्दै"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: चेतावनी - अवज्ञा विच परस्पर-विरोध, जे भए पनि बढ्न सक्नुहुन्छ !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --कम्तिमा एक मार्ग तर्क पुनरावृती आवश्यक छ"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "पुनरावृतिको लागि कार्यन्वयन गर्न असफल"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप fdopen गर्न असफल"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप पढ्दा त्रुटि"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "'फेला पार्नुहोस' को पाइप बन्द गर्दा त्रुटि"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "पुनरावृतिका लागि 'फेला पार्नुहोस' ले ह्यान्डल नगरिएको त्रुटि %i फिर्ता गर्यो"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "खोजिएको, तर फेला नपारिएको प्याकेजहरू ( *.deb सँग मिल्ने फाइलहरू)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s लाई कम्तिमा एउटा प्याकेज सङ्ग्रह फाइल तर्क आवश्यक छ"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "पहिल्यै चयन हटाएको प्याकेज %s चयन गर्दै \n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "चयन हटाएको प्याकेज %s फड्काउदै\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "संस्करण %.250s of %.250s पहिल्यै स्थापित छ, फड्काउदै\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - चेतावनी: %.250s बाट %.250s सम्म %.250s स्तरन्युन गर्दैछ ।\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "%.250s बाट संस्करण %.250s सम्म %.250s स्तरन्युन हुने छैन, फड्काउदै ।\n"
@@ -1194,7 +1187,8 @@ msgstr "%.250s बाट संस्करण %.250s सम्म %.250s स्
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
-msgstr "जगेडा प्रतिलिपिको पूनस्थापनालाई अनुमति दिन %.250s'को भर्खरै स्थापित संस्करण हटाउन अक्षम"
+msgstr ""
+"जगेडा प्रतिलिपिको पूनस्थापनालाई अनुमति दिन %.250s'को भर्खरै स्थापित संस्करण हटाउन अक्षम"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1367,7 +1361,8 @@ msgstr ""
 msgid ""
 "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
 "s')\n"
-msgstr "dpkg: %s: चेतावनी - कन्फफाइल `%.250s' एउटा सादा फाइल वा सिमलिङ्क होइन (= `%s')\n"
+msgstr ""
+"dpkg: %s: चेतावनी - कन्फफाइल `%.250s' एउटा सादा फाइल वा सिमलिङ्क होइन (= `%s')\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1546,110 +1541,117 @@ msgstr "EOF को stdin मा कन्फफाइल प्रोम्ट"
 msgid "unable to check for existence of `%.250s'"
 msgstr "`%.250s' को अस्तित्वका लागि जाँच गर्न असफल"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " यसमा निर्भर गर्दछ "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " यस पहिले निर्भर गर्दछ "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " सिफारिस गर्दछ "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " सुझाव दिन्छ "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr "विच्छेद"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " यससँग द्धन्द गर्दछ "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " सुझाव दिन्छ "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " बढाउदछ "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s लाई हटाएको हुनु पर्दछ ।\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s लाई डिकन्फिगर गर्नु पर्छ ।\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s स्थापित हुनु पर्दछ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s स्थापना गरिएको छ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s खोलिएको छ, तर कहिले पनि कन्फिगर गिरिएन ।\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s खोलिएको छ, तर संस्करण %.250s मा ।\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s अन्तिमा कन्फिगर गरिएको संस्करण %.250s हो ।\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s  %s हो ।\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ले  %.250s प्रदान गर्दछ तर हटाइएको हुनु पर्दछ ।\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ तर डिकन्फिगर गरिएको हुनुपर्दछ ।\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ तर %s हो ।\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s स्थापना गरिएको छैन ।\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (संस्करण %.250s) स्थापित हुनु पर्दछ ।\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (संस्करण %.250s) %s हो ।\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ र स्थापित हुनु पर्दछ ।\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s ले %.250s प्रदान गर्दछ र %s हो ।\n"
@@ -1739,7 +1741,8 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg लाई स्थापना गरिएको रुपमा रेकड गरिएको छैन, इपोक समर्थनका लागि जाँच गर्न सक्दैन !\n"
+msgstr ""
+"dpkg लाई स्थापना गरिएको रुपमा रेकड गरिएको छैन, इपोक समर्थनका लागि जाँच गर्न सक्दैन !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1764,7 +1767,8 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-बनावटले कुनै तर्कहरू लिदैन"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--compare-संस्करणले तिनवटा तर्कहरू लिन्छ: <version> <relation> <version>"
 
 #: src/enquiry.c:424
@@ -1786,8 +1790,10 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: असफल प्याकेजहरुको सूचीमा नयाँ प्रविष्टिका लागि स्मृति बाँडफाड गर्न असफल भयो ।"
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: असफल प्याकेजहरुको सूचीमा नयाँ प्रविष्टिका लागि स्मृति बाँडफाड गर्न असफल भयो ।"
 
 #: src/errors.c:91
 #, c-format
@@ -1805,11 +1811,13 @@ msgstr "अति धेरै त्रुटिहरू भएकाले 
 #: src/errors.c:112
 #, c-format
 msgid "Package %s was on hold, processing it anyway as you request\n"
-msgstr "प्याकेज %s पर्खाइमा थियो, जे भए पनि तपाईँको अनुरोधको रुपमा यसलाई प्रक्रिया गर्दैछ\n"
+msgstr ""
+"प्याकेज %s पर्खाइमा थियो, जे भए पनि तपाईँको अनुरोधको रुपमा यसलाई प्रक्रिया गर्दैछ\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "प्याकेज %s पर्खाइमा छ, यसलाई नछोइकन ।  अधिलेखन गर्न Use --force-hold \n"
 
 #: src/errors.c:125
@@ -2399,7 +2407,8 @@ msgstr "--ignore-depends comma-separated list `%.250s' मा शून्य 
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
-msgstr "--ignore-depends लाई कानूनी प्याकेज नामको आवश्यकता पर्दछ । `%.250s' होइन; %s"
+msgstr ""
+"--ignore-depends लाई कानूनी प्याकेज नामको आवश्यकता पर्दछ । `%.250s' होइन; %s"
 
 #: src/main.c:287 src/main.c:298
 #, c-format
@@ -2528,7 +2537,7 @@ msgstr "प्रवाहका लागि`%i' खोोल्न सके
 msgid "unexpected eof before end of line %d"
 msgstr "लाइनको समाप्ती पहिले %d अप्रत्यासित eof"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "एउटा कार्य विकल्प आवश्यक"
@@ -2605,6 +2614,10 @@ msgstr "  प्याकेज %s जसले %s प्रदान गर्
 msgid "  Package %s is not installed.\n"
 msgstr "  प्याकेज %s स्थापना गरिएको छैन ।\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " यसमा निर्भर गर्दछ "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; यद्यपी:\n"
@@ -2795,10 +2808,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "अन्य नयाँ फाइल `%.250s' stat गर्न अक्षम"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: चेतावनी - पुरानो फाइल `%.250s' अन्य धेरै नयाँ फाइलहरू जस्तै छ !  (दुवै `%.250s' "
 "and `%.250s')"
@@ -3040,7 +3053,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr "dpkg - चेतावनी:  %.250s हटाउने अनुरोध अवज्ञा गर्दैछ जुन स्थापित छैन ।\n"
 
 #: src/remove.c:100
@@ -3125,7 +3139,8 @@ msgstr "नियन्त्रण सूचना फाइल `%.250s' हट
 msgid ""
 "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
 "removed.\n"
-msgstr "dpkg - चेतावनी: %.250s हटाउदा, डाइरेक्टरी `%.250s' रित्तो छैन त्यसैले हटाउन सकिएन ।\n"
+msgstr ""
+"dpkg - चेतावनी: %.250s हटाउदा, डाइरेक्टरी `%.250s' रित्तो छैन त्यसैले हटाउन सकिएन ।\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3249,24 +3264,29 @@ msgstr "--forget-old-unavail ले कुनै तर्कहरू लिद
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - त्रुटि: %s (`%s') ले कुनै पनि अङ्कहरू समाहित गर्दैन\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build लाई एउटा डाइरेक्टरी तर्क आवश्यक पर्दछ"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build ले बढिमा दुईवटा तर्कहरू लिन्छ"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "सङ्ग्रह `%.250s' को उपस्थितिका लागि जाँच गर्न अक्षम"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "लक्षक्य डाइरेक्टरी हो - नियन्त्रण फाइल जाँच फड्काउन सकिदैन"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3275,174 +3295,177 @@ msgstr ""
 "dpkg-deb: चेतावनी, नियन्त्रण क्षेत्रको विषयहरू जाँच नगर्नुहोस्\n"
 "dpkg-deb: एउटा अज्ञात प्याकेज`%s' मा बनाउदै ।\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "प्याकेज नाममा क्यारेक्टरहरू छन् जुन सानो अक्षर अल्फान्युम्स वा -+ होइन ।"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "चेतावनी, `%s' ले प्रयोग-परिभाषित प्राथमिकता मान `%s' समावेश गर्दछ \n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "चेतावनी, `%s' ले प्रयोग-परिभाषित फाँट समावेश गर्दछ `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d नियन्त्रण फाइलमा त्रुटिहरू"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: प्याकेज `%s' मा `%s बनाउदै ।\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "नियन्त्रण डाइरेक्टरीमा खराब अनुमतिहरू %03lo छन्(हुन पर्ने >=0755 र <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "मर्मत गर्ने स्क्रिप्ट `%.50s' एउटा सादा सिमलिङ्क वा फाइल होइन"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
-msgstr "मर्मत गर्ने स्क्रिप्ट `%.50s' संग खराब अनुमतिहरू %03lo छन् (हुनुपर्ने >=0555 र <=0775)"
+msgstr ""
+"मर्मत गर्ने स्क्रिप्ट `%.50s' संग खराब अनुमतिहरू %03lo छन् (हुनुपर्ने >=0555 र <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "मर्मत गर्ने स्क्रिप्ट `%.50s' स्थिर छैन"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "fgets पढ्ने कन्फफाइलहरूबाट रित्तो स्ट्रिङ्"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "चेतावनी, कन्फफाइल नाम `%.50s...' धेरै लामो छ, वा अन्तिम नयाँलाइन हराइरहेको छ \n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"चेतावनी, कन्फफाइल नाम `%.50s...' धेरै लामो छ, वा अन्तिम नयाँलाइन हराइरहेको छ \n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "चेतावनी, कन्फफाइल `%s'ले सेतो खालीस्थान पछ्याउने समावेश गर्दछ\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "कन्फफाइल `%.250s' प्याकेजमा देखा पर्दैन"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "कन्फफाइल `%.250s' स्थिर छैन"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "चेतावनी, कन्फफाइल `%s' सादा फाइल होइन\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "कन्फाइल फाइल पढ्दा त्रुटि"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "कन्फफाइल फाइल खोल्दा त्रुटि"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb:  %d ले कन्फफाइल(हरू) का बारेमा चेतावनीहरू अवज्ञा गर्दै\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "`%.255s' बफर बन्द गर्न अक्षम"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "`%.255s' मा डाइरेक्टरी परिवर्तन गर्न अक्षम"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ".../DEBIAN मा डाइरेक्टरी परिवर्तन गर्न असफल"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "टार -cf कार्यान्वयन गर्न असफल"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "tmpfile (नियन्त्रण) बनाउन असफल"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "tmpfile (नियन्त्रण) खोल्न असफल, %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "tmpfile (नियन्त्रण) अनलिङ्क गर्न असफल, %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "नियन्त्रण"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "tmpfile (नियन्त्रण) fstat गर्न असफल"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "tmpfile (नियन्त्रण) रिवाइन्ड असफल"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "tmpfile (डेटा) बनाउन असफल"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "tmpfile (डेटा) खोल्न असफल, %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "tmpfile (डेटा) अनलिङ्क गर्न असफल, %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "डेटा"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "खोजी कार्यन्वयन गर्न असफल"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "पाइप (डेटा) टारलाई फाइलनाम लेख्न असफल"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "आन्तरिक त्रुटि, गद्दी_प्रकार `%i' अज्ञात!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "tmpfile (डेटा) रिवाइन्ड गर्न असफल"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "क्याट (डेटा)"
 
@@ -3519,22 +3542,22 @@ msgstr "संस्करण नम्बरमा सङ्ग्रहसं
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "सङ्ग्रह संस्करण %.250s बुझेन, नयाँ dpkg-deb पाउनुहोस्"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "%s बाट सदस्य डेटा फड्कियो"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "फाइल `%.250s' ले नबुझ्ने डेटा सदस्य %.*s समावेश गर्दछ, छोड्दै"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "फाइल `%.250s' ले दुई सदस्यहरू समावेश गर्दछ, छोड्दै"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3543,16 +3566,16 @@ msgstr ""
 " नयाँ डेबियन प्याकेज, संस्करण %s.\n"
 " आकार %ld बाइट्स: नियन्त्रण सङ्ग्रह= %zi बाइट्स ।\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "नियन्त्रण सूचना लम्बाई"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "सङ्ग्रहसंग नराम्रो ढाँचाबद्ध नियन्त्रण लम्बाई `%s' छ"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3561,15 +3584,15 @@ msgstr ""
 " पुरानो डेबियन प्याकेज, संस्करण %s ।\n"
 " आकार %ld बाइट्स: नियन्त्रण सङ्ग्रह= %zi, मुख्य सङ्ग्रह= %ld ।\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "चल `ctrlarea' का लागि स्मृति बाडफाँड गर्न असफल"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "नियन्त्रण क्षेत्र"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3578,65 +3601,65 @@ msgstr ""
 "dpkg-deb: फाइल जस्तो देखिन्छ यो सम्भवत एउटा सङ्ग्रह हो जुन\n"
 "dpkg-deb:    ASCII मोडमा डाउनलोड गरिदा दुषित भएको छ\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' डेबियन ढाँचा सङ्ग्रह होइन"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "हालको फाइल स्थान पाउन असफल"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "हालको फाइल स्थान सेटिङ् असफल"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "'टास्नुहोस' मा पाइप वर्णनकर्ता `1'खोल्न असफल"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "gzip -dc लेख्न असफल"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "gzip -dc बन्द गर्न असफल"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "फाइलको सङ्ग्रह भागमा syscall Iseek गर्न असफल"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "प्रतिलिपिमा पाइपलाई लेख्न असफल"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "प्रतिलिपिमा पाइप बन्द गर्न असफल"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "डाइरेक्टरी सिर्जना गर्न असफल"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "डाइरेक्टरीलाई chdir गर्न असफल"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "टार कार्यान्वयन गर्न असफल"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s लाई .deb फाइलनाम तर्क आवश्यक छ"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3645,12 +3668,12 @@ msgstr ""
 "--%s लाई लक्षित डाइरेक्टरी आवश्यक छ ।\n"
 "सम्भवत तपाईँलाई dpkg --स्थापना प्रयोग गर्नु पर्दछ ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s ले बढिमा दुई तर्कहरू (.deb र डाइरेक्टरी) लिन्छ"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ले एक मात्र (.deb फाइलनाम) तर्क लिन्छ"
@@ -3804,7 +3827,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3815,7 +3838,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "विकल्पहरू:\n"
@@ -3854,7 +3878,7 @@ msgstr ""
 "प्याकेजहरुको स्थापना गर्ने र स्थापनाबाट हटाउने बारेमा मद्दत गर्नको लागि dpkg --help "
 "टाइप गर्नुहोस् ।"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "अज्ञात सङ्कुचन प्रकार `%s'!"
@@ -3886,7 +3910,8 @@ msgstr "फाइल `%.250s' दूषित छ - सूचना सेक्
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "फाइल `%.250s' ढाँचाबद्ध संस्करण हो `%.250s' - तपाईँलाई नयाँ dpkg-split चाहिन्छ"
+msgstr ""
+"फाइल `%.250s' ढाँचाबद्ध संस्करण हो `%.250s' - तपाईँलाई नयाँ dpkg-split चाहिन्छ"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -4229,9 +4254,9 @@ msgstr "स्रोत फाइल `%.250s' खाली फाइल हो
 msgid "unable to exec mksplit"
 msgstr "mksplit कार्यान्वयन गर्न अक्षम"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "डेबियन %s संस्करण %s \n"
@@ -4244,9 +4269,9 @@ msgstr ""
 "\n"
 "प्रतिलिपी अधिकार(सी) १९९६ किम-मिन कप्लान"
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4302,7 +4327,7 @@ msgid "try deleting %s"
 msgstr "%s मेट्न प्रयास गर्नुहोस्"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "%s खोल्न अक्षम: %s"
@@ -4329,7 +4354,7 @@ msgid "unable to close %s after read: %s"
 msgstr "पढे पछि %s बन्द गर्न अक्षम: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s बन्द गर्न अक्षम: %s"
@@ -4349,12 +4374,12 @@ msgstr "%s स्थापना गर्न अक्षम; यो %s को
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: %s ताल्चा खोल्न अक्षम: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "%s बाट ENOENT मान प्राप्त गर्न सकिदैन: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4364,7 +4389,7 @@ msgstr ""
 "प्रतिलिपि अधिकार (सी) १९९५ इयान ज्याक्सन\n"
 "प्रतिलिपि अधिकार (सी) २०००,२००१ विर्चार्ड आकर्म्यान"
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4417,89 +4442,89 @@ msgstr ""
 "हटाउदा, --प्याकेज वा --स्थानिय र --यदि निर्दिष्ट गरिएमा फेराइ मिल्नु पर्दछ\n"
 "प्याकेज preinst/postrm स्क्रिप्टले सधै --प्याकेज र --फेराइ निर्दिष्ट गर्नु पर्दछ.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "दुई मोड निर्दिष्ट: %s र --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s लाई तर्कमा फेर्ने आवश्यक पर्दछ"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "यसमा फेर्नेले नयाँरेखाहरू समावेश नगर्न सक्छ"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s लाई <package> आवश्यक पर्दछ"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "प्याकेजले नयाँरेखा समावेश नगर्न सक्छ"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s लाई <directory> आवश्यक पर्दछ"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "अज्ञात विकल्प `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "diversions खोल्न असफल: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "हराइरहेको अल्टनाम"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "हराइरहेको प्याकेज"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s लाई एकल तर्क आवश्यक पर्दछ"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "फाइलनाम \"%s\" स्थिर छैन"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "फाइले नयाँरेखा समावेश नगरेको हुन सक्छ"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "डाइरेक्टरी फेर्न सकिदैन"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "छोड्दैछ `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "with `%s' सँग `%s' द्वन्दहरू "
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' थप्दा"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4510,7 +4535,7 @@ msgstr ""
 "  divert-to मा\n"
 "  `%s' फेला पर्यो"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4521,37 +4546,37 @@ msgstr ""
 "  `%s' बेमेल\n"
 "  फेला पर्यो"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "हटाउदैछ `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr " `%s' डाइभर्सन होइन, केहि पनि हटाइएन"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "आन्तरिक त्रुटि: खराब मोड: `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "नयाँ नाम `%s' तोक्न सकिदैन: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "जाँच त्रुटि `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4560,52 +4585,52 @@ msgstr ""
 "पुन: नामकरणमा `%s' लाई\n"
 "  फरक फाइल `%s' अधिलेखन समावेश हुन्छ, स्विकार्य छैन"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "पुन: नामकरण गर्नुहोस्: पुरानो नक्कली लिङ्क `%s' हटाउनुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "पुन: नामकरण: `%s' लाई `%s' मा पुन: नामकरण गर्नुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "डाइभर्सन सिर्जना गर्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "डाइभर्सन लेख्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "डाइभर्सन बन्द गर्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "पुरानो डाइभर्सन हटाउनुहोस्-पुरानो: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "नयाँ डाइभर्सन सिर्जना गर्नुहोस्-पुरानो: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "नयाँ डाइभर्सन स्थापना गर्नुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "आन्तरिक त्रुटि: %s दुषित: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4613,7 +4638,7 @@ msgstr ""
 "\n"
 "प्रतिलिपि अधिकार (सी) २००० विचर्ट आकरम्यान"
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4648,106 +4673,106 @@ msgstr ""
 "  --help                   मद्दत सन्देश देखाउनुहोस् ।\n"
 "  --version                संस्करण देखाउनुहोस् ।\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "मोड निर्दिष्ट छैन"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--आवश्यक चार तर्क थप्नुहोस्"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "अवैधानिक प्रयोगकर्ता %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "अवस्थित नरहेको प्रयोगकर्ता %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "अवैधानिक समूह %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "अवस्थित नरहेको समूह %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "अवैधानिक मोड %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "अनावृत ट्रेलिङ"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "\"%s\"का लागि अधिलेखन पहिले नै अवस्थित छ,"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "तर--निर्दिष्ट बल त्यसै कारणलै उपेक्षा गरिनेछ ।"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "परित्याग गर्दैछ"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "चेतावनी--अद्यावधिक दिइएको छ तर %s अवस्थित छैन"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "निम्न (अनुमति परिवर्तन गर्न असफल) chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod गर्न असफल %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "अधिलेखन अवस्थित छैन"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "चेतावनी:--हटाउन--अद्यावधिक उपयोगि छैन"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "statoverride खोल्न असफल: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "\"%s\" का लागि बहुविध अधिलेखन, परित्याग गर्दैछ"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "नयाँ statoverride फाइल खोल्न असफल: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "पुरानो statoverride हटाउन त्रुटि:%s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "नयाँ statoverride सिर्जना गर्दा त्रुटि: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "नयाँ statoverride स्थापना त्रुटि: %s"
@@ -4912,7 +4937,8 @@ msgstr "%s: अझ सम्म कुनै सेक्सन छैन, व
 #: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
-msgstr "%s: नयाँ प्रविष्टिका लागि कुनै पनि सेक्सन निर्दिष्ट गरिएको छैन, अन्त्यमा स्थापन गर्दैछ"
+msgstr ""
+"%s: नयाँ प्रविष्टिका लागि कुनै पनि सेक्सन निर्दिष्ट गरिएको छैन, अन्त्यमा स्थापन गर्दैछ"
 
 #: scripts/install-info.pl:422
 #, perl-format
@@ -4932,7 +4958,8 @@ msgstr "%s: `%s' रित्तो सेक्सन मेट्दैछ"
 #: scripts/install-info.pl:438
 #, perl-format
 msgid "%s: no entry for file `%s' and menu entry `%s'"
-msgstr "%s: no entry for file `%s' फाइल र `%s' मेनु प्रविष्टिका लागि  कुनै पनि प्रविष्टि छैन"
+msgstr ""
+"%s: no entry for file `%s' फाइल र `%s' मेनु प्रविष्टिका लागि  कुनै पनि प्रविष्टि छैन"
 
 #: scripts/install-info.pl:440
 #, perl-format
@@ -4964,7 +4991,7 @@ msgstr "%s पढ्न अक्षम: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4974,8 +5001,8 @@ msgstr ""
 "प्रतिलिपि अधिकार (सी) १९९५ इयान ज्याक्सन\n"
 "प्रतिलिपि अधिकार (सी) २०००-२००२ विचार्ड अकर्म्यान"
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4995,7 +5022,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5049,161 +5076,160 @@ msgstr ""
 "  --help                   यो मद्दत सन्देश देखाउनुहोस्\n"
 "  --version                संस्करण देखाउनुहोस्\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "अज्ञात तर्क `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--स्थापनालाई आवश्यक <link> <name> <path> <priority>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "प्राथमिकता इन्टिजर हुनुपर्दछ"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s लाई <name> <path> आवश्यक पर्दछ"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s लाई <name> आवश्यक पर्दछ"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--स्लेभलाई <link> <name> <path> आवश्यक पर्दछ"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr " %s स्लेभ नाम  नक्कल गरियो"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "%s स्लेभ लिङ्क नक्कल गरियो"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr " %s नाम प्राथमिक र स्लेभ दुबै हो"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "%s लिङ्क प्राथमिक र स्लेभ दुबै हो"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--स्लेभ केबल --स्थापनासँग स्विकृत हुन्छ"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "नक्कल प्रति स्लेभ %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "%s मुख्य लिङ्क जस्तै स्लेभ लिङ्क"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "नक्कल प्रति स्लेभ लिङ्क %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "नक्कल मार्ग %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "प्राथमिकता %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr "%s मा तोक्न %s का लागि विकल्प - जुन फेला परेन । विकल्पको सूचीबाट हटाउदैछ ।"
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s का लागि विकल्प छैन"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s -  वस्तुस्थिति %s छ"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr "%s मा हालैको बिन्दुमा लिङ्क गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr "हालै अनुपस्थित लिङ्क गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "पढ्न अयोग्य लिङ्क - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - प्राथमिकता %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr "स्लेभ %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "संस्करण उपलब्ध छैन"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "हालको उपयुक्त संस्करण %s हो ।"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "अज्ञात तर्क `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--स्थापनालाई आवश्यक <link> <name> <path> <priority>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "प्राथमिकता इन्टिजर हुनुपर्दछ"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s लाई <name> <path> आवश्यक पर्दछ"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s लाई <name> आवश्यक पर्दछ"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--स्लेभलाई <link> <name> <path> आवश्यक पर्दछ"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr " %s स्लेभ नाम  नक्कल गरियो"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "%s स्लेभ लिङ्क नक्कल गरियो"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr " %s नाम प्राथमिक र स्लेभ दुबै हो"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "%s लिङ्क प्राथमिक र स्लेभ दुबै हो"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--स्लेभ केबल --स्थापनासँग स्विकृत हुन्छ"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s को स्वचालित चयन सेट गर्दैछ"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s हटाउन अक्षम: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5212,7 +5238,7 @@ msgstr ""
 "%s परिवर्तन गरिएको छ (म्यानुअली वा स्क्रिप्टद्वारा)\n"
 "म्यानुअल अद्यावधिकलाई मात्र स्विचिङ"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5221,67 +5247,67 @@ msgstr ""
 "%s को उपलब्ध संस्करण जाँच, %s मा लिङ्क अद्याावधिक ...\n"
 "(आवश्यक परेमा तपाईँले सिमलिङ्क परिमार्जन गर्न सक्नुहुन्छ- `man ln' हेर्नुहोस् ।)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s बाट %s मा %s लिङ्क पुन: नामकरण"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s लाई %s मा पुन: नामकरण गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s स्लेभ लिङ्क नाम नक्कल बनाइयो"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s बाट %s मा स्लेभ लिङ्क %s पुन: नामकरण  "
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "म्यानुअली चयन गरिएको विकल्प हटाउदैछ - स्वत: मोडमा स्विच गर्दैछ"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s का लागि %s विकल्प दर्ता गरिएको छैन, हटाइएको छैन ।"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "छुटेको स्लेभ लिङ्क %s (%s) परित्याग गर्दैछ"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr " %s को स्वचालित अद्यावधिक अक्षम पारियो, यसलाई छोड्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "स्वचालित अद्यावधिक फर्काउन अद्यावधिक-विकल्पहरू--स्वत %s' प्रयोग गर्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr " %s ...को अघिल्लो असफल अद्यावधिकबाट पुन: प्राप्त गर्दैछ ।"
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "लेख्नका लागि %s खोल्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) प्रदान गर्ने अन्तिम प्याकेज हटाइयो, यसलाई मेट्दैछ ।"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5290,38 +5316,38 @@ msgstr ""
 "चेतावनी: %s लाई %s मा सिमलिङ्क भएको मानिन्छ\n"
 " (वा अवस्थित नरहेको); यद्यपी, रिडलिङ्क असफल: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s अवस्थित नरहेको यकिन गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s मा तोक्न %s (%s) छोड्दैछ"
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s मा तोक्न %s (%s) अद्यावधिक गर्दैछ"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5330,13 +5356,13 @@ msgstr ""
 "चेतावनी : %s लाई\n"
 " %s मा स्लेभ सिमलिङ्क, वा अवस्थित नरहेको मानिन्छ; यद्यपी, रिडलिङ्क असफल भयो: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) हटाउदैछ, %s सँग उपयुक्त छैन ।"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5345,7 +5371,7 @@ msgstr ""
 "त्यहाँ %s प्रदान गर्ने केबल १ कार्यक्रम मात्र छ\n"
 "(%s). कन्फिगर गर्न केहि पनि छैन ।\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5358,42 +5384,50 @@ msgstr ""
 "  चयन    विकल्प\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "पूर्वनिर्धारित [*] राख्न 'प्रविष्ट गर्नुहोस्' थिच्नुहोस्, वा चयन सङ्ख्या टाइप गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr " `%s' प्रदान गर्न `%s' प्रयोग गर्दैछ"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "`%s' विकल्प फेला पार्न सकिदैन ।"
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout लेख्दा त्रुटि: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "अद्यावधिक-वैकल्पिक फाइलहरू (%s) मा नयाँरेखा निषेधित गरिएको छ"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) का लागि त्रुटि वा eof पढाइ %s"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s पछि हराइरहेको नयाँरेखा"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "गम्भीर समस्या: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: gzip -dc कार्यान्वयन गर्न असफल"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: bzip2 -dc कार्यान्वयन गर्न असफल"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: bzip2 कार्यन्वयन गर्न असफल %s"
diff --git a/po/nl.po b/po/nl.po
index b5612d96..030ac7f8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-08-29 16:57+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -52,72 +52,57 @@ msgstr "Systeemfout nr. %d"
 msgid "Signal no.%d"
 msgstr "Signaal nr. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: uitvoeren van gzip %s is mislukt"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: interne gzip fout `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: uitvoeren van 'gzip -dc' is mislukt"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: interne bzip2 fout `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: uitvoeren van  'bzip2 -dc' is mislukt"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompressie"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: interne gzip fout: read: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: interne gzip fout: write: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: interne gzip fout: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: uitvoeren van gzip %s is mislukt"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: interne bzip2 fout: read: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: interne bzip2 fout: write `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: interne bzip2 fout: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: uitvoeren van bzip2 %s is mislukt"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressie"
@@ -138,13 +123,20 @@ msgstr "schrijven is mislukt tijdens frommelrapport"
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "de map updates bevat een bestand `%.250s' waarvan de naam te lang is (lengte=%d, max=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"de map updates bevat een bestand `%.250s' waarvan de naam te lang is (lengte="
+"%d, max=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "de map updates bevat bestanden met namen van verschillende lengte (zowel %d als %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"de map updates bevat bestanden met namen van verschillende lengte (zowel %d "
+"als %d)"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -156,9 +148,7 @@ msgstr "kan 'updates'-map `%.255s' niet scannen"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "verwijderen van in rekening genomen 'update'-bestand %.255s is mislukt"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kan `%.255s' niet aanmaken"
@@ -188,7 +178,9 @@ msgstr "kan niet binnen bij het statusgebied van dpkg"
 
 #: lib/dbmodify.c:157
 msgid "operation requires read/write access to dpkg status area"
-msgstr "voor deze bewerking zijn lees- en schrijfrechten nodig in het dpkg statusgebied"
+msgstr ""
+"voor deze bewerking zijn lees- en schrijfrechten nodig in het dpkg "
+"statusgebied"
 
 #: lib/dbmodify.c:205
 #, c-format
@@ -343,12 +335,15 @@ msgstr "veld voor bestandsdetails `%s' niet toegestaan in statusbestand"
 #: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
-msgstr "te veel waarden in veld voor bestandsdetails `%s' (vergeleken met anderen)"
+msgstr ""
+"te veel waarden in veld voor bestandsdetails `%s' (vergeleken met anderen)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "te weinig waarden in het veld voor bestandsdetails `%s' (vergeleken met anderen)"
+msgstr ""
+"te weinig waarden in het veld voor bestandsdetails `%s' (vergeleken met "
+"anderen)"
 
 #: lib/fields.c:133
 msgid "yes/no in boolean field"
@@ -400,7 +395,8 @@ msgstr "waarde voor `conffiles' heeft een verkeerd opgemaakte regel `%.*s'"
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "waarde voor `conffiles' heeft een regel die niet begint met een spatie (`%c')"
+msgstr ""
+"waarde voor `conffiles' heeft een regel die niet begint met een spatie (`%c')"
 
 #: lib/fields.c:281
 msgid "root or null directory is listed as a conffile"
@@ -408,8 +404,11 @@ msgstr "hoofd- of null-map wordt genoemd als een conffile"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "`%s'-veld, ontbrekende pakketnaam, of rommel waar een pakketnaam werd verwacht"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"`%s'-veld, ontbrekende pakketnaam, of rommel waar een pakketnaam werd "
+"verwacht"
 
 #: lib/fields.c:340
 #, c-format
@@ -454,10 +453,10 @@ msgid ""
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 "`%s'-veld, verwijzing naar `%.255s':\n"
-" versiewaarde begint met een niet-alfanumeriek teken, voeg bijv. een spatie toe"
+" versiewaarde begint met een niet-alfanumeriek teken, voeg bijv. een spatie "
+"toe"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s'-veld, verwijzing naar `%.255s': versie bevat `%c'"
@@ -488,7 +487,8 @@ msgstr "kan dpkg status database niet ontgrendelen"
 
 #: lib/lock.c:65
 msgid "you do not have permission to lock the dpkg status database"
-msgstr "u heeft de benodigde rechten niet om dpkg statusdatabase te vergrendelen"
+msgstr ""
+"u heeft de benodigde rechten niet om dpkg statusdatabase te vergrendelen"
 
 #: lib/lock.c:66
 msgid "unable to open/create status database lockfile"
@@ -507,8 +507,7 @@ msgstr "kan de 'dpkg'-statusdatabase niet vergrendelen"
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc is mislukt (%ld bytes)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc is mislukt (%ld bytes)"
@@ -551,8 +550,7 @@ msgstr "subproces %s gaf een foutwaarde %d terug"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: waarschuwing - %s gedood door signaal (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", kern gedumpt"
 
@@ -661,8 +659,7 @@ msgstr "leesfout in configuratiebestand `%.255s'"
 msgid "error closing configuration file `%.255s'"
 msgstr "fout bij sluiten van configuratiebestand `%.255s'"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Fout bij het toewijzen van geheugen voor cfgfilename"
 
@@ -744,7 +741,8 @@ msgstr "veldnaam `%.*s' moet gevolgd worden door een dubbele punt"
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "EOF voor waarde voor veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
+msgstr ""
+"EOF voor waarde voor veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
 
 #: lib/parse.c:174
 #, c-format
@@ -781,7 +779,8 @@ msgstr "'Configured-Version' van pakket met ongepaste status"
 
 #: lib/parse.c:274
 msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Pakket in toestand `not-installed' heeft conffiles, deze worden vergeten"
+msgstr ""
+"Pakket in toestand `not-installed' heeft conffiles, deze worden vergeten"
 
 #: lib/parse.c:331
 #, c-format
@@ -831,7 +830,9 @@ msgstr "moet beginnen met een alfanumeriek teken"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "teken `%c' is niet toegestaan (enkel letters, cijfers en de karakters '%s' zijn toegestaan)"
+msgstr ""
+"teken `%c' is niet toegestaan (enkel letters, cijfers en de karakters '%s' "
+"zijn toegestaan)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -881,168 +882,181 @@ msgstr "Sluitend haakje niet in het formaat aanwezig\n"
 msgid "failed to realloc for variable buffer"
 msgstr "realloc voor variabele buffer is mislukt"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  is reeds verdwenen !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "fout bij het lezen uit de 'dpkg-deb'-pijp"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "fout bij het instellen van de tijd van `%.255s'"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fout bij het instellen van de eigenaar van `%.255s'"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fout bij het instellen van de permissies op `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "poging tot overschrijven van `%.250s', wat een omgeleide versie is van `%.250s'%.10s%.100s%.10s"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"poging tot overschrijven van `%.250s', wat een omgeleide versie is van `"
+"%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakket: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
-msgstr "kan de status van `%.255s' niet opvragen (die ik net wilde gaan installeren)"
+msgstr ""
+"kan de status van `%.255s' niet opvragen (die ik net wilde gaan installeren)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
-msgstr "kan de rommel rond `%.255s' niet opruimen alvorens een nieuwe versie te installeren"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
+msgstr ""
+"kan de rommel rond `%.255s' niet opruimen alvorens een nieuwe versie te "
+"installeren"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "kan de status van de teruggezette `%.255s' niet opvragen voor de installatie van een nieuwe versie"
+msgstr ""
+"kan de status van de teruggezette `%.255s' niet opvragen voor de installatie "
+"van een nieuwe versie"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archief bevatte een object `%.255s' van het onbekende type 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Overschrijven van de bestanden in het oude pakket %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Vervangen door bestanden in geïnstalleerd pakket %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen map is"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen "
+"map is"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "poging tot overschrijven van `%.250s', wat ook in pakket %.250s zit"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "eet vervangen bestand `%.255s'  op"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "fout in dpkg-deb tijdens `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fout bij het sluiten van/schrijven naar `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fout bij het aanmaken van de pijp `%.255s'"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fout bij het aanmaken van het apparaatbestand `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fout bij het maken van de vaste koppeling `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fout bij het maken van de symbolische koppeling `%.255s'"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
-msgstr "fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
+msgstr ""
+"fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "fout bij het maken van de map `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "kun `%.255s' niet opzij zetten om een nieuwe versie te installeren"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kan koppeling niet lezen uit `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kan geen reservekoppeling maken voor `%.255s'"
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "kan de eigenaar van de reservekoppeling niet instellen voor `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "kan geen reservekoppeling van `%.255s' maken voor de installatie van de nieuwe versie"
+msgstr ""
+"kan geen reservekoppeling van `%.255s' maken voor de installatie van de "
+"nieuwe versie"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kan de nieuwe versie van `%.255s' niet installeren"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
-"dpkg: waarschuwing - vereistenprobleem bij het verwijderen van %s wordt genegeerd:\n"
+"dpkg: waarschuwing - vereistenprobleem bij het verwijderen van %s wordt "
+"genegeerd:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1051,7 +1065,7 @@ msgstr ""
 "dpkg: waarschuwing - deconfiguratie van het essentiële\n"
 " pakket %s wordt overwogen teneinde %s te kunnen verwijderen.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1060,7 +1074,7 @@ msgstr ""
 "dpkg: nee, %s is essentiëel en wordt dus niet gedeconfigureerd\n"
 " om de verwijdering van %s mogelijk te maken.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1069,37 +1083,48 @@ msgstr ""
 "dpkg: nee, %s kan niet verwijderd worden (--auto-deconfigure kan helpen):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: verwijdering van %s ten gunste van %s wordt overwogen...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s is niet goed geïnstalleerd - vereisten worden genegeerd.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
-msgstr "dpkg: mogelijk geeft het verwijderen van %s problemen, aangezien het %s voorziet ...\n"
+msgstr ""
+"dpkg: mogelijk geeft het verwijderen van %s problemen, aangezien het %s "
+"voorziet ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
-msgstr "dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch verwijderd.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
+msgstr ""
+"dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch "
+"verwijderd.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pakket %s behoeft herinstallatie, zal het niet verwijderen.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ja, %s wordt verwijderd ten gunste van %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1108,80 +1133,89 @@ msgstr ""
 "dpkg: betreffende %s die %s bevat:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflicterende pakketten - %.250s wordt niet geïnstalleerd"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
-msgstr "dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
+msgstr ""
+"dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive heeft op zijn minst één pad-argument nodig"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "uitvoeren van 'find' voor --recursive is mislukt"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "het toepassen van fdopen op de pijp naar find is mislukt"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "fout bij het lezen van de pijp naar find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "fout bij het sluiten van de pijp naar find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find voor --recursive gaf onafgehandelde fout %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
-msgstr "er is gekeken, maar er zijn geen pakketten gevonden (bestanden die overeenkomen met *.deb)"
+msgstr ""
+"er is gekeken, maar er zijn geen pakketten gevonden (bestanden die "
+"overeenkomen met *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s heeft op zijn minst één pakket-bestandsnaam argument nodig"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Selecteren van voorheen niet geselecteerd pakket %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Overslaan van niet geselecteerd pakket %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versie %.250s van %.250s is reeds geïnstalleerd, wordt overgeslagen.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - let op: %.250s wordt gedegradeerd van %.250s naar %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "%.250s wordt niet gedegradeerd van versie %.250s naar %.250s, maar wordt overgeslagen.\n"
+msgstr ""
+"%.250s wordt niet gedegradeerd van versie %.250s naar %.250s, maar wordt "
+"overgeslagen.\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen om de reservekopie weer te installeren"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen om de "
+"reservekopie weer te installeren"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1201,7 +1235,8 @@ msgstr "kan de nieuw ge
 #: src/configure.c:92
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
-msgstr "een pakket met de naam `%s' is niet geïnstalleerd, kan het niet configureren"
+msgstr ""
+"een pakket met de naam `%s' is niet geïnstalleerd, kan het niet configureren"
 
 #: src/configure.c:94
 #, c-format
@@ -1236,7 +1271,8 @@ msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you request:\n"
 "%s"
 msgstr ""
-"dpkg: %s: vereistenproblemen, maar wordt toch geconfigureerd zoals gevraagd:\n"
+"dpkg: %s: vereistenproblemen, maar wordt toch geconfigureerd zoals "
+"gevraagd:\n"
 "%s"
 
 #: src/configure.c:130
@@ -1255,13 +1291,14 @@ msgstr "Instellen van %s (%s) ...\n"
 #: src/configure.c:180
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
-msgstr "kan de status van de nieuw gedistribueerde conffile `%.250s' niet opvragen"
+msgstr ""
+"kan de status van de nieuw gedistribueerde conffile `%.250s' niet opvragen"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
-msgstr "kan de status van de huidig geïnstalleerde conffile `%.250s' niet opvragen"
+msgstr ""
+"kan de status van de huidig geïnstalleerde conffile `%.250s' niet opvragen"
 
 #: src/configure.c:199
 #, c-format
@@ -1277,12 +1314,15 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan oude reservekopie `%.250s' niet verwijderen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan oude reservekopie `%.250s' niet verwijderen: %"
+"s\n"
 
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet hernoemen naar `%.250s': %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet hernoemen naar `%.250s': %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1292,17 +1332,23 @@ msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen: %s\n"
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan oude gedistribueerde versie `%.250s' niet verwijderen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan oude gedistribueerde versie `%.250s' niet "
+"verwijderen: %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen (voor overschrijven): %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen (voor overschrijven): "
+"%s\n"
 
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet naar `%.250s' laten verwijzen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet naar `%.250s' laten verwijzen: %"
+"s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1320,7 +1366,8 @@ msgid ""
 "dpkg: %s: warning - unable to stat config file `%s'\n"
 " (= `%s'): %s\n"
 msgstr ""
-"dpkg: %s: waarschuwing - kan de status van configuratiebestand `%s' niet opvragen\n"
+"dpkg: %s: waarschuwing - kan de status van configuratiebestand `%s' niet "
+"opvragen\n"
 " (= `%s'): %s\n"
 
 #: src/configure.c:347
@@ -1329,7 +1376,8 @@ msgid ""
 "dpkg: %s: warning - config file `%s' is a circular link\n"
 " (= `%s')\n"
 msgstr ""
-"dpkg: %s: waarschuwing - configuratiebestand `%s' is een circulaire verwijzing\n"
+"dpkg: %s: waarschuwing - configuratiebestand `%s' is een circulaire "
+"verwijzing\n"
 " (= `%s')\n"
 
 #: src/configure.c:360
@@ -1347,13 +1395,18 @@ msgid ""
 "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
 " (`%s' is a symlink to `%s')\n"
 msgstr ""
-"dpkg: %s: waarschuwing - configuratiebestand `%.250s' verwijst naar een verouderde bestandsnaam\n"
+"dpkg: %s: waarschuwing - configuratiebestand `%.250s' verwijst naar een "
+"verouderde bestandsnaam\n"
 " (`%s' is een symbolische koppeling naar `%s')\n"
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
-msgstr "dpkg: %s: waarschuwing - configuratiebestand `%.250s' is niet een gewoon bestand of symbolische koppeling (= `%s')\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: waarschuwing - configuratiebestand `%.250s' is niet een gewoon "
+"bestand of symbolische koppeling (= `%s')\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1362,7 +1415,9 @@ msgstr "md5hash"
 #: src/configure.c:417
 #, c-format
 msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
-msgstr "dpkg: %s: waarschuwing - kan configuratiebestand %s niet openen voor hash: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan configuratiebestand %s niet openen voor hash: %"
+"s\n"
 
 #: src/configure.c:435
 #, c-format
@@ -1379,8 +1434,7 @@ msgstr "kan de modus van het nieuwe conffile `%.250s' niet veranderen"
 msgid "failed to run %s (%.250s)"
 msgstr "uitvoeren van %s is mislukt (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "wachten op shell is mislukt"
 
@@ -1395,7 +1449,8 @@ msgstr "kan de shell niet starten (%.250s)"
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Vergeet niet om dit proces weer te activeren (`fg') als u klaar bent!\n"
+msgstr ""
+"Vergeet niet om dit proces weer te activeren (`fg') als u klaar bent!\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1492,7 +1547,8 @@ msgstr ""
 "    Y of I  : installeer de versie van de pakketbeheerder\n"
 "    N of O  : behoudt de huidig geïnstalleerde versie\n"
 "      D     : toon de verschillen tussen de versies\n"
-"      Z     : stuur dit proces naar de achtergrond om de situatie te bekijken\n"
+"      Z     : stuur dit proces naar de achtergrond om de situatie te "
+"bekijken\n"
 
 #: src/configure.c:619
 #, c-format
@@ -1533,118 +1589,122 @@ msgstr "EOF op stdin bij conffile prompt"
 msgid "unable to check for existence of `%.250s'"
 msgstr "kan het bestaan van `%.250s' niet verifiëren"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " is afhankelijk van "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " is voor-afhankelijk van "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " beveelt aan "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " suggereert "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr "breekt"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " is in strijd met "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " suggereert "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " verbetert "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s wordt verwijderd.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s wordt gedeconfigureerd.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s wordt geïnstalleerd, maar is versie %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s is geïnstalleerd, maar is versie %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s is uitgepakt, maar is nooit geconfigureerd.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s is uitgepakt, maar is versie %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s laatst geconfigureerde versie is %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s is %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s bevat %.250s maar wordt verwijderd.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s bevat %.250s maar wordt gedeconfigureerd.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s bevat %.250s maar is %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s is niet geïnstalleerd.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versie %.250s) wordt geïnstalleerd.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versie %.250s) is %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s bevat %.250s en wordt geïnstalleerd\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s bevat %.250s en is %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(geen beschrijving beschikbaar)"
 
@@ -1722,13 +1782,16 @@ msgid ""
 "Version of dpkg with working epoch support not yet configured.\n"
 " Please use `dpkg --configure dpkg', and then try again.\n"
 msgstr ""
-"Versie van dpkg met werkende epoch ondersteuning is nog niet geconfigureerd.\n"
+"Versie van dpkg met werkende epoch ondersteuning is nog niet "
+"geconfigureerd.\n"
 "  Gelieve opnieuw te proberen met `dpkg --configure dpkg'.\n"
 
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg is niet als geïnstalleerd geregistreerd, kan niet controleren op ondersteuning voor epoch !\n"
+msgstr ""
+"dpkg is niet als geïnstalleerd geregistreerd, kan niet controleren op "
+"ondersteuning voor epoch !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1746,22 +1809,24 @@ msgstr ""
 #: src/enquiry.c:360
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "kan niet voldoen aan voor-vereisten voor %.250s (gewenst wegens %.250s)"
+msgstr ""
+"kan niet voldoen aan voor-vereisten voor %.250s (gewenst wegens %.250s)"
 
 #: src/enquiry.c:377
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture accepteert geen argumenten"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "--compare-versions verwacht drie argumenten: <versie> <relatie> <versie>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"--compare-versions verwacht drie argumenten: <versie> <relatie> <versie>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions foute relatie"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: versie '%s' heeft verkeerde syntax: %s\n"
@@ -1776,8 +1841,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: geheugen vrijmaken voor nieuwe ingang in lijst van is mislukt pakketten is mislukt."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: geheugen vrijmaken voor nieuwe ingang in lijst van is mislukt "
+"pakketten is mislukt."
 
 #: src/errors.c:91
 #, c-format
@@ -1799,8 +1867,11 @@ msgstr "Pakket %s was on hold, wordt toch behandeld zoals gevraagd\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "Pakket %s is on hold, wordt niet aangeraakt.  Gebruik --force-hold om te negeren.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"Pakket %s is on hold, wordt niet aangeraakt.  Gebruik --force-hold om te "
+"negeren.\n"
 
 #: src/errors.c:125
 msgid ""
@@ -1817,7 +1888,9 @@ msgstr "kan bestandenlijst-bestand niet openen voor pakket `%.250s'"
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
 msgstr ""
 "dpkg: ernstige waarschuwing: bestandenlijst-bestand voor pakket\n"
 "`%.250s' ontbreekt, aangenomen wordt dat het pakket geen bestanden\n"
@@ -1831,7 +1904,8 @@ msgstr "bestandenlijst-bestand voor pakket `%.250s'"
 #: src/filesdb.c:158
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
-msgstr "bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
+msgstr ""
+"bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
 
 #: src/filesdb.c:170
 #, c-format
@@ -1856,7 +1930,8 @@ msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet aanmaken"
 #: src/filesdb.c:250
 #, c-format
 msgid "failed to write to updated files list file for package %s"
-msgstr "kan niet schrijven naar bijgewerkt bestandenlijst-bestand voor pakket %s"
+msgstr ""
+"kan niet schrijven naar bijgewerkt bestandenlijst-bestand voor pakket %s"
 
 #: src/filesdb.c:252
 #, c-format
@@ -1866,7 +1941,8 @@ msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet doorspoelen"
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet synchroniseren"
+msgstr ""
+"kan bijgewerkt bestandenlijst-bestand voor pakket %s niet synchroniseren"
 
 #: src/filesdb.c:257
 #, c-format
@@ -1931,8 +2007,7 @@ msgstr "onverwachte EOF in omleidingen [ii]"
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets gaf een lege string uit omleidingen [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "omleidingenbestand heeft een te lange regel of EOF [ii]"
 
@@ -2024,9 +2099,7 @@ msgstr "kan `%.250s' niet uitvoerbaar maken"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "kan de status van het geïnstalleerde %s script `%.250s' niet opvragen"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "kan %s niet uitvoeren"
@@ -2063,7 +2136,8 @@ msgstr "nieuw %s script"
 
 #: src/help.c:372
 msgid "there is no script in the new version of the package - giving up"
-msgstr "er is geen script in de nieuwe versie van het pakket - er wordt opgegeven"
+msgstr ""
+"er is geen script in de nieuwe versie van het pakket - er wordt opgegeven"
 
 #: src/help.c:374
 #, c-format
@@ -2083,8 +2157,7 @@ msgstr "delink"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "verwijder"
 
@@ -2093,8 +2166,7 @@ msgstr "verwijder"
 msgid "failed to %s `%%.255s'"
 msgstr "%s '%%.255s' is mislukt"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "kan rm niet uitvoeren om op te ruimen"
 
@@ -2103,10 +2175,7 @@ msgstr "kan rm niet uitvoeren om op te ruimen"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian '%s'  pakketbeheersprogramma versie %s.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2117,10 +2186,7 @@ msgstr ""
 "of later voor kopiëervoorwaarden.  Er is GEEN garantie.\n"
 "Zie %s --license voor auteursrechten en licentiedetails.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2167,11 +2233,14 @@ msgstr ""
 "  -P|--purge        <pakketnaam>      ... | -a|--pending\n"
 "  --get-selections [<patroon> ...]    toon lijst selecties op stdout.\n"
 "  --set-selections                    neem pakketselecties van stdin.\n"
-"  --clear-selections                  Deselect alle niet-essentiële paketten.\n"
+"  --clear-selections                  Deselect alle niet-essentiële "
+"paketten.\n"
 "  --update-avail <Pakketbestand>   vervang de beschikbare pakketinfo.\n"
 "  --merge-avail <Pakketbestand>    samenvoegen met beschikbaar-info.\n"
-"  --clear-avail                           verwijder huidige beschikbaar-info.\n"
-"  --forget-old-unavail                vergeet niet-geïnstalleerde oude pakketten.\n"
+"  --clear-avail                           verwijder huidige beschikbaar-"
+"info.\n"
+"  --forget-old-unavail                vergeet niet-geïnstalleerde oude "
+"pakketten.\n"
 "  -s|--status <pakket-naam> ...       geef de status van pakket.\n"
 "  -p|--print-avail <pakket-naam> ...  geef beschikbaar-info versie details.\n"
 "  -L|--listfiles <pakket-naam> ...    geef bestanden die `van' pakket zijn.\n"
@@ -2180,13 +2249,11 @@ msgstr ""
 "  -C|--audit                               zoek naar kapotte pakketten.\n"
 "  --print-architecture                geef dpkg-architectuur weer.\n"
 "  --compare-versions <a> <rel> <b>    vergelijk versienummers (zie onder).\n"
-"  --force-help                            hulp over forceren  -Dh|--debug=help                  hulp over debuggen.\n"
+"  --force-help                            hulp over forceren  -Dh|--"
+"debug=help                  hulp over debuggen.\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2227,16 +2294,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2250,18 +2322,27 @@ msgstr ""
 "  --admindir=<map>       Gebruik <map> in plaats van %s\n"
 "  --root=<map>               Installeer op een systeem met andere hoofdmap\n"
 "  --instdir=<map>            Verander hoofdmap maar niet administratiemap\n"
-"  -O|--selected-only           Skip pakketten not selected for install/upgrade\n"
-"  -E|--skip-same-version    Skip pakketten met dezelfde versie als geïnstalleerd\n"
-"  -G|--refuse-downgrade    Skip pakketten met eerdere versie dan geïstalleerd\n"
-"  -B|--auto-deconfigure      Installeer zelfs als het een ander pakket vernielt\n"
-"  --no-debsig                      Verifieer geen digitale handtekeningen op pakketten\n"
+"  -O|--selected-only           Skip pakketten not selected for install/"
+"upgrade\n"
+"  -E|--skip-same-version    Skip pakketten met dezelfde versie als "
+"geïnstalleerd\n"
+"  -G|--refuse-downgrade    Skip pakketten met eerdere versie dan "
+"geïstalleerd\n"
+"  -B|--auto-deconfigure      Installeer zelfs als het een ander pakket "
+"vernielt\n"
+"  --no-debsig                      Verifieer geen digitale handtekeningen op "
+"pakketten\n"
 "  --no-act|--dry-run|--simulate\n"
-"                                          Meld wat dpkg zou doen, zonder het te doen\n"
+"                                          Meld wat dpkg zou doen, zonder het "
+"te doen\n"
 "  -D|--debug=<octal>       Activeer debug - zie -Dhelp of --debug=help\n"
-"  --status-fd <n>               Stuur status change updates naar file descriptor <n>\n"
-"  --log=<bestandsnaam> log statusveranderingen en acties naar <bestandsnaam>\n"
+"  --status-fd <n>               Stuur status change updates naar file "
+"descriptor <n>\n"
+"  --log=<bestandsnaam> log statusveranderingen en acties naar "
+"<bestandsnaam>\n"
 "   --ignore-depends=<pakket>,... Negeer vereisten bij <pakket>\n"
-"  --force-...                          Forceer oplossingen - zie --force-help\n"
+"  --force-...                          Forceer oplossingen - zie --force-"
+"help\n"
 "  --no-force-...|--refuse-...   Stop bij problemen\n"
 "  --abort-after <n>            Breek af na <n> fouten\n"
 "\n"
@@ -2270,21 +2351,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "Vergelijkingsoperatoren voor --compare-versions:\n"
-" lt le eq ne ge gt       (geen versie wordt behandeld als eerder dan gelijk welke versie);\n"
-" lt-nl le-nl ge-nl gt-nl (geen versie wordt behandeld als eerder dan gelijk welke versie);\n"
-" < << <= = >= >> > (enkel voor compatibiliteit met de syntax van 'control-bestanden).\n"
+" lt le eq ne ge gt       (geen versie wordt behandeld als eerder dan gelijk "
+"welke versie);\n"
+" lt-nl le-nl ge-nl gt-nl (geen versie wordt behandeld als eerder dan gelijk "
+"welke versie);\n"
+" < << <= = >= >> > (enkel voor compatibiliteit met de syntax van 'control-"
+"bestanden).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Gebruik `aptitude' of 'dselect' voor gebruikersvriendelijk pakketbeheer.\n"
+msgstr ""
+"Gebruik `aptitude' of 'dselect' voor gebruikersvriendelijk pakketbeheer.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2293,23 +2380,25 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
-"Type dpkg --help voor hulp met installatie en deïnstallatie van pakketten [*];\n"
+"Type dpkg --help voor hulp met installatie en deïnstallatie van pakketten "
+"[*];\n"
 "Gebruik 'dselect' of 'aptitude' voor gebruikersvriendelijk pakketbeheer;\n"
 "Type dpkg -Dhelp voor een lijst van dpkg debugvlaggen;\n"
 "Type dpkg --force-help voor een lijst met forceer-opties;\n"
 "Type dpkg-deb --help voor hulp met manipuleren van *.deb bestanden;\n"
-"Type dpkg --license voor auteursrecht, licentie en ontbreken van garantie (GNU GPL) [*].\n"
+"Type dpkg --license voor auteursrecht, licentie en ontbreken van garantie "
+"(GNU GPL) [*].\n"
 "\n"
-"Opties gemarkeerd met [*] produceren een hoop uitvoer - pijp het door `less' of `more' !"
+"Opties gemarkeerd met [*] produceren een hoop uitvoer - pijp het door `less' "
+"of `more' !"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "tegenstrijdige acties -%c (--%s) en -%c (--%s)"
@@ -2363,15 +2452,16 @@ msgstr "--debug vereist een octaal argument"
 #: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr "lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
+msgstr ""
+"lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
 
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
-msgstr "--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s"
+msgstr ""
+"--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
@@ -2387,23 +2477,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2416,29 +2511,43 @@ msgstr ""
 " Forceeropties:\n"
 "  all                    Zet alle forceer-opties\n"
 "  downgrade [*]          Vervang pakketten met een lagere versie\n"
-"  configure-any          Configureer een pakket dat kan helpen bij dit pakket\n"
+"  configure-any          Configureer een pakket dat kan helpen bij dit "
+"pakket\n"
 "  hold                   Behandel ook pakketten die op hold staan\n"
-"  bad-path               Belangrijke programma's ontbreken in PATH, waarschijnlijk problematisch\n"
-"  not-root               Probeer dingen te (de)installeren ook als niet-root\n"
-"  overwrite              Overschrijf een bestand uit het ene pakket met een ander\n"
-"  overwrite-diverted     Overschrijf een omleiding met een niet-omgeleide versie\n"
-"  bad-verify             Installeer een pakket zelfs al mislukt de verificatie\n"
-"  depends-version [!]    Verander vereistenproblemen met versies in waarschuwingen\n"
+"  bad-path               Belangrijke programma's ontbreken in PATH, "
+"waarschijnlijk problematisch\n"
+"  not-root               Probeer dingen te (de)installeren ook als niet-"
+"root\n"
+"  overwrite              Overschrijf een bestand uit het ene pakket met een "
+"ander\n"
+"  overwrite-diverted     Overschrijf een omleiding met een niet-omgeleide "
+"versie\n"
+"  bad-verify             Installeer een pakket zelfs al mislukt de "
+"verificatie\n"
+"  depends-version [!]    Verander vereistenproblemen met versies in "
+"waarschuwingen\n"
 "  depends [!]            Verander alle vereistenproblemen in waarschuwingen\n"
-"  confnew [!]            Gebruik altijd de nieuwe configuratiebestanden, vraag niets\n"
-"  confold [!]            Gebruik altijd de oude configuratiebestanden, vraag niets\n"
+"  confnew [!]            Gebruik altijd de nieuwe configuratiebestanden, "
+"vraag niets\n"
+"  confold [!]            Gebruik altijd de oude configuratiebestanden, vraag "
+"niets\n"
 "  confdef [!]            Gebruik altijd de standaardoptie voor nieuwe\n"
 "                         configuratiebestanden, vraag niets.  Als geen\n"
 "                         standaard is gevonden wordt het gevraagd\n"
 "                         tenzij ook confold of confnew opgegeven is\n"
-"  confmiss [!]           Installeer altijd ontbrekende configuratiebestanden\n"
+"  confmiss [!]           Installeer altijd ontbrekende "
+"configuratiebestanden\n"
 "  conflicts [!]          Sta installatie van conflicterende pakketten toe\n"
-"  architecture [!]       Behandel ook pakketten met een verkeerde architectuur\n"
-"  overwrite-dir [!]      Overschrijf een map in een pakket met een bestand uit een ander\n"
-"  remove-reinstreq [!]   Verwijder pakketten die herinstallatie nodig hebben\n"
+"  architecture [!]       Behandel ook pakketten met een verkeerde "
+"architectuur\n"
+"  overwrite-dir [!]      Overschrijf een map in een pakket met een bestand "
+"uit een ander\n"
+"  remove-reinstreq [!]   Verwijder pakketten die herinstallatie nodig "
+"hebben\n"
 "  remove-essential [!]   Verwijder een essentieel pakket\n"
 "\n"
-"WAARSCHUWING - het gebruik van de opties met [!] kunnen uw installatie ernstig beschadigen.\n"
+"WAARSCHUWING - het gebruik van de opties met [!] kunnen uw installatie "
+"ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
 #: src/main.c:363
@@ -2451,14 +2560,11 @@ msgstr "onbekende force/refuse optie `%.*s'"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Let op: verouderde forceer/weiger optie `%s'\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kan geen geheugen reserveren in exec-backend"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "strdup is mislukt in exec-backend"
 
@@ -2489,10 +2595,7 @@ msgstr "kan `%i' niet openen voor stream"
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
@@ -2502,15 +2605,18 @@ msgstr "heb een actie-optie nodig"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending accepteert geen niet-optie argumenten"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s heeft ten minste een pakketnaam argument nodig"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
-msgstr "u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam van het bestand waar ze inzitten"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam "
+"van het bestand waar ze inzitten"
 
 #: src/packages.c:150
 #, c-format
@@ -2566,6 +2672,10 @@ msgstr "Pakket %s dat %s voorziet is niet ge
 msgid "  Package %s is not installed.\n"
 msgstr "  Pakket `%s' is niet geïnstalleerd.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " is afhankelijk van "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; maar:\n"
@@ -2581,7 +2691,9 @@ msgstr "fout bij verifi
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "kan dpkg-split niet uitvoeren om te zien of het een onderdeel is van meerdere delen"
+msgstr ""
+"kan dpkg-split niet uitvoeren om te zien of het een onderdeel is van "
+"meerdere delen"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2688,7 +2800,8 @@ msgstr "Uitpakken van %s (uit %s) ...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)"
+msgstr ""
+"naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2734,7 +2847,9 @@ msgstr "dpkg-deb: zap mogelijke nakomende nullen"
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: waarschuwing - kan geen stat uitvoeren op het oude bestand `%.250s', bijgevolg wordt dit niet verwijdert: %s"
+msgstr ""
+"dpkg: waarschuwing - kan geen stat uitvoeren op het oude bestand `%.250s', "
+"bijgevolg wordt dit niet verwijdert: %s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2743,8 +2858,12 @@ msgstr "dpkg: waarschuwing - kan de oude map `%.250s' niet verwijderen: %s\n"
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en is nu verwijderd)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en "
+"is nu verwijderd)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2752,25 +2871,28 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
-msgstr "dpkg: waarschuwing - het oude bestand `%.250s' is niet hetzelfde als verschillende nieuwe bestanden! (zowel '%.250s' en '%.250s')"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: waarschuwing - het oude bestand `%.250s' is niet hetzelfde als "
+"verschillende nieuwe bestanden! (zowel '%.250s' en '%.250s')"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: waarschuwing - kan oud bestand `%%.250s' niet %s: %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "kan info map niet lezen"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'"
+msgstr ""
+"oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'"
 
 #: src/processarc.c:766
 #, c-format
@@ -2789,7 +2911,9 @@ msgstr "kan tijdelijke besturingsmap niet openen"
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "bestandsnaam van het 'control'-infobestand van dit pakket is te lang (beginnend met `%.50s')"
+msgstr ""
+"bestandsnaam van het 'control'-infobestand van dit pakket is te lang "
+"(beginnend met `%.50s')"
 
 #: src/processarc.c:790
 #, c-format
@@ -2825,7 +2949,8 @@ msgstr "kan oude verdwijnende besturings infobestand `%.250s' niet verwijderen"
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "Gewenst=(U)Onbekend/Installeren/Remove/Purge/Hold\n"
 "| Status=Niet/geInstalleerd/Config/Uitgepakt/(F)config-mislukt/Half-geinst\n"
@@ -2843,9 +2968,7 @@ msgstr "Versie"
 msgid "Description"
 msgstr "Omschrijving"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Geen pakketten gevonden overeenkomend met %s.\n"
@@ -2959,27 +3082,27 @@ msgstr ""
 "  --showformat=<formaat> Gebruik alternatief formaat voor --show\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Formaat-syntax:\n"
 "  Een formaat is een string die voor elk pakket uitgeschreven wordt.\n"
 "  Het formaat mag standaard 'escape'-sequenties bevatten\n"
-"  \\n"
-" (newline), \\r (carriage return), \\\\ (gewone backslash). Pakket-\n"
+"  \\n (newline), \\r (carriage return), \\\\ (gewone backslash). Pakket-\n"
 "  formatie kan toegevoegd worden via variabele referenties naar\n"
 "  pakketvelden via de ${var[;breedte]} syntax. Velden worden rechts\n"
-"  uitgelijnd tenzij de breedte negatief is, in welk geval ze links uitgelijnd\n"
+"  uitgelijnd tenzij de breedte negatief is, in welk geval ze links "
+"uitgelijnd\n"
 "  worden.\n"
 
 #: src/query.c:514
@@ -2994,8 +3117,11 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - waarschuwing: verzoek om %.250s te verwijderen wordt genegeerd omdat het niet geïnstalleerd is.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - waarschuwing: verzoek om %.250s te verwijderen wordt genegeerd omdat "
+"het niet geïnstalleerd is.\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3051,14 +3177,16 @@ msgstr "Zou %s verwijderen of wissen ...\n"
 msgid "Removing %s ...\n"
 msgstr "%s wordt verwijderd ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - waarschuwing: tijdens verwijderen van %.250s kan de map `%.250s' niet verwijderd worden: %s - is deze map een aanhechtpunt zijn?\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - waarschuwing: tijdens verwijderen van %.250s kan de map `%.250s' niet "
+"verwijderd worden: %s - is deze map een aanhechtpunt zijn?\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "kan `%.250s' niet verwijderen"
@@ -3075,8 +3203,12 @@ msgstr "kan besturingsinfo-bestand `%.250s' niet verwijderen"
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - waarschuwing: tijdens verwijderen van %.250s, map `%.250s' niet leeg dus niet verwijderd.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - waarschuwing: tijdens verwijderen van %.250s, map `%.250s' niet leeg "
+"dus niet verwijderd.\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3096,7 +3228,8 @@ msgstr "kan configuratiemap `%.250s' niet lezen (van `%.250s')"
 #: src/remove.c:504
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
-msgstr "kan oud backup configuratiebestand `%.250s' niet verwijderen (van `%.250s')"
+msgstr ""
+"kan oud backup configuratiebestand `%.250s' niet verwijderen (van `%.250s')"
 
 #: src/remove.c:540
 #, c-format
@@ -3174,7 +3307,9 @@ msgstr "kan niet bij de dpkg statusomgeving voor massale update"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "grote bijwerking van de beschikbaarheidsdatabase vereist schrijftoegang tot de dpkg statusomgeving"
+msgstr ""
+"grote bijwerking van de beschikbaarheidsdatabase vereist schrijftoegang tot "
+"de dpkg statusomgeving"
 
 #: src/update.c:66
 #, c-format
@@ -3200,204 +3335,214 @@ msgstr "--forget-old-unavail verwacht geen argumenten"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - fout: %s (`%s') bevat geen cijfers\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build heeft een map argument nodig"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build verwacht ten hoogste twee argumenten"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "kan het bestaan van het archief `%.250s' niet verifiëren"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "doel is een map - kan controle besturingsbestand niet overslaan"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
-"dpkg-deb: waarschuwing, inhoud van het besturingsgebied is niet gecontroleerd.\n"
+"dpkg-deb: waarschuwing, inhoud van het besturingsgebied is niet "
+"gecontroleerd.\n"
 "dpkg-deb: bouwen van onbekend pakket in `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "pakketnaam heeft tekens die niet kleine letters of cijfers of '-+.' zijn"
+msgstr ""
+"pakketnaam heeft tekens die niet kleine letters of cijfers of '-+.' zijn"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "waarschuwing, `%s' bevat zelf gedefiniëerde 'Priority'-waarde `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "waarschuwing, `%s' bevat zelf gedefiniëerd veld `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d fouten in besturingsbestand"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: bouwen van pakket `%s' in `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
-msgstr "besturingsmap heeft foutieve permissies %03lo (moet >=0755 en <=0775 zijn)"
+msgstr ""
+"besturingsmap heeft foutieve permissies %03lo (moet >=0755 en <=0775 zijn)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
-msgstr "beheerdersscript `%.50s' is niet een gewoon bestand of symbolische koppeling"
+msgstr ""
+"beheerdersscript `%.50s' is niet een gewoon bestand of symbolische koppeling"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "beheerdersscript `%.50s' heeft foute permissies %03lo (moet >=0555 en <=0775 zijn)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"beheerdersscript `%.50s' heeft foute permissies %03lo (moet >=0555 en <=0775 "
+"zijn)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "beheerdersscript `%.50s' is niet opvraagbaar"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "lege string van fgets bij lezen configuratiebestanden"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "waarschuwing, configuratiebestandsnaam `%.50s...' is te lang, of afsluitende nieuwe regel ontbreekt\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"waarschuwing, configuratiebestandsnaam `%.50s...' is te lang, of afsluitende "
+"nieuwe regel ontbreekt\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "waarschuwing, configuratiebestand `%s' eindigt met leegruimte\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "configuratiebestand `%.250s' zit niet in het pakket"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "configuratiebestand `%.250s' is niet opvraagbaar"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "waarschuwing, configuratiebestand `%s' is niet een gewoon bestand\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "fout bij lezen configuratiebestanden-bestand"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "fout bij openen configuratiebestanden-bestand"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: %d waarschuwingen over de besturingsbestand(en) genegeerd\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "kan `%.255s' niet ontbufferen"
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir naar `%.255s' is mislukt"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "chdir naar ../DEBIAN is mislukt"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "uitvoeren van 'tar -cf' is mislukt"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "aanmaken tmpfile (control) is mislukt"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "openen tmpfile (control), %s is mislukt"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "ontlinken van tmpfile (control), %s is mislukt"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "besturingsbestand"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "fstat van tmpfile (control) is misluikt"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "terugspoelen van tmpfile (control) is mislukt"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "aanmaken tmpfile (data) is mislukt"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "openen tmpfile (data), %s is mislukt"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "ontlinken tmpfile (data), %s is mislukt"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "uitvoeren van find is mislukt"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "schrijven va bestandsnaam naar de 'tar'-pijp (data) is mislukt"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Interne fout, compressietype '%i' is onbekend!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "terugspoelen van tmpfile (data) is mislukt"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3415,14 +3560,12 @@ msgstr "fout bij lezen van %s uit bestand %.255s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "onverwacht bestandseinde in %s op %.255s"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "bestand `%.250s' is beschadigd - %.250s bevat nultekens"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "bestand `%.250s' is beschadigd - foutief cijfer (code %d) in %s"
@@ -3444,11 +3587,12 @@ msgstr "versienummer"
 msgid "between members"
 msgstr "tussen leden"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "bestand `%.250s' is beschadigd - foute magische code na het einde van de eerste kop"
+msgstr ""
+"bestand `%.250s' is beschadigd - foute magische code na het einde van de "
+"eerste kop"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3458,7 +3602,8 @@ msgstr "bestand `%.250s' is beschadigd - negatieve lidlengte %zi"
 #: dpkg-deb/extract.c:125
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
-msgstr "bestand `%.250s' is niet een debian binair archief (probeer dpkg-split?)"
+msgstr ""
+"bestand `%.250s' is niet een debian binair archief (probeer dpkg-split?)"
 
 #: dpkg-deb/extract.c:128
 msgid "header info member"
@@ -3477,23 +3622,22 @@ msgstr "archief heeft geen punt in het versienummer"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "archief versie %.250s niet begrepen, neem een nieuwere dpkg-deb"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "lid data van %s overgeslagen"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "bestand `%.250s' bevat onbegrepen datalid %.*s, er wordt opgegeven"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "bestand `%.250s' bevat twee besturingsleden, er wordt opgegeven"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3502,16 +3646,16 @@ msgstr ""
 " nieuw debian pakket, versie %s.\n"
 " grootte %ld bytes: besturingsarchief= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "'control'-informatielengte"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "archief heeft verkeerde 'control'-lengte `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3520,15 +3664,15 @@ msgstr ""
 " verouderd debian pakket, versie %s.\n"
 " grootte %ld bytes: besturingsarchief= %zi, hoofdarchief= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "toewijzen van geheugen voor de variabele 'ctrlarea' is mislukt"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "controlegebied"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3537,67 +3681,65 @@ msgstr ""
 "dpkg-deb: bestand ziet er uit alsof het een archief is dat beschadigd\n"
 "dpkg-deb:    is door het te downloaden in ASCII mode\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' is geen archief in debian formaat"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "ophalen van de huidige bestand-positie is mislukt"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "instellen van de huidige bestand-positie is mislukt"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "openen van bestandpijp '1' in plakken is mislukt"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "schrijven naar 'gzip -dc' is mislukt"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "afsluiten 'gzip -dc' is mislukt"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "systeemaanroep lseek naar bestandsarchiefdeel is mislukt"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "schrijven naar de pijp in copy is mislukt"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "sluiten van de pijp in copy is mislukt"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "aanmaken map is mislukt"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "chdir naar de map na het aanmaken ervan is mislukt"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "chdir naar de map is mislukt"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "uitvoeren van tar is mislukt"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s verwacht een .deb bestandsnaam argument"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3606,12 +3748,12 @@ msgstr ""
 "--%s heeft een doelmap nodig.\n"
 "Misschien heeft u 'dpkg --install' nodig?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s verwacht ten hoogste twee argumenten (.deb en map)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s verwacht slechts een argument (.deb bestandsnaam)"
@@ -3765,7 +3907,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3774,15 +3916,18 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opties:\n"
 "  --showformat=<formaat> gebruik alternatief formaat voor --show\n"
 "  -D                        activeer debugging-uitvoer\n"
 "  --old, --new          selecteer archiefformaat\n"
-"  --nocheck            onderdruk control-bestand check (bouw slecht pakket).\n"
+"  --nocheck            onderdruk control-bestand check (bouw slecht "
+"pakket).\n"
 "  -z#                      om de compressie in te stellen bij het bouwen\n"
 "  -Z<type>            om het compressietype in te stellen bij het bouwen.\n"
 "                              toegelaten waardes: gzip, bzip2, none\n"
@@ -3810,7 +3955,7 @@ msgstr ""
 "Type dpkg-deb --help voor hulp bij manipuleren van *.deb bestanden;\n"
 "Type dpkg --help voor hulp bij installeren en verwijderen van pakketten."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "onbekend compressietype '%s'!"
@@ -3842,7 +3987,9 @@ msgstr "bestand `%.250s' is beschadigd - nultekens in infodeel"
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "bestand `%.250s' heeft indeling versie `%.250s' - u heeft een nieuwere dpkg-split nodig"
+msgstr ""
+"bestand `%.250s' heeft indeling versie `%.250s' - u heeft een nieuwere dpkg-"
+"split nodig"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3862,7 +4009,8 @@ msgstr "bestand `%.250s' is beschadigd - foutief deelnummer"
 #: dpkg-split/info.c:145
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
-msgstr "bestand `%.250s' is beschadigd - foutieve magische code aan einde tweede kop"
+msgstr ""
+"bestand `%.250s' is beschadigd - foutieve magische code aan einde tweede kop"
 
 #: dpkg-split/info.c:147
 #, c-format
@@ -3872,12 +4020,15 @@ msgstr "bestand `%.250s' is beschadigd - tweede lid is niet een datalid"
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "bestand `%.250s' is beschadigd - foutief nummer voor onderdelen voor opgegeven groottes"
+msgstr ""
+"bestand `%.250s' is beschadigd - foutief nummer voor onderdelen voor "
+"opgegeven groottes"
 
 #: dpkg-split/info.c:157
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
-msgstr "bestand `%.250s' is beschadigd - grootte is fout voor opgegeven deelnummer"
+msgstr ""
+"bestand `%.250s' is beschadigd - grootte is fout voor opgegeven deelnummer"
 
 #: dpkg-split/info.c:163
 #, c-format
@@ -3889,8 +4040,7 @@ msgstr "kan onderdeelbestand `%.250s' niet vinden"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "bestand `%.250s' is beschadigd - te kort"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan archiefonderdeel, bestand `%.250s' niet openen"
@@ -3956,7 +4106,8 @@ msgstr "klaar\n"
 #: dpkg-split/join.c:84
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
-msgstr "bestanden `%.250s' en `%.250s' zijn geen onderdelen van het zelfde bestand"
+msgstr ""
+"bestanden `%.250s' en `%.250s' zijn geen onderdelen van het zelfde bestand"
 
 #: dpkg-split/join.c:89
 #, c-format
@@ -4009,7 +4160,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4018,7 +4170,8 @@ msgstr ""
 "Opties:\n"
 "    --depotdir <map>             (standaard is %s/%s)\n"
 "    -S|--partsize <grootte>      (in Kb, voor -s is standaard 450)\n"
-"    -o|--output <bestand>        (voor -j is standaard <pakket>-<versie>.deb)\n"
+"    -o|--output <bestand>        (voor -j is standaard <pakket>-<versie>."
+"deb)\n"
 "    -Q|--npquiet                 (stil als -a niet een deel is)\n"
 "    --msdos                      (genereer 8.3 bestandsnamen)\n"
 "\n"
@@ -4117,8 +4270,7 @@ msgstr "--listq verwacht geen argumenten"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Rommel achtergelaten in de depotmap:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "kan `%.250s' niet opvragen"
@@ -4183,11 +4335,9 @@ msgstr "bronbestand `%.250s' is geen gewoon bestand"
 msgid "unable to exec mksplit"
 msgstr "kan mksplit niet uitvoeren"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versie  %s.\n"
@@ -4200,11 +4350,9 @@ msgstr ""
 "\n"
 "Copyright (C) 996 Kim-Minh Kaplan"
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4233,26 +4381,22 @@ msgstr ""
 "  --help        toon deze helpboodschap.\n"
 "  --version   toon de versie.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: waarschuwing - kan %s niet ontgrendelen: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: onbekende optie '%s'"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: teveel argumenten"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: map vergrendelen voor aanpassen is mislukt! %s"
@@ -4262,48 +4406,40 @@ msgstr "%s: map vergrendelen voor aanpassen is mislukt! %s"
 msgid "try deleting %s"
 msgstr "probeer %s te verwijderen"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "kan %s niet openen: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "kan %s niet aanmaken: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "kan %s niet verwijderen: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "kan %s niet lezen: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "kan %s niet sluiten na lezen: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kan %s niet sluiten: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "kan geen reservekopie maken van oude %s, dit wordt opgegeven: %s"
@@ -4318,13 +4454,12 @@ msgstr "installeren van %s is mislukt: het wordt gelaten als %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: ontgrendelen van %s is mislukt: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Kan geen ENOENT-waarde krijgen van %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4334,7 +4469,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4346,7 +4481,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4359,7 +4495,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "Gebruik: %s [<optie> ...] <commando>\n"
 "\n"
@@ -4372,7 +4509,8 @@ msgstr ""
 "Opties:\n"
 "  --package <pakket>  naam van het pakket wiens kopie van <bestand niet\n"
 "                                     omgeleid zal wordt.\n"
-"  --local                         alle versies uit pakketten worden omgeleid.\n"
+"  --local                         alle versies uit pakketten worden "
+"omgeleid.\n"
 "  --divert <omleiden-naar> de naam die door versies in andere pakketten \n"
 "                                            gebruikt wordt.\n"
 "  --rename                   plaats het bestand aan de kant (of terug).\n"
@@ -4382,102 +4520,97 @@ msgstr ""
 "  --help                       toon deze helpboodschap.\n"
 "  --version                  toon de versie.\n"
 "\n"
-"Tijdens toevoegen is de standaardwaarde --local en --divert <origineel> distrib.\n"
-"Tijdens verwijderen moeten --package of --local en --divert overeenkomen indien\n"
+"Tijdens toevoegen is de standaardwaarde --local en --divert <origineel> "
+"distrib.\n"
+"Tijdens verwijderen moeten --package of --local en --divert overeenkomen "
+"indien\n"
 "opgegeven.\n"
-"Pakket preinst/postrm-scripts dienen altijd --package en--divert op te geven.\n"
+"Pakket preinst/postrm-scripts dienen altijd --package en--divert op te "
+"geven.\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "twee modes opgegeven: %s en --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s heeft een omleiden-naar argument nodig"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "omleiden-naar mag geen regeleinden bevatten"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s heeft een pakketnaam als argument nodig"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pakketnaam mag geen regeleinden bevatten"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s heeft een map als argument nodig"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "onbekende optie '%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "kan omleidingen-bestand niet openen: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "ontbrekende altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "ontbrekende pakketnaam"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s heeft een enkel argument nodig"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "bestandsnaam '%s' is niet absoluut"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "bestand mag geen regeleinden bevatten"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Kan geen mappen omleiden"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "'%s' wordt verlaten"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "'%s' conflicteert met '%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "'%s' wordt toegevoegd"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4488,7 +4621,7 @@ msgstr ""
 "  bij verwijderen van '%s'\n"
 "  '%s' gevonden"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4499,37 +4632,37 @@ msgstr ""
 "  bij verwijderen van '%s'\n"
 "  '%s' gevonden"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "%s wordt verwijderd"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Er is geen omleiding '%s', geen verwijderd"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "interne fout - slechte modus '%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "kan de status van de nieuwe naam %s niet opvragen: %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "'%s' wordt op fouten gecontroleerd: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4538,53 +4671,52 @@ msgstr ""
 "hernoemen omvat overschrijven van '%s' met\n"
 "  verschillend bestand '%s', niet toegelaten"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "hernomen: verwijderen van oude dubbele link '%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "hernoemen: '%s' wordt hernoemt naar '%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new aanmaken: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new schrijven:  %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new afsluiten:  %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "oude diversions-old verwijderen: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "nieuwe diversions-new aanmaken: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "nieuwe omleidingen installeren: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interne fout: %s is corrupt: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4592,7 +4724,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4615,119 +4747,121 @@ msgstr ""
 "\n"
 "C+ommando's:\n"
 "  --add <eigenaar> <groep> <modus> <bestand>\n"
-"                                        voeg een nieuwe ingang toe aan de database.\n"
+"                                        voeg een nieuwe ingang toe aan de "
+"database.\n"
 "  --remove <bestand>    verwijder bestand uit de database.\n"
-"  --list [<glob-patroon>]  toon de overstijgingen die momenteel in de database zitten.\n"
+"  --list [<glob-patroon>]  toon de overstijgingen die momenteel in de "
+"database zitten.\n"
 "\n"
 "Opties:\n"
 "  --admindir <map> stel de map met het 'statoverride'-bestand in.\n"
 "  --update                 bestandsrechten onmiddellijk bijwerken.\n"
-"  --force                     actie afdwingen zelfs als de gezondheid-check mislukt.\n"
+"  --force                     actie afdwingen zelfs als de gezondheid-check "
+"mislukt.\n"
 "  --quiet                     stille operatie, minimale uitvoer.\n"
 "  --help                      toon deze helpboodschap.\n"
 "  --version                 toon de versie.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "geen modus opgegeven"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add heeft een vier argumenten nodig"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "illegale gebruiker %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "niet-bestaande gebruiker %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "illegale groep %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "niet-bestaande groep %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "illegale modus %s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "/ op einde wordt weggehaald"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Er bestaat reeds een overstijging '%s'"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "maar --force is opgegeven waardoor dit genegeerd wordt."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "er wordt afgebroken"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "waarschuwing: --update is opgegeven maar %s bestaat niet"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "chown op %s is mislukt: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod op %s is mislukt: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Geen overstijging aanwezig"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "waarschuwing: --update is waardeloos voor --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "kan statoverride-bestand niet openen: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Meerder overstijgingen voor '%s', er wordt afgebroken"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "kan nieuw statoverride-bestand niet openen: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "fout bij verwijderen van statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "fout bij aanmaken van nieuwe statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "fout bij installeren van nieuwe statoverride: %s"
@@ -4748,15 +4882,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4768,19 +4905,28 @@ msgstr ""
 "\n"
 "Opties:\n"
 "  --section <regexp> <titel>\n"
-"                           zet de nieuwe ingang in de met <regex> overeenkomende sectie\n"
-"                           of maak een nieuwe aan met <titel> indien onbestaand.\n"
+"                           zet de nieuwe ingang in de met <regex> "
+"overeenkomende sectie\n"
+"                           of maak een nieuwe aan met <titel> indien "
+"onbestaand.\n"
 "  --menuentry=<tekst> stel de menu-ingang in.\n"
-"  --description=<tekst> stel de beschrijving te gebruiken in de menu-ingang in.\n"
-"  --info-file=<pad>         geef het in de map te installeren 'info'-bestand op.\n"
-"  --dir-file=<pad>           geef de bestandsnaam van het 'info map' bestand op.\n"
+"  --description=<tekst> stel de beschrijving te gebruiken in de menu-ingang "
+"in.\n"
+"  --info-file=<pad>         geef het in de map te installeren 'info'-bestand "
+"op.\n"
+"  --dir-file=<pad>           geef de bestandsnaam van het 'info map' bestand "
+"op.\n"
 "  --infodir=<map>          zoals '--dir-file=<map>/dir'.\n"
 "  --info-dir=<map>         idem.\n"
-"  --keep-old                      overschrijf geen ingangen, en verwijder geen lege.\n"
-"  --remove                       verwijder de door <bestandsnaam> basisnaam opgegeven ingang.\n"
+"  --keep-old                      overschrijf geen ingangen, en verwijder "
+"geen lege.\n"
+"  --remove                       verwijder de door <bestandsnaam> basisnaam "
+"opgegeven ingang.\n"
 "  --remove-exactly           verwijder de exacte <bestandsnaam> ingang.\n"
-"  --test                             activeert de test-modus (er worden geen acties uitgevoerd).\n"
-"  --debug                         activeert de debug-modus (toont meer informatie).\n"
+"  --test                             activeert de test-modus (er worden geen "
+"acties uitgevoerd).\n"
+"  --debug                         activeert de debug-modus (toont meer "
+"informatie).\n"
 "  --quiet                           toon geen boodchappen.\n"
 "  --help                            toon deze helpboodschap.\n"
 "  --version                       toon de versie.\n"
@@ -4818,7 +4964,8 @@ msgstr "%s: test modus - dir-bestand wordt niet bijgewerkt"
 #: scripts/install-info.pl:191
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
-msgstr "%s: waarschuwing, verwarrende INFO-DIR-ENTRY in bestand wordt genegeerd."
+msgstr ""
+"%s: waarschuwing, verwarrende INFO-DIR-ENTRY in bestand wordt genegeerd."
 
 #: scripts/install-info.pl:200
 msgid "invalid info entry"
@@ -4833,15 +4980,15 @@ msgid ""
 msgstr ""
 "\n"
 "Er is geen 'START-INFO-DIR-ENTRY' en geen 'This file documents'.\n"
-"%s: kan geen beschrijving voor 'dir'-ingang bepalen - poging wordt opgegeven\n"
+"%s: kan geen beschrijving voor 'dir'-ingang bepalen - poging wordt "
+"opgegeven\n"
 
 #: scripts/install-info.pl:279
 #, perl-format
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: geen bestand %s, reservekopie %s wordt opgehaald"
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: kopiëren van %s naar %s is mislukt, poging wordt opgegeven: %s"
@@ -4884,12 +5031,15 @@ msgstr "%s: nieuwe sectie '%s' wordt aangemaakt"
 #: scripts/install-info.pl:367
 #, perl-format
 msgid "%s: no sections yet, creating Miscellaneous section too."
-msgstr "%s: er zijn nog geen secties, 'Miscellaneous'-sectie wordt ook aangemaakt."
+msgstr ""
+"%s: er zijn nog geen secties, 'Miscellaneous'-sectie wordt ook aangemaakt."
 
 #: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
-msgstr "%s: er is geen sectie opgegeven voor de nieuwe ingang, wordt aan het einde geplaatst"
+msgstr ""
+"%s: er is geen sectie opgegeven voor de nieuwe ingang, wordt aan het einde "
+"geplaatst"
 
 #: scripts/install-info.pl:422
 #, perl-format
@@ -4941,7 +5091,7 @@ msgstr "kan %s niet lezen: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4951,8 +5101,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4961,22 +5111,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -4993,21 +5146,30 @@ msgstr ""
 "Commando's:\n"
 "  --install <link> <naam> <pad> <prioriteit>\n"
 "    [--slave <link> <naam> <pad>] ...\n"
-"                           voegt een groep van alternatieven toe aan het systeem.\n"
-"  --remove <naam> <pad> verwijderd <pad> van de groep alternatieven genaamd <naam>.\n"
-"  --remove-all <naam>        verwijderd <naam>-groep van het alternatieven-systeem.\n"
-"  --auto <naam>                  zet de hoofdlink <naam> om naar automatische modus.\n"
+"                           voegt een groep van alternatieven toe aan het "
+"systeem.\n"
+"  --remove <naam> <pad> verwijderd <pad> van de groep alternatieven genaamd "
+"<naam>.\n"
+"  --remove-all <naam>        verwijderd <naam>-groep van het alternatieven-"
+"systeem.\n"
+"  --auto <naam>                  zet de hoofdlink <naam> om naar "
+"automatische modus.\n"
 "  --display <naam>              toont informatie over de <naam>-groep.\n"
-"  --list <naam>                    toont informatie over alle doelen in de <naam>-groep.\n"
-"  --config <naam>               toont alle alternatieven voor de <naam>-groep en vraagt de \n"
+"  --list <naam>                    toont informatie over alle doelen in de "
+"<naam>-groep.\n"
+"  --config <naam>               toont alle alternatieven voor de <naam>-"
+"groep en vraagt de \n"
 "                                             gebruiker welke te gebruiken.\n"
 "  --set <naam> <pad>       stelt <pad> in als alternatief voor <naam>.\n"
-"  --all                                     roept --config aan voor alle alternatieven.\n"
+"  --all                                     roept --config aan voor alle "
+"alternatieven.\n"
 "\n"
-"<link> is de link die verwijst naar /etc/alternatives/<naam>  (vb. /usr/bin/pager).\n"
+"<link> is de link die verwijst naar /etc/alternatives/<naam>  (vb. /usr/bin/"
+"pager).\n"
 "<naam> is de naam in /etc/alternatives (vb. pager).\n"
 "<pad> is de naam waarnaar verwezen wordt (vb. /usr/bin/less).\n"
-"<prioriteit> is een integer getal; opties met hogere nummers hebben hogere prioriteit in\n"
+"<prioriteit> is een integer getal; opties met hogere nummers hebben hogere "
+"prioriteit in\n"
 " automatische modus.\n"
 "\n"
 "Opties:\n"
@@ -5019,162 +5181,162 @@ msgstr ""
 "  --help                       toon deze helpboodschap.\n"
 "  --version                  toon de versie.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "onbekend argument '%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install heeft <link> <name> <path> <priority> nodig"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioriteit moet een integer getal zijn"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s heeft <naam> <pad> nodig"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s heeft <naam> nodig"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave heeft <link> <name> <path> nodig"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "slaaf-naam %s is gedupliceerd"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "slaaf-link %s is gedupliceerd"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "de naam %s is zowel hoofd als slaaf"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "de links %s is zowel hoofd als slaaf"
-
-#: scripts/update-alternatives.pl:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "--display, --config, --set, --install, --remove, --all, --remove-all of --auto is nodig"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave is enkel toegelaten met --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "dubbele 'slave' %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "slaaf-link is gelijk aan hoofdlink %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "dubbele 'slave'-link %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "dubbel pad %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioriteit %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt verwijderd van lijst van alternatieven."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt "
+"verwijderd van lijst van alternatieven."
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Er zijn geen alternatieven voor %s"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status is %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr "link verwijst momenteel naar %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr "link is momenteel afwezig"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "link is onleesbaar - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioriteit %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr "slaaf %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Geen versies beschikbaar"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Huidge 'beste' versie is %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "onbekend argument '%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install heeft <link> <name> <path> <priority> nodig"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioriteit moet een integer getal zijn"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s heeft <naam> <pad> nodig"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s heeft <naam> nodig"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave heeft <link> <name> <path> nodig"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "slaaf-naam %s is gedupliceerd"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "slaaf-link %s is gedupliceerd"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "de naam %s is zowel hoofd als slaaf"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "de links %s is zowel hoofd als slaaf"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"--display, --config, --set, --install, --remove, --all, --remove-all of --"
+"auto is nodig"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave is enkel toegelaten met --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Automatische selectie van %s wordt opgezet."
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "verwijderen van %s is mislukt: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5183,128 +5345,125 @@ msgstr ""
 "%s is veranderd (handmatig of door een script).\n"
 "Er wordt omgeschakeld naar enkel handmatige updates."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
-"Beschikbare versies van %s worden nagekeken, links in %s worden bijgewerkt ...\n"
+"Beschikbare versies van %s worden nagekeken, links in %s worden "
+"bijgewerkt ...\n"
 "(U kunt de symbolische koppelingen desgewenst zelf wijzigen - zie 'man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s-link wordt hernoemt van %s naar %s."
 
-#: scripts/update-alternatives.pl:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kan %s niet hernoemen naar %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slaaf-linknaam %s is dubbel"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
-msgstr "Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld naar automatische modus"
+msgstr ""
+"Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld "
+"naar automatische modus"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verouderde slaaf-link %s wordt weggegooid (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
-msgstr "Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust gelaten."
+msgstr ""
+"Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust "
+"gelaten."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
-msgstr "Om automatische opwaarderingen terug in te schakelen kunt 'update-alternatives --auto %s' gebruiken."
+msgstr ""
+"Om automatische opwaarderingen terug in te schakelen kunt 'update-"
+"alternatives --auto %s' gebruiken."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kan %s niet openen voor schrijven: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
-msgstr "Laatste pakket dat voorzag in %s (%s) is verwijderd, dit wordt verwijderd. "
+msgstr ""
+"Laatste pakket dat voorzag in %s (%s) is verwijderd, dit wordt verwijderd. "
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
-"waarschuwing: %s wordt verondersteld een symbolische koppeling naar %s te zijn\n"
+"waarschuwing: %s wordt verondersteld een symbolische koppeling naar %s te "
+"zijn\n"
 " (of onbestaand); echter readlink is mislukt: %s"
 
-#: scripts/update-alternatives.pl:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kan niet verzekeren dat %s niet bestaat: %s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kan %s niet installeren als %s: %s"
 
-#: scripts/update-alternatives.pl:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s) laten we zoals is, verwijzend naar %s."
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) wordt bijgewerkt om naar %s te verwijzen."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5313,14 +5472,13 @@ msgstr ""
 "waarschuwing: %s wordt verondersteld een slaaf-link te zijn voor\n"
 " %s, of onbestaand; echter readlink is mislukt: %s"
 
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) wordt verwijdert, niet toepasselijk met %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5329,7 +5487,7 @@ msgstr ""
 "Er is slechts 1 programma dat %s voorziet\n"
 "(%s). Er is niets in te stellen.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5342,44 +5500,53 @@ msgstr ""
 "  Selectie    Alternatieven\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "druk enter om de standaardwaarde [*] te behouden, of  geef het selectienumber in: "
+msgstr ""
+"druk enter om de standaardwaarde [*] te behouden, of  geef het "
+"selectienumber in: "
 
-#: scripts/update-alternatives.pl:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "'%s' wordt gebruikt om in '%s' te voorzien."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan geen alternatief '%s' vinden."
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fout bij schrijven naar stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
-msgstr "regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
+msgstr ""
+"regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "missend regeleinde na %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Ernstig probleem: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: uitvoeren van 'gzip -dc' is mislukt"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: uitvoeren van  'bzip2 -dc' is mislukt"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: uitvoeren van bzip2 %s is mislukt"
diff --git a/po/nn.po b/po/nn.po
index 96d67f66..bd607f26 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -62,72 +62,57 @@ msgstr "Systemfeil nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal nr. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: Klarte ikkje køyra gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: intern gzip-feil: «%s»"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: klarte ikkje køyra «gzip -dc»"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: intern bzip2-feil: «%s»"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: klarte ikkje køyra «bzip2 -dc»"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: Intern gzip-feil: Las: «%s»"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: Intern gzip-feil: lese(%i) != skrive(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: Klarte ikkje køyra gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: intern bzip2-feil: las: «%s»"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: intern bzip2-feil: skreiv: «%s»"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: intern bzip2-feil: lese(%i) != skrive(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: klarte ikkje køyra bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
@@ -172,7 +157,7 @@ msgstr "klarte ikkje skanna oppdateringskatalogen «%.255s»"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "klarte ikkje fjerna den innlemma oppdateringsfila %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "klarte ikkje oppretta «%.255s»"
@@ -905,30 +890,30 @@ msgstr "Høgreparentes manglar i formatet\n"
 msgid "failed to realloc for variable buffer"
 msgstr "klarte ikkje tildela på nytt for variabel buffer"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... manglar frå før!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "feil ved lesing frå dpkg-deb-røyr"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "feil ved setjing av tidsmerke for «%.255s»"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "feil ved setjing av eigarskap for «%.255s»"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "feil ved setjing av filrettar for «%.255s»"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -937,16 +922,16 @@ msgstr ""
 "prøver å skriva over «%.250s», som er den omdirigerte versjonen av "
 "«%.250s»%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakke: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "fann ikkje «%.255s» (som eg skulle til å installera)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -955,28 +940,28 @@ msgstr ""
 "klarte ikkje rydda opp i rotet rundt «%.255s» før ein annan versjon skulle "
 "installerast"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "fann ikkje gjenoppretta «%.255s» før ein annan versjon skulle installerast"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet inneheldt objektet «%.255s» med ukjend type 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Byter ut filer i den gamle pakken %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Bytta ut med filer i den installerte pakken %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -984,89 +969,89 @@ msgstr ""
 "prøver å skriva over katalogen «%.250s» i pakken %.250s med noko anna enn "
 "ein katalog"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "prøver å skriva over «%.250s», som òg finst i pakken %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "Las og hoppa forbi fila «%.255s»"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakgrunnssystem dpkg-deb under «%.255s»"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "feil ved lukking/skriving av «%.255s»"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "feil ved oppretting av røyr «%.255s»"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "feil ved oppretting av hard lenkje «%.255s»"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "feil ved oppretting av symbolsk lenkje «%.255s»"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "feil ved setjing av eigarskap for den symbolske lenkja «%.255s»"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "feil ved oppretting av katalogen «%.255s»"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "klarte ikkje flytta «%.255s» for å installera ein ny versjon"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "klarte ikkje lesa lenkja «%.255s»"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "klarte ikkje endra eigarskapen til den symbolske lenkja «%.255s»"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "klarte ikkje laga sikringskopi av lenkja «%.255s» før ein ny versjon skulle "
 "installerast"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1075,7 +1060,7 @@ msgstr ""
 "dpkg: Åtvaring - ignorerer kravproblem ved fjerning av %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1084,7 +1069,7 @@ msgstr ""
 "dpkg: Åtvaring - vurderer fjerning av oppsett for den nødvendige\n"
 " pakken %s for å kunna fjerna %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1093,7 +1078,7 @@ msgstr ""
 "dpkg: Nei, %s er nødvendig. Vil ikkje fjerna oppsettet\n"
 " for å kunna fjerna %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1102,22 +1087,22 @@ msgstr ""
 "dpkg: Nei, kan ikkje fjerna %s (--auto-deconfigure kan hjelpa):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s er ikkje skikkeleg installert - ignorerer pakkekrav.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: Kan få problem med å fjerna %s, sidan han tilbyr %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1126,17 +1111,22 @@ msgstr ""
 "dpkg: Pakken %s krev installasjon på nytt, men vert fjerna likevel, sidan du "
 "ønskjer det.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: Pakken %s krev installasjon på nytt, så han vert ikkje fjerna.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1145,72 +1135,72 @@ msgstr ""
 "dpkg: Knytt til %s, som inneheld %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pakkar i konflikt - installerer ikkje %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive treng minst éin stigparameter"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "klarte ikkje køyra «find» for --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "klarte ikkje utføra «fdopen» på find-røyret"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "klarte ikkje lesa find-røyret"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "klarte ikkje lukka find-røyret"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerte den uforutsette feilen %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søkte, men fann ingen pakkar (filer med namn *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s treng minst éi pakkearkivfil som parameter"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versjon %.250s av %.250s er installert frå før, hoppar over.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - Åtvaring: Nedgraderer %.250s frå %.250s til %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1589,110 +1579,117 @@ msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 msgid "unable to check for existence of `%.250s'"
 msgstr "klarte ikkje sjekka om «%.250s» finst"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " krev "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " før-krev "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " tilrår "
 
-#: src/depcon.c:156
-msgid " breaks "
-msgstr ""
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " føreslår "
 
-#: src/depcon.c:157
-msgid " conflicts with "
-msgstr " er i konflikt med "
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
+msgstr "%s (underprosess): %s\n"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " føreslår "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " er i konflikt med "
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " forbetrar "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil verta fjerna.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  Oppsettet av %.250s vil verta fjerna.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s skal installerast, men versjonen er %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installert, men versjonen er %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er pakka ut, men er aldri sett opp.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er pakka ut, men versjonen er %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s siste oppsette versjon er %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "%.250s er %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernast.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tilbyr %.250s, men er %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikkje installert.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versjon %.250s) vil verta installert.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versjon %.250s) er %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tilbyr %.250s og skal installerast.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s tilbyr %.250s og er %s.\n"
@@ -2507,7 +2504,7 @@ msgstr "klarte ikkje opna «%i» for straum"
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "treng eit handlingsval"
@@ -2583,6 +2580,10 @@ msgstr "Pakken «%s» er ikkje installert.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "Pakken «%s» er ikkje installert.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " krev "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ". Men:\n"
@@ -2778,7 +2779,7 @@ msgstr "klarte ikkje køyra «fstat» på delfila «%.250s»"
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: %s: Åtvaring - oppsettsfila «%.250s» er inga vanleg fil eller symbolsk "
 "lenkje (= «%s»)\n"
@@ -3246,24 +3247,29 @@ msgstr "--forget-old-unavail tek ingen argument"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - feil: %s («%s») inneheld ingen tal\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build krev ein katalogparameter"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build tek høgst to parametrar"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "klarte ikkje sjekka om arkivet «%.250s» finst"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "målet er ein katalog - kan ikkje hoppa over kontrollfilsjekk"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3272,43 +3278,43 @@ msgstr ""
 "dpkg-deb: Åtvaring, sjekkar ikkje innhaldet i kontrollområdet.\n"
 "dpkg-deb: Byggjer ein ukjend pakke i «%s».\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "pakkenamnet har teikn som verken er små bokstavar, tal eller «-+.»"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "åtvaring, «%s» inneheld brukardefinert prioritetsverdi «%s»\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "åtvaring, «%s» inneheld brukardefinert felt «%s»\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d feil i kontrollfila"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: Byggjer pakken «%s» i «%s».\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "kontrollkatalogen har feil tilgangsløyve %03lo (må vera >=0755 og <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "vedlikehaldarskriptet «%.50s» er verken ei rein fil eller ei symbolsk lenkje"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3317,16 +3323,16 @@ msgstr ""
 "vedlikehaldarskriptet «%.50s» har feil tilgangsløyve %03lo (må vera >=0555 "
 "og <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "finn ikkje vedlikehaldarskriptet «%.50s»"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "tom streng frå «fgets» ved lesing av oppsettsfiler"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3334,119 +3340,119 @@ msgstr ""
 "åtvaring, namnet på oppsettsfila «%.50s...» er for langt eller manglar "
 "linjeskift til slutt\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, fuzzy, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "åtvaring, oppsettsfila «%s» er inga vanleg fil\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "oppsettsfila «%.250s» finst ikkje i pakken"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "finn ikkje oppsettsfila «%.250s»"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "åtvaring, oppsettsfila «%s» er inga vanleg fil\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "feil ved lesing av «conffiles»-fila"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "feil ved opning av «conffiles»-fila"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: Ignorerer %d åtvaringar om kontrollfilene\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "klarte ikkje lukka mellomlager for «%.255s»"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "klarte ikkje skifta katalog til «%.255s»"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "klarte ikkje skifta katalog til .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "klarte ikkje køyra «tar -cf»"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "klarte ikkje oppretta mellombels fil (kontroll)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "klarte ikkje opna mellombels fil (kontroll), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "klarte ikkje fjerna lenkje til mellombels fil (kontroll), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "kontroll"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "klarte ikkje køyra «fstat» på mellombels fil (kontroll)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "klarte ikkje hoppa tilbake i mellombels fil (kontroll)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "klarte ikkje oppretta mellombels fil (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "klarte ikkje opna mellombels fil (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "klarte ikkje fjerna lenkje til mellombels fil (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "klarte ikkje køyra «find»"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "klarte ikkje skriva filnamn til tar-røyr (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Intern feil; kompresjonstype «%i» ukjent!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "klarte ikkje hoppa tilbake i mellombels fil (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3524,23 +3530,23 @@ msgstr "arkivet manglar punktum i versjonsnummeret"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "skjønar ikkje arkivversjonen %.250s. Du treng ein nyare dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "hoppa over medlemsdata frå %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "fila «%.250s» inneheld eit datamedlem %.*s som eg ikkje skjønar. Gjev opp"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "fila «%.250s» inneheld to kontrollmedlemmer. Gjev opp"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3549,17 +3555,17 @@ msgstr ""
 " ny Debian-pakke, versjon %s.\n"
 " storleik %ld byte: kontrollarkiv = %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 #, fuzzy
 msgid "control information length"
 msgstr "kontrollinformasjonslengd"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, fuzzy, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arkivet har ei misforma kontrollengd «%s»"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3568,17 +3574,17 @@ msgstr ""
 " gammal Debian-pakke, versjon %s.\n"
 " storleik %ld byte: kontrollarkiv = %zi, hovudarkiv = %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 #, fuzzy
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Feil ved tildeling av minne til cfgfilename"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 #, fuzzy
 msgid "control area"
 msgstr "kontrollområde"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3587,66 +3593,66 @@ msgstr ""
 "dpkg-deb: Det ser ut til at fila er eit arkiv som har blitt\n"
 "dpkg-deb:    øydelagt fordi det er lasta ned i ASCII-modus.\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "«%.255s» er ikkje eit arkiv i Debian-format"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 #, fuzzy
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "klarte ikkje køyra «fdopen p1» i innsetjing"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "klarte ikkje skriva til «gzip -dc»"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "klarte ikkje lukka «gzip -dc»"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "klarte ikkje utføra systemkallet «lseek» på arkivfildelen"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "klarte ikkje skriva til røyret i «copy»"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "klarte ikkje lukka røyret i «copy»"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "klarte ikkje oppretta katalog"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "klarte ikkje skifta til katalogen etter å ha oppretta han"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "klarte ikkje skifta til katalog"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "klarte ikkje køyra «tar»"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s krev eit .deb-filnamn som parameter"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3655,12 +3661,12 @@ msgstr ""
 "--%s krev ein målkatalog.\n"
 "Kan det henda du meinte å bruka «dpkg --install»?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s tek høgst to parametrar (.deb og katalog)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tek berre éin parameter (.deb-filnamn)"
@@ -3811,7 +3817,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3832,7 +3839,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installera og avinstallera pakkar."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjend komprimeringstype «%s»!"
@@ -4196,9 +4203,9 @@ msgstr "kjeldefila «%.250s» er inga vanleg fil"
 msgid "unable to exec mksplit"
 msgstr "klarte ikkje køyra «mksplit»"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "' versjon for pakkearkivmotoren "
@@ -4209,9 +4216,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 #, fuzzy
 msgid ""
 "\n"
@@ -4260,7 +4267,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, fuzzy, perl-format
 msgid "unable to open %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4287,7 +4294,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikkje lukka etter lesing: «%.255s»"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4307,19 +4314,19 @@ msgstr "klarte ikkje installera «%.250s» som «%.250s»"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: Klarte ikkje køyra gzip %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4349,93 +4356,93 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, fuzzy, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--build krev ein katalogparameter"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, fuzzy, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s treng minst eitt pakkenamn som parameter"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build krev ein katalogparameter"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent val --%s"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, fuzzy, perl-format
 msgid "cannot open diversions: %s"
 msgstr "klarte ikkje opna omdirigeringsfil"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 #, fuzzy
 msgid "missing altname"
 msgstr "manglar %s"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 #, fuzzy
 msgid "missing package"
 msgstr "manglar %s"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, fuzzy, perl-format
 msgid "--%s needs a single argument"
 msgstr "--build krev ein katalogparameter"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, fuzzy, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "finn ikkje oppsettsfila «%.250s»"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "klarte ikkje lesa infokatalogen"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, fuzzy, perl-format
 msgid "Leaving `%s'"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4443,7 +4450,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4451,96 +4458,96 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, fuzzy, perl-format
 msgid "Removing `%s'"
 msgstr "Fjernar %s ...\n"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, fuzzy, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "%s: Intern gzip-feil: Las: «%s»"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, fuzzy, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, fuzzy, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, 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:260
+#: scripts/dpkg-divert.pl:275
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "lesefeil i omdirigeringsfila [i]"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "omdirigert med %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "omdirigert med %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "lesefeil i omdirigeringsfila [i]"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4560,108 +4567,108 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build krev ein katalogparameter"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 #, fuzzy
 msgid "aborting"
 msgstr "Ã¥tvaring"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, fuzzy, perl-format
 msgid "failed to chown %s: %s"
 msgstr "klarte ikkje køyra %s (%.250s)"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, fuzzy, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "klarte ikkje køyra %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, fuzzy, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "klarte ikkje opna «statoverride»-fila"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, fuzzy, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "klarte ikkje opna «statoverride»-fila"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, fuzzy, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4852,14 +4859,14 @@ msgstr "klarte ikkje køyra %s"
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4880,7 +4887,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4900,292 +4907,291 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, fuzzy, perl-format
-msgid "unknown argument `%s'"
-msgstr "ukjend komprimeringstype «%s»!"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr ""
-
-#: scripts/update-alternatives.pl:136
-#, fuzzy, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s krev eit .deb-filnamn som parameter"
-
-#: scripts/update-alternatives.pl:141
-#, fuzzy, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s tek ingen parametrar"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr ""
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, fuzzy, perl-format
 msgid "duplicate slave %s"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, fuzzy, perl-format
 msgid "duplicate slave link %s"
 msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 #, fuzzy
 msgid "No versions available."
 msgstr "(inga skildring tilgjengeleg)"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, fuzzy, perl-format
+msgid "unknown argument `%s'"
+msgstr "ukjend komprimeringstype «%s»!"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s krev eit .deb-filnamn som parameter"
+
+#: scripts/update-alternatives.pl:261
+#, fuzzy, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s tek ingen parametrar"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr ""
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "klarte ikkje køyra %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "finn ikkje %s «%.250s»"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "klarte ikkje køyra nytt %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "klarte ikkje installera «%.250s» som «%.250s»"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5194,45 +5200,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "fila «%.250s» er øydelagd - manglar linjeskift etter %.250s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: klarte ikkje køyra «gzip -dc»"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: klarte ikkje køyra «bzip2 -dc»"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: klarte ikkje køyra bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "klarte ikkje oppretta %.250s"
 
diff --git a/po/pa.po b/po/pa.po
index 75522cb6..2fa0b76a 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -59,72 +59,57 @@ msgstr "ਸਿਸਟਮ ਗਲਤੀ ਨੰ: %d"
 msgid "Signal no.%d"
 msgstr "ਸਿਗਨਲ ਨੰ.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: ਅੰਦਰੂਨ gzip ਗਲਤੀ: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr ""
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr ""
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr ""
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: ਡੀਕਪ੍ਰੈਸ਼ਨ"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: ਅੰਦਰੂਨੀ gzip ਗਲਤੀ: ਪੜ੍ਹਨ: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: ਅੰਦਰੂਨੀ gzip ਗਲਤੀ: ਲਿਖਣ: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: ਅੰਦਰੂਨੀ gzip ਗਲਤੀ: ਪੜ੍ਹਨ(%i) != ਲਿਖਣ(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr ""
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr ""
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr ""
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr ""
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr ""
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr ""
@@ -152,7 +137,8 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
 #: lib/dbmodify.c:77
@@ -165,7 +151,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -415,7 +401,8 @@ msgstr ""
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
 #: lib/fields.c:340
@@ -876,290 +863,296 @@ msgstr ""
 msgid "failed to realloc for variable buffer"
 msgstr ""
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr ""
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr ""
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr ""
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
 msgstr ""
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (ਪੈਕੇਜ: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr ""
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr ""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
 msgstr ""
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr ""
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr ""
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1488,110 +1481,117 @@ msgstr ""
 msgid "unable to check for existence of `%.250s'"
 msgstr ""
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " ਨਿਰਭਰ ਹੈ "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " ਪਹਿਲਾਂ ਨਿਰਭਰ ਹੈ "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " ਸਿਫਾਰਸ਼ੀ "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " ਸੁਝਾਅ "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " ਬਰੇਕ "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " ਅਪਵਾਦ ਹੈ "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " ਸੁਝਾਅ "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, c-format
+msgid "%s enhances %s"
 msgstr ""
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ਇੰਸਟਾਲ ਹੈ, ਪਰ ਵਰਜਨ %.250s ਹੈ।\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s %s ਹੈ।\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ, ਪਰ %s ਹੈ।\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (ਵਰਜਨ %.250s) ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (ਵਰਜਨ %.250s) %s ਹੈ।\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s %.250s ਦਿੰਦਾ ਹੈ ਅਤੇ %s ਹੈ\n"
@@ -1687,7 +1687,8 @@ msgid "--print-architecture does not take any argument"
 msgstr ""
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
 #: src/enquiry.c:424
@@ -1707,7 +1708,8 @@ msgid ""
 msgstr ""
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 
 #: src/errors.c:91
@@ -1730,7 +1732,8 @@ msgstr ""
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
 #: src/errors.c:125
@@ -2405,7 +2408,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
@@ -2478,6 +2481,10 @@ msgstr ""
 msgid "  Package %s is not installed.\n"
 msgstr "  ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " ਨਿਰਭਰ ਹੈ "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; ਪਰ:\n"
@@ -2665,7 +2672,7 @@ msgstr ""
 #, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 
 #: src/processarc.c:715
@@ -2886,7 +2893,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 
 #: src/remove.c:100
@@ -3087,198 +3095,204 @@ msgstr ""
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr ""
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr ""
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ %d 'ਚ ਗਲਤੀਆਂ"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr ""
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr ""
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "ਕੰਟਰੋਲ"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "ਡਾਟਾ"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr ""
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (ਡਾਟਾ)"
 
@@ -3355,22 +3369,22 @@ msgstr ""
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3379,108 +3393,108 @@ msgstr ""
 " ਨਵਾਂ ਡੇਬੀਅਨ ਪੈਕੇਜ, ਵਰਜਨ %s।\n"
 " ਆਕਾਰ %ld ਬਾਈਟ: ਕੰਟਰੋਲ ਅਰਾਚੀਵ: %zi ਬਾਈਟ।\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "ਕੰਟਰੋਲ ਜਾਣਕਾਰੀ ਲੰਬਾਈ"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr ""
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "ਕੰਟਰੋਲ ਏਰੀਆ"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਬਾਅਦ ਇਸ 'ਚ ਜਾਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3630,7 +3644,7 @@ msgid ""
 msgstr ""
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3641,7 +3655,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Options:\n"
@@ -3671,7 +3686,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4044,9 +4059,9 @@ msgstr ""
 msgid "unable to exec mksplit"
 msgstr ""
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "ਡੇਬੀਅਨ %s ਵਰਜਨ %s\n"
@@ -4059,9 +4074,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4113,7 +4128,7 @@ msgid "try deleting %s"
 msgstr "%s ਹਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਜਾਰੀ"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
@@ -4140,7 +4155,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4160,12 +4175,12 @@ msgstr ""
 msgid "%s: unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4175,7 +4190,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4230,89 +4245,89 @@ msgstr ""
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "ਗੁੰਮ ਪੈਕੇਜ"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "ਫਾਇਲ ਨਾਂ \"%s\" ਪੂਰਾ ਨਹੀਂ ਹੈ"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "`%s' ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "`%s' ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4320,7 +4335,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4328,89 +4343,89 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "`%s' ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: %s ਨਿਕਾਰਾ: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4418,7 +4433,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4453,106 +4468,106 @@ msgstr ""
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "ਕੋਈ ਢੰਗ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ਗਲਤ ਉਪਭੋਗੀ %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "ਨਾ-ਮੌਜੂਦ ਉਪਭੋਗੀ %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ਗਲਤ ਗਰੁੱਪ %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4768,7 +4783,7 @@ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4778,8 +4793,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4799,7 +4814,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -4855,293 +4870,292 @@ msgstr ""
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install needs <link> <name> <path> <priority>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s needs <name> <path>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s needs <name>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave needs <link> <name> <path>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave only allowed with --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "ਦੁਹਰਾ ਸਲੇਵ %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "ਦੁਹਰਾ ਮਾਰਗ %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "ਤਰਜੀਹ %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - ਹਾਲਤ %s ਹੈ।"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ਸਬੰਧ %s ਨੂੰ ਇਸ਼ਾਰਾ ਕਰਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " ਸਬੰਧ ਇਸ ਸਮੇਂ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ਸਬੰਧ ਪੜ੍ਹਨਯੋਗ ਨਹੀਂ - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - ਤਰਜੀਹ %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " ਸਲੇਵ %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "ਕੋਈ ਵਰਜਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "%s ਦਾ ਮੌਜੂਦਾ`best' ਵਰਜਨ ਹੈ।"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install needs <link> <name> <path> <priority>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s needs <name> <path>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s needs <name>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave needs <link> <name> <path>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave only allowed with --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਚੋਣ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5150,42 +5164,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "ਨਵੀਂ-ਲਾਇਨ %s ਬਾਅਦ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "ਗੰਭੀਰ ਸਮੱਸਿਆ: %s"
-
diff --git a/po/pl.po b/po/pl.po
index d1f7d0c7..76757dd2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,17 +4,18 @@
 # Bartosz Feñski <fenio@debian.org>, 2004-2005
 # Robert Luberda <robert@debian.org>, 2006 - 2007
 msgid ""
-msgstr "Project-Id-Version: dpkg 1.14.0\n"
+msgstr ""
+"Project-Id-Version: dpkg 1.14.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2007-03-18 15:09+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 ||"
-" n%100>=20) ? 1 : 2;\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -58,72 +59,57 @@ msgstr "B
 msgid "Signal no.%d"
 msgstr "Sygna³ nr %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: nie mo¿na wykonaæ `gzip %s'"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: wewnêtrzny b³±d gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: nie mo¿na wywo³aæ gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: wewnêtrzny b³±d bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: nie mo¿na wywo³aæ bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresja"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: wewnêtrzny b³±d gzip: czytanie: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: wewnêtrzny b³±d gzip: zapis: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: wewnêtrzny b³±d gzip: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: nie mo¿na wykonaæ `gzip %s'"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: wewnêtrzny b³±d bzip2: czytanie: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: wewnêtrzny b³±d bzip2: zapis: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: wewnêtrzny b³±d bzip2: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: nie mo¿na wykonaæ bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresja"
@@ -167,7 +153,7 @@ msgstr "nie mo
 msgid "failed to remove incorporated update file %.255s"
 msgstr "nie mo¿na usun±æ pliku %.255s z katalogu `updates'"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nie mo¿na utworzyæ `%.255s'"
@@ -902,30 +888,30 @@ msgstr "W formacie brakuje nawiasu zamykaj
 msgid "failed to realloc for variable buffer"
 msgstr "nie mo¿na wykonaæ funkcji `realloc' dla zmiennej bufora"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  znikn±³!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "nie mo¿na odczytaæ potoku z `dpkg-deb'"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "nie mo¿na zaktualizowaæ czasu dla `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "nie mo¿na zmieniæ w³a¶ciciela `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "nie mo¿na zmieniæ uprawnieñ `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -933,16 +919,16 @@ msgid ""
 msgstr ""
 "próba nadpisania `%.250s', który jest ominiêciem `%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakiet: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "nie mo¿na ustaliæ stanu `%.255s'"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -951,29 +937,29 @@ msgstr ""
 "nie mo¿na wyczy¶ciæ `%.255s' dopóki nie zostanie zainstalowana inna jego "
 "wersja"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "nie mo¿na ustaliæ stanu `%.255s' dopóki nie zostanie zainstalowana inna jego "
 "wersja"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archiwum zawiera obiekt `%.255s' nieznanego typu 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Zast±pienie plików z poprzedniego pakietu %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Zast±pienie przez pliki z instalowanego pakietu %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -981,90 +967,90 @@ msgstr ""
 "próba nadpisania katalogu `%.250s' przez obiekt nie bêd±cy katalogiem z "
 "pakietu %.250s"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "próba nadpisania `%.250s', który istnieje tak¿e w pakiecie %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "pominiêcie zast±pionego pliku `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "uruchomiony dpkg-deb podczas `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "nie mo¿na zamkn±æ/zapisaæ `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "nie mo¿na utworzyæ potoku `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "nie mo¿na utworzyæ urz±dzenia `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "nie mo¿na utworzyæ dowi±zania `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "nie mo¿na utworzyæ symbolicznego dowi±zania `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "nie mo¿na zmieniæ w³a¶ciciela symbolicznego dowi±zania `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "nie mo¿na utworzyæ katalogu `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nie mo¿na przenie¶æ `%.255s', aby zainstalowaæ now± wersjê"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nie mo¿na odczytaæ dowi±zania `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nie mo¿na zrobiæ kopii symbolicznego dowi±zania dla `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "nie mo¿na zmieniæ w³a¶ciciela kopii symbolicznego dowi±zania dla `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "nie mo¿na zrobiæ kopii dowi±zania dla `%.255s' dopóki nie zostanie "
 "zainstalowana inna jego wersja"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nie mo¿na zainstalowaæ nowej wersji `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1073,7 +1059,7 @@ msgstr ""
 "dpkg: ostrze¿enie - zignorowanie problemu z zale¿no¶ciami przy usuwaniu %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1082,7 +1068,7 @@ msgstr ""
 "dpkg: ostrze¿enie - dekonfiguracja istotnego pakietu %s,\n"
 " aby usun±æ %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1091,7 +1077,7 @@ msgstr ""
 "dpkg: niestety, %s jest istotnym pakietem, który nie zostanie\n"
 " zdekonfigurowany, aby usun±æ %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1100,24 +1086,24 @@ msgstr ""
 "dpkg: niestety, nie mo¿na usun±æ %s (--auto-deconfigure mo¿e pomóc):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: usuwanie %s w zamian za %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s nie jest poprawnie zainstalowany - ignorowanie zale¿no¶ci od niego.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: mog± wyst±piæ problemy przy usuwaniu %s, jako ¿e dostarcza %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1125,17 +1111,22 @@ msgid ""
 msgstr ""
 "dpkg: pakiet %s wymaga reinstalacji, ale zostanie usuniêty wed³ug ¿±dania.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pakiet %s wymaga reinstalacji i nie zostanie usuniêty.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: tak, %s zostanie usuniêty w zamian za %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1144,74 +1135,74 @@ msgstr ""
 "dpkg: w odniesieniu do %s zawieraj±cego %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt pakietów - nie bêdzie instalowany %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: ostrze¿enie - zignorowanie konfliktu, dalsze przetwarzanie!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive wymaga co najmniej jednego argumentu bêd±cego ¶cie¿k±"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "nie mo¿na wykonaæ polecenia `find' dla --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "nie mo¿na utworzyæ potoku dla `find'"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "nie mo¿na odczytaæ z potoku z `find'"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "nie mo¿na zamkn±æ potoku z `find'"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "wyszukiwanie --recursive zwróci³o nieobs³ugiwany b³±d %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "przeszukane, ale nie znaleziono ¿adnych pakietów (plików *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s wymaga co najmniej jednego argumentu bêd±cego plikiem archiwum"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Zaznaczenie poprzednio niezaznaczonego pakietu %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Pominiêcie niezaznaczonego pakietu %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Wersja %.250s pakietu %.250s jest ju¿ zainstalowana.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - ostrze¿enie: zast±pienie %.250s w wersji %.250s wcze¶niejsz± wersj± "
 "%.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1593,111 +1584,118 @@ msgstr "EOF ze stdin wprowadzony ze znaku zach
 msgid "unable to check for existence of `%.250s'"
 msgstr "nie mo¿na sprawdziæ istnienia `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " zale¿y od "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " zale¿y-przed od "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " poleca "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " sugeruje "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " przerywa "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " w konflikcie z "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " sugeruje "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " rozszerza "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s jest przeznaczony do usuniêcia.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s jest przeznaczony do zdekonfigurowania.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s jest przeznaczony do zainstalowania, ale w wersji %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s jest zainstalowany, ale w wersji %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s jest rozpakowany, ale nie by³ jeszcze skonfigurowany.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s jest rozpakowany, ale w wersji %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ma skonfigurowan± wersjê %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s jest %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s dostarcza %.250s ale jest przeznaczony do usuniêcia.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s dostarcza %.250s ale jest przeznaczony do zdekonfigurowania.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s dostarcza %.250s ale jest %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nie jest zainstalowany.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (wersja %.250s) jest przeznaczony do zainstalowania.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (wersja %.250s) jest %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s dostarcza %.250s i jest przeznaczony do zainstalowania.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s dostarcza %.250s i jest %s.\n"
@@ -2583,7 +2581,7 @@ msgstr "nie uda
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "nale¿y okre¶liæ dzia³anie"
@@ -2661,6 +2659,10 @@ msgstr "  Pakiet %s dostarczaj
 msgid "  Package %s is not installed.\n"
 msgstr "  Pakiet %s nie jest zainstalowany.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " zale¿y od "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; jednak¿e:\n"
@@ -2739,7 +2741,8 @@ msgstr "architektura pakietu (%s) nie zgadza si
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 " package uses Breaks; not supported in this dpkg\n"
-msgstr "dpkg: odno¶nie do %s zawieraj±cego %s:\n"
+msgstr ""
+"dpkg: odno¶nie do %s zawieraj±cego %s:\n"
 " pakiet u¿ywa Przerwañ, czego ta wersja dpkg nie obs³uguje\n"
 
 #: src/processarc.c:260
@@ -2857,10 +2860,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "nie mo¿na zbadaæ stanu nowego pliku `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: ostrze¿enie - stary plik konfiguracyjny `%.250s' jest taki sam, jak "
 "kilka nowych plików (zarówno `%.250s, jak i `%.250s')"
@@ -3329,24 +3332,29 @@ msgstr "--forget-old-unavail wymaga niepodawania argumentu"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - b³±d: %s (`%s') nie zawiera ¿adnej cyfry\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build wymaga podania argumentu bêd±cego katalogiem"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build wymaga podania najwy¿ej dwóch argumentów"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "nie mo¿na sprawdziæ istnienia archiwum `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "cel jest katalogiem - nie mo¿na dokonaæ sprawdzenia pliku kontrolnego"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3355,44 +3363,44 @@ msgstr ""
 "dpkg-deb: ostrze¿enie, zawarto¶æ pliku kontrolnego nie bêdzie sprawdzana.\n"
 "dpkg-deb: budowanie nieznanego pakietu w `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "nazwa pakietu zawiera znaki nie bêd±ce ma³ymi literami, cyframi lub `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "ostrze¿enie, `%s' zawiera zdefiniowany przez u¿ytkownika Priorytet `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "ostrze¿enie, `%s' zawiera pole zdefiniowane przez u¿ytkownika `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d b³êdów w pliku kontrolnym"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: budowanie pakietu `%s' w `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "katalog kontrolny ma z³e prawa %03lo (musz± byæ >=0755 oraz <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "skrypt instalacyjny `%.50s' nie jest plikiem ani symbolicznym dowi±zaniem"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3400,18 +3408,18 @@ msgid ""
 msgstr ""
 "skrypt instalacyjny `%.50s' ma z³e prawa %03lo (musz± byæ >=0555 oraz <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "nie mo¿na sprawdziæ stanu skryptu instalacyjnego `%.50s'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 "funkcja `fgets' zwróci³a pusty ci±g znaków podczas odczytu pliku "
 "konfiguracyjnego"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3419,119 +3427,119 @@ msgstr ""
 "ostrze¿enie, nazwa pliku konfiguracyjnego `%.50s...' jest za d³uga lub brak "
 "w niej znaku koñca linii\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "ostrze¿enie, nazwa pliku konfiguracyjnego `%s' koñczy siê spacjami\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "plik konfiguracyjny `%.250s' nie zosta³ odnaleziony w pakiecie"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "nie mo¿na sprawdziæ stanu pliku konfiguracyjnego `%.250s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "ostrze¿enie, plik konfiguracyjny `%s' nie jest plikiem\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "nie mo¿na odczytaæ pliku konfiguracyjnego"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "nie mo¿na otworzyæ pliku konfiguracyjnego"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: zignorowanie %d ostrze¿eñ na temat plików informacyjnych\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "nie mo¿na wykonaæ funkcji `setvbuf' dla `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nie mo¿na zmieniæ katalogu na `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "nie mo¿na zmieniæ katalogu na .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "nie mo¿na wykonaæ `tar -cf'"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "nie mo¿na utworzyæ tymczasowego pliku (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "nie mo¿na otworzyæ tymczasowego pliku (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "nie mo¿na usun±æ tymczasowego pliku (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "nie mo¿na sprawdziæ stanu tymczasowego pliku (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "nie mo¿na przewin±æ tymczasowego pliku (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "nie mo¿na utworzyæ tymczasowego pliku (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "nie mo¿na otworzyæ tymczasowego pliku (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "nie mo¿na usun±æ tymczasowego pliku (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dane"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "nie mo¿na wywo³aæ `find'"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "nie mo¿na pisaæ nazwy pliku do potoku do programu tar (dane)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "B³±d wewnêtrzny, compress_type '%i' nieznany!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "nie mo¿na przewin±æ tymczasowego pliku dla archiwum z danymi"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (dane)"
 
@@ -3612,22 +3620,22 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "archiwum w wersji %.250s jest nie obs³ugiwane, potrzebny jest nowy dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "pominiêto dane cz³onu z %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "plik `%.250s' zawiera nierozpoznane archiwum z danymi %.*s"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "plik `%.250s' zawiera dwa archiwa kontrolne"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3636,16 +3644,16 @@ msgstr ""
 " nowy pakiet debiana, wersja %s.\n"
 " rozmiar %ld bajtów: archiwum kontrolne= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "d³ugo¶æ informacji kontrolnej"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "archiwum ma uszkodzon± d³ugo¶æ kontroln± `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3654,15 +3662,15 @@ msgstr ""
 " poprzedni pakiet debiana, wersja %s.\n"
 " rozmiar %ld bajtów: archiwum kontrolne= %zi, archiwum z danymi= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "b³±d przydzielania pamiêci dla zmiennej `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "obszar kontrolny"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3671,65 +3679,65 @@ msgstr ""
 "dpkg-deb: plik wygl±da na archiwum, które zosta³o uszkodzone podczas\n"
 "dpkg-deb:    transferu FTP dokonanego w trybie ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nie jest plikiem archiwum Debiana"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "b³±d pobierania bie¿±cej pozycji w pliku"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "b³±d ustawiania bie¿±cej pozycji w pliku"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "nie mo¿na otworzyæ deskryptora potoku `1' dla funkcji `paste'"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "nie mo¿na zapisaæ potoku dla `gzip -dc'"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "nie mo¿na zamkn±æ potoku dla `gzip -dc'"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "nie mo¿na wykonaæ funkcji `syscall' dla `lseek'"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "nie mo¿na zapisaæ potoku dla funkcji `copy'"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "nie mo¿na zamkn±æ potoku dla funkcji `copy'"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "nie mo¿na utworzyæ katalogu"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "nie mo¿na zmieniæ katalogu po jego utworzeniu"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "nie mo¿na zmieniæ katalogu bie¿±cego"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "nie mo¿na wywo³aæ `tar'"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s wymaga podania nazwy pliku .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3738,12 +3746,12 @@ msgstr ""
 "--%s wymaga podania katalogu docelowego.\n"
 "Byæ mo¿e nale¿y u¿yæ dpkg --install"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s wymaga podania co najwy¿ej dwóch argumentów (.deb oraz katalogu)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s wymaga podania jednego argumentu (nazwy pliku .deb)"
@@ -3899,7 +3907,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3910,7 +3918,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opcje:\n"
@@ -3947,7 +3956,7 @@ msgstr ""
 "Wpisz dpkg-deb --help, aby dowiedzieæ siê jak operowaæ plikami *.deb;\n"
 "Wpisz dpkg --help, aby dowiedzieæ siê jak (od)instalowaæ pakiety."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "nieznany typ kompresji `%s'!"
@@ -4329,9 +4338,9 @@ msgstr "plik 
 msgid "unable to exec mksplit"
 msgstr "nie mo¿na wykonaæ mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
@@ -4344,9 +4353,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4403,7 +4412,7 @@ msgid "try deleting %s"
 msgstr "próba usuwania %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "nie mo¿na otworzyæ %s: %s"
@@ -4430,7 +4439,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nie mo¿na zamkn±æ %s po czytaniu: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nie mo¿na zamkn±æ %s: %s"
@@ -4450,12 +4459,12 @@ msgstr "b
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: nie mo¿na odblokowaæ %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Nie mo¿na pobraæ warto¶ci ENOENT z %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4465,7 +4474,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4520,89 +4529,89 @@ msgstr ""
 "podano.\n"
 "Skrypty przed/poinstalacyjne musz± zawsze podawaæ --package i --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "podano dwa tryby: %s i --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s wymaga podania argumentu divert-to"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nie mo¿e zawieraæ znaków nowej linii"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s wymaga podania argumentu <pakiet>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pakiet nie mo¿e zawieraæ znaków nowej linii"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s wymaga argumentu <katalog>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "nie mo¿na otworzyæ listy ominiêtych plików: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "brakuj±cy argument  altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "brakuj±cy pakiet"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s wymaga podania pojedynczego argumentu"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "nazwa pliku \"%s\" nie jest absolutna"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "plik nie mo¿e zawieraæ znaków nowej linii"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Nie mo¿na omijaæ katalogów"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Opuszczanie`%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' koliduje z `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Dodawanie `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4613,7 +4622,7 @@ msgstr ""
 "  podczas usuwania `%s'\n"
 "  znaleziono `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4624,37 +4633,37 @@ msgstr ""
 "  podczas usuwania `%s'\n"
 "  znaleziono `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Usuwanie `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Brak ominiêcia `%s', nic nie usuniêto"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "b³±d wewnêtrzny - niepoprawny tryb `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "nie mo¿na pobraæ statusu starego pliku `%s' : %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "nie mo¿na pobraæ statusu nowego pliku `%s' : %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "b³±d sprawdzania `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4663,52 +4672,52 @@ msgstr ""
 "zmiana nazwy oznacza nadpisanie `%s' \n"
 "  innym plikiem `%s', co nie jest dozwolone"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: usuwanie podwójnego starego dowi±zania `%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: zmienianie nazwy `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "tworzenie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zapisywanie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zamykanie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "usuwanie starego pliku diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "czytanie nowego pliku diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalowanie nowej listy ominiêæ: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "b³±d wewnêtrzny: uszkodzone %s: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4716,7 +4725,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4751,106 +4760,106 @@ msgstr ""
 "  --help                   wy¶wietla ten komunikat pomocy\n"
 "  --version                wy¶wietla informacje o wersji.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nie podano trybu"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add wymaga podania czterech argumentów"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "niew³a¶ciwy u¿ytkownik %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "u¿ytkownik %s nie istnieje"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "niew³a¶ciwa grupa %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "grupa %s nie istnieje"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "niew³a¶ciwy tryb %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "usuwanie koñcowych znaków /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Ju¿ istnieje nadpisanie dla \"%s\", "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "ale podano --force, wiêc zostanie zignorowany."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "przerywanie"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "ostrze¿enie: podano --update, ale %s nie istnieje"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "b³±d wykonania polecenia chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "b³±d wykonania polecenia chmod %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Brak nadpisania."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "ostrze¿enie: --update jest bezu¿yteczne w po³±czeniu z --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "nie mo¿na otworzyæ pliku statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Wiele nadpisañ dla \"%s\", przerywanie"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "nie mo¿na otworzyæ nowego pliku statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "b³±d usuwania statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "b³±d tworzenia nowego pliku statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "b³±d instalowania nowego pliku statoverride: %s"
@@ -5070,7 +5079,7 @@ msgstr "nie mo
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5080,8 +5089,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5101,7 +5110,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5154,95 +5163,36 @@ msgstr ""
 "  --help                   wy¶wietla ten komunikat pomocy\n"
 "  --version                wy¶wietla informacje o wersji.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "nieznany argument `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install wymaga podania <linku> <nazwy> <¶cie¿ki> <priorytetu>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "priorytet musi byæ liczb±"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s wymaga argumentów <nazwa> <¶cie¿ka>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s wymaga <nazwy>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave wymaga <linku> <nazwy> <¶cie¿ki>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "podwojona nazwa podrzêdna %s"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "podwojone dowi±zanie podrzêdne %s"
-
-#: scripts/update-alternatives.pl:164
-#, 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:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"nale¿y podaæ --display, --config, --set, --install, --remove, --all, --"
-"remove-all lub --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave dopuszczalna tylko z --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "podwójna warto¶æ dowi±zania symbolicznego %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "dowi±zanie podrzêdne takie samo jak dowi±zanie g³ówne %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "podwojone dowi±zanie podrzêdne %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "zduplikowana ¶cie¿ka %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "priorytet %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5251,66 +5201,124 @@ msgstr ""
 "Alternatywa dla %s wskazuje na %s, który nie zosta³ znaleziony. Usuwanie jej "
 "z listy alternatyw."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Brak alternatyw dla %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status jest %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " link obecnie wskazuje na %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " obecnie brak dowi±zania"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " nie mo¿na odczytaæ dowi±zania - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorytet %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " dowi±zanie podrzêdne %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "¯adna wersja nie jest dostêpna."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Obecnie `najlepsz±' wersj± jest %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "nieznany argument `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install wymaga podania <linku> <nazwy> <¶cie¿ki> <priorytetu>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "priorytet musi byæ liczb±"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s wymaga argumentów <nazwa> <¶cie¿ka>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s wymaga <nazwy>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave wymaga <linku> <nazwy> <¶cie¿ki>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "podwojona nazwa podrzêdna %s"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "podwojone dowi±zanie podrzêdne %s"
+
+#: scripts/update-alternatives.pl:284
+#, 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:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"nale¿y podaæ --display, --config, --set, --install, --remove, --all, --"
+"remove-all lub --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave dopuszczalna tylko z --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Ustawianie automatycznego wybierania %s"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nie mo¿na usun±æ %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5319,7 +5327,7 @@ msgstr ""
 "%s zosta³ zmieniony (rêcznie lub przez skrypt).\n"
 "Prze³±czanie do trybu rêcznych aktualizacji."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5329,69 +5337,69 @@ msgstr ""
 "(Mo¿esz zmieniæ dowi±zania symboliczne samemu, je¶li chcesz - patrz `man "
 "ln')."
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Zmienianie nazwy dowi±zaniu %s z %s na %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "podwojona nazwa dowi±zania podrzêdnego %s"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Usuwanie alternatywy wybranej rêcznie - prze³±czanie do trybu auto"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Wyrzucanie przestarza³ego dowi±zania podrzêdnego %s (%s)"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Odtwarzanie z poprzedniej nieudanej aktualizacji %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nie mo¿na otworzyæ %s do zapisu: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5400,38 +5408,38 @@ msgstr ""
 "ostrze¿enie: %s powinien byæ dowi±zaniem symbolicznym do %s\n"
 " (lub powinien nie istnieæ); jednak¿e readlink zwróci³ b³±d: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nie mo¿na usun±æ %s: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nie mo¿na zainstalowaæ %s jako %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Zostawianie %s (%s) wskazuj±cego na %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualizowanie %s (%s), ¿eby wskazywa³ na %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5440,13 +5448,13 @@ msgstr ""
 "ostrze¿enie: %s powinien byæ pobocznym dowi±zaniem do\n"
 " %s lub nie powinien istnieæ; jednak¿e readlink zwróci³ b³±d: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Usuwanie %s (%s), nie odpowiednie dla %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5455,7 +5463,7 @@ msgstr ""
 "Jest tylko jeden program, który dostarcza %s\n"
 "(%s). Nie ma nic do konfigurowania.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5468,43 +5476,51 @@ msgstr ""
 "  Wybór        Alternatywa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "U¿ywanie `%s' jako dostarczaj±cego `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nie mo¿na znale¼æ alternatywy `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "b³±d zapisu na standardowe wyj¶cie: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "nie mo¿na odczytaæ %s dla %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "brakuj±cy znak nowej linii po %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Powa¿ny problem: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: nie mo¿na wywo³aæ gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: nie mo¿na wywo³aæ bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: nie mo¿na wykonaæ bzip2 %s"
diff --git a/po/pt.po b/po/pt.po
index 427931f1..92e69348 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-08-27 17:41+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -56,72 +56,57 @@ msgstr "Erro de sistema num.%d"
 msgid "Signal no.%d"
 msgstr "Sinal num.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: falhou executar gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: erro interno de gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: falhou executar gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: erro interno de bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: falhou executar bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompressão"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: erro interno de gzip: read: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: erro interno de gzip: write: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: erro interno de gzip: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: falhou executar gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: erro interno de bzip2: read: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: erro interno de bzip2: write: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: erro interno de bzip2: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: falhou executar bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressão"
@@ -167,7 +152,7 @@ msgstr "não pode perquisar directório de actualizações `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "falhou a remoção do ficheiro de actualização incorporado %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "não foi possível criar `%.255s'"
@@ -896,30 +881,30 @@ msgstr "Falta parentesis de fecho no formato\n"
 msgid "failed to realloc for variable buffer"
 msgstr "realloc falhou para buffer de variável"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... já desapareceu !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro ao ler do pipe dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "erro ao definir timestamps de `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro ao definir dono de `%255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro ao definir permissões de `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -928,16 +913,16 @@ msgstr ""
 "a tentar sobre-escrever %.250s', que é a versão divergente de `%250s'%.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pacote: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "não foi possível fazer stat a `%.255s' (que eu ía instalar)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -946,29 +931,29 @@ msgstr ""
 "não foi possível efectuar uma limpeza à volta de `%.255s' antes de instalar "
 "outra versão"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "não foi possível fazer stat ao recuperado `%.255s' antes de instalar outra "
 "versão"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arquivo continha objecto `%.255s' de tipo desconhecido 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Substituindo ficheiros no pacote antigo %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituído por ficheiros no pacote instalado %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -976,89 +961,89 @@ msgstr ""
 "a tentar sobre-escrever o directório `%.250s' no pacote %.250s com um não "
 "directório"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "a tentar sobre-escrever `%.250s', que também está no pacote %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "o ficheiro `%.255s' foi substituído"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb durante `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro ao fechar/escrever `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro ao criar pipe `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erro ao criar dispositivo `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro ao criar hard link `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro ao criar link simbólico `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro ao definir dono do link simbólico `%255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro ao criar o directório `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "não foi possível mover `%.255s' para instalar a nova versão"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "não foi possível ler link `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "não foi possível criar backup do link simbólico para `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "não foi possível fazer chown a backup do link simbólico para `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "não foi possível fazer backup link de `%.255s' antes de instalar a nova "
 "versão"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "não foi possível instalar nova versão de `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1067,7 +1052,7 @@ msgstr ""
 "dpkg: aviso - a ignorar problema de dependências com a remoção de %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1076,7 +1061,7 @@ msgstr ""
 "dpkg - aviso - a considerar a desconfiguração do pacote essencial %s, para "
 "permitir a remoção de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1085,7 +1070,7 @@ msgstr ""
 "dpkg: não, %s é essencial, não irá desconfigurar\n"
 " de modo a permitir a remoção de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1094,24 +1079,24 @@ msgstr ""
 "dpkg: não, não pode remover %s (--auto-deconfigure irá ajudar):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: a considerar remover %s em favorecimento de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s não está instalado convenientemente - a ignorar quaisquer dependências "
 "nele.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: pode ter problemas ao remover %s, como disponibiliza %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1120,17 +1105,22 @@ msgstr ""
 "dpkg: o pacote %s requer reinstalação, mas vai ser removido de qualquer modo "
 "como requisitou.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: o pacote %s requer reinstalação, não irá remover.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: sim, irá remover %s em favorecimento de %s,\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1139,73 +1129,73 @@ msgstr ""
 "dpkg: acerca de %s contendo %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacotes em conflito - não irá instalar %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: aviso - a ignorar conflito, pode proceder de qualquer modo !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necessita de pelo menos um argumento de path"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "falhou executar find para --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "falhou fdopen ao pipe de find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "erro na leitura do pipe de find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "erro ao fechar o pipe de find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "a procura de --recursive retornou um erro %i não tratado"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "procurou, mas não encontrou pacotes (ficheiros coincidindo com *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 "--%s necessita pelo menos de um argumento de ficheiro de arquivo de pacote"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "A seleccionar pacote anteriormente não seleccionado %s\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "A passar à frente do pacote não seleccionado %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versão %.250s de %.250s já está instalado, passando à frente,\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - aviso: downgrade de %.250s de %.250s para %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1591,110 +1581,117 @@ msgstr "EOF em stdin na prompt do ficheiro de configuração"
 msgid "unable to check for existence of `%.250s'"
 msgstr "não foi possível verificar a existência de `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depende de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pre-depende de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomenda "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " sugere "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " danifica "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " em conflito com "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " sugere "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " melhora "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vai ser removido.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vai ser desconfigurado.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s vai ser instalado, mas é versão %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas é versão %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr " %.250s está descompactado, mas nunca foi configurado.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está descompactado, mas é versão %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s a última versão configurada é %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s é %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser removido.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser desconfigurado.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s disponibiliza %.250s mas é %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) vai ser instalado.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versão %.250s) é %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s disponibiliza %.250s e vai ser instalado.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s disponibiliza %.250s e é %s.\n"
@@ -2601,7 +2598,7 @@ msgstr "não pode abrir `%i' para stream"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
@@ -2678,6 +2675,10 @@ msgstr "  O pacote %s que disponibiliza %s não está instalado.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  O pacote %s não está instalado.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depende de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; no entanto:\n"
@@ -2878,10 +2879,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "Não foi possível fazer stat a outro novo ficheiro `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: aviso - ficheiro antigo `%.250s' é o mesmo que vários novos ficheiros! "
 "(ambos `%.250s' e `%.250s')"
@@ -3353,26 +3354,31 @@ msgstr "--forget-old-unavail não leva argumentos"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - erro: %s (`%s') não contém quaisquer dígitos\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build necessita de um directório como argumento"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build leva no máximo dois argumentos"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "não foi possível verificar a existência do repositório `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "o alvo é um directório - não é possível saltar a verificação do ficheiro de "
 "controle"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3381,47 +3387,47 @@ msgstr ""
 "dpkg-deb: aviso, a não verificar o conteúdo da área de controle.\n"
 "dpkg-deb: a construír um pacote desconhecido em `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "o nome do pacote tem caracteres que não são caracteres alfanuméricos "
 "minúsculos nem `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "aviso, `%s' contém o valor Prioridade `%s' definido pelo utilizador\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "aviso, `%s' contém o campo `%s' definido pelo utilizador\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d erros no ficheiro de controle"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construindo pacote `%s' em `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "directório de controle possui permissões erradas %03lo (devem ser >=0755e "
 "<=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "script `%.50s' do maintainer não é ficheiro de texto simples ou link "
 "simbólico"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3430,16 +3436,16 @@ msgstr ""
 "script `%.50s' do maintainer tem permissões erradas %03lo (devem ser >=0555 "
 "e <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "não é possível fazer stat ao script `%.50s' do maintainer"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "string vazia vinda de fgets ao ler conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3447,120 +3453,120 @@ msgstr ""
 "aviso, nome de conffile `%.50s...' é demasiado longo, ou falta o newline "
 "final\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 "aviso, o ficheiro confile `%s' contém espaços em branco de enchimento\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "o conffile ^%.250s' não aparece no pacote"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "não é possível fazer stat ao conffile `%.250s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "aviso, o confile `%s' não é um ficheiro comum\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "erro lendo o ficheiro conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "erro abrindo o ficheiro conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignorando %d avisos acerca do(s) ficheiro(s) de controle.\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "não foi possível retirar `%.255s' do buffer"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "o chdir para `%.255s' falhou"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "falhou o chdir para .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "falhou executar tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "falhou criar tmpfile (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "falhou abrir tmpfile (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "falhou o unlink tmpfile (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "controle"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "falhou o fstat tmpfile (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "falhou o rewind tmpfile (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "falhou criar tmpfile (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "falhou abrir tmpfile (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "falhou o unlink tmpfile (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dados"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "falhou executar o find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "falhou escrever o nome do ficheiro para um pipe do tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Erro interno, compress_type `%i' desconhecido!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "falhou o rewind tmpfile (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3644,24 +3650,24 @@ msgstr ""
 "versão do arquivo %.250s não foi compreendida, obtenha um dpkg-deb mais "
 "recente"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "saltou dado membro de %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "o ficheiro `%.250s' contém o membro de dados %.*s não compreendido, "
 "desistindo"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "o ficheiro `%.250s' contém dois membros de controle, desistindo"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3670,16 +3676,16 @@ msgstr ""
 " novo pacote debian, versão %s.\n"
 " %ld bytes de tamanho: arquivo de controle= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "tamanho da informação de controlo"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "o arquivo tem o tomanho do controlo mal formatado `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3688,15 +3694,15 @@ msgstr ""
 " pacote debian antigo, versão %s,\n"
 " tamanho %ld bytes: arquivo de controle= %zi, arquivo principal= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "falhou alocar memória para a variável `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "área de controlo"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3705,65 +3711,65 @@ msgstr ""
 "dpkg-deb: o ficheiro parece ser um arquivo que foi corrompido\n"
 "dpkg-deb:    por ter sido feito o download em modo ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "^%.255s não é um arquivo de formato debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "falhou obter a actual posição no ficheiro"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "falhou definir a actual posição no ficheiro"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "falhou abrir o descriptor do pipe `1' no paste"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "falhou a escrita para gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "falhou fechar gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "falhou a chamada ao sistema lseek à porção de ficheiros do arquivo"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "não foi possível escrever para o pipe na cópia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "falhou fechar o pipe na cópia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "falhou criar directório"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "falhou o chdir para o directório após o ter criado"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "falhou o chdir para o directório"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "falhou executar o tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necessita de um ficheiro .deb como argumento"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3772,12 +3778,12 @@ msgstr ""
 "--%s necessita de um directório de destino.\n"
 "Talvez você devesse estar a utilizar dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s toma no máximo dois argumentos (.deb e directório)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s toma apenas um argumento (ficheiro .deb)"
@@ -3932,7 +3938,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3943,7 +3949,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opções:\n"
@@ -3978,7 +3985,7 @@ msgstr ""
 "Escreva dpkg-deb --help para ajuda sobre manipulação de ficheiros *.deb;\n"
 "Escreva dpkg --help para ajuda sobre instalar de desinstalar pacotes."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "compressão desconhecida tipo `%s'!"
@@ -4363,9 +4370,9 @@ msgstr "o ficheiro fonte `%.250s' não é um ficheiro simples"
 msgid "unable to exec mksplit"
 msgstr "não foi possível executar mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versão %s.\n"
@@ -4378,9 +4385,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4436,7 +4443,7 @@ msgid "try deleting %s"
 msgstr "tente apagar %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "não foi possível abrir %s: %s"
@@ -4463,7 +4470,7 @@ msgid "unable to close %s after read: %s"
 msgstr "não foi possível fechar %s após ler: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "não foi possível fechar %s: %s"
@@ -4483,12 +4490,12 @@ msgstr "Não foi possível instalar %s; será deixado como %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: não foi possível libertar %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Impossível obter o valor de ENOENT a partir de %s:·%s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4498,7 +4505,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4555,89 +4562,89 @@ msgstr ""
 "'Scripts' preinst/postrm do pacote devem sempre especificar --package e --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "dois modos específicados: %s·e·--%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s necessita de um desvio-para como argumento"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "o desvio não pode conter novas linhas"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s necessita de um argumento <nome de pacote>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "o pacote não pode conter novas linhas"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita de um argumento <directório>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "falhou ao abrir desvios: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "falta nome alternativo (altname)"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "falta pacote"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s necessita de um único argumento"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "o nome do ficheiro \"%s\" não é absoluto"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "o ficheiro não pode conter quebras de linha"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Não é possível desviar directórios"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "A deixar `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' choca com `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Acrescentar `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4648,7 +4655,7 @@ msgstr ""
 "  quando a remover `%s'\n"
 "  foi encontrado·`%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4659,37 +4666,37 @@ msgstr ""
 "  quando a remover `%s'\n"
 "  foi encontrado·`%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "A remover `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Nenhum desvio `%s',·nenhum removido"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "erro interno - modo inválido`%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "Não pode fazer stat ao nome antigo `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "Não pode fazer stat ao novo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao verificar `%s':·%s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4698,52 +4705,52 @@ msgstr ""
 "renomear envolve sobre-escrever `%s' com\n"
 "  um ficheiro diferente `%s', não permitido"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renomear: remove o link antigo duplicado `%s':·%s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renomear: renomear `%s' para `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "criar diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escrever diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fechar diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "remover diversions-old antigo: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "criar novo diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalar novos desvios: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4751,7 +4758,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4789,106 +4796,106 @@ msgstr ""
 "  --help                   mostra esta mensagem de ajuda.\n"
 "  --version                indica a versão.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nenhum modo especificado"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add necessita de quatro argumentos"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "utilizador ilegal %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "utilizador não existente %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "grupo ilegal %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "grupo não existente %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "modo ilegal %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "a cortar o caminho /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Já existe um modo de 'override' para \"%s\""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "por isso a opção --force será agora ignorada."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "a abortar"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "aviso: a opção --update foi dada mas o %s não existe"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "falha ao tentar fazer o 'chwon' %s:·%s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "falhou ao executar chmod %s:·%s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Não está presente nenhum 'override'."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "atenção: a opção --update é inútil para --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "falhou ao abrir ficheiro statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "'Overrides' múltiplos para \"%s\", a abortar a operação"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "falhou ao abrir o ficheiro statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "erro ao remover statoverride-old:·%s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "erro ao criar novo statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "erro ao instalar novo statoverride:·%s"
@@ -5115,7 +5122,7 @@ msgstr "não foi possível ler %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5125,8 +5132,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5146,7 +5153,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5205,95 +5212,36 @@ msgstr ""
 "  --help                   mostra esta mensagem de ajuda.\n"
 "  --version                indica a versão.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "argumento desconhecido `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install necessita de <link> <nome> <caminho> <prioridade>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "a prioridade tem de ser um inteiro"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s necessita de <nome> <caminho>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s necessita de <nome>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave necessita de <link> <nome> <caminho>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "o nome do slave %s está duplicado"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "o link do slave %s está duplicado"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "o nome %s é primário e slave"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "o link %s é primário e slave"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"necessita de --display, --config, --set, --install, --remove, --all--remove-"
-"all ou --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave apenas é permito com --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "slave duplicado %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "link slave igual ao link principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "'slave link' duplicado %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "caminho duplicado %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioridade %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5302,66 +5250,124 @@ msgstr ""
 "Alternativa para %s aponta para %s - a qual não foi encontrada.  A remover "
 "da lista de alternativas."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Sem alternativas para %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - o status é %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " o link actualmente aponta para %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " link actualmente inexistente"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " link não funcional - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Sem versões disponíveis."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A `melhor' versão corrente é %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "argumento desconhecido `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install necessita de <link> <nome> <caminho> <prioridade>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "a prioridade tem de ser um inteiro"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s necessita de <nome> <caminho>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s necessita de <nome>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave necessita de <link> <nome> <caminho>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "o nome do slave %s está duplicado"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "o link do slave %s está duplicado"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "o nome %s é primário e slave"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "o link %s é primário e slave"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"necessita de --display, --config, --set, --install, --remove, --all--remove-"
+"all ou --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave apenas é permito com --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A configurar a selecção automática de %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "não foi possível remover %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5370,7 +5376,7 @@ msgstr ""
 "%s foi alterado (manualmente ou por um script).\n"
 "A passar para actualizações manuais apenas."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5379,71 +5385,71 @@ msgstr ""
 "A verificar versões disponíveis de %s, a actualizar os links em %s ...\n"
 "(Pode modificar os links simbólicos se desejar - veja `man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "A renomear o link %s de %s para %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, 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:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de link slave %s duplicado"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descartar links slave obsoletos %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Actualizações automáticas de %s desactivadas, abandonando."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperar da actualização anterior falhada de %s·..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, 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:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5452,38 +5458,38 @@ msgstr ""
 "aviso: %s é suposto ser um link simbólico para %s\n"
 " (ou não-existente); no entanto, a sua leitura falhou: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, 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:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, 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:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "A deixar %s (%s) a apontar para %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, 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:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5492,13 +5498,13 @@ msgstr ""
 "aviso:·%s·é·suposto·ser·um·link·simbólico·slave para·\n"
 " %s (ou não-existente);·no·entanto,·a·sua·leitura·falhou:·%s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "A remover %s (%s), não apropriado com %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5507,7 +5513,7 @@ msgstr ""
 "Existe apenas um programa que fornece %s\n"
 "(%s). Nada para configurar.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5520,46 +5526,55 @@ msgstr ""
 "  Selecção    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "A usar `%s' para fornecer `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao escrever stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines proibidas em ficheiros update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta nova linha após %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: falhou executar gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: falhou executar bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: falhou executar bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "não foi possível criar %.250s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 26f1b896..15acbb24 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -61,72 +61,57 @@ msgstr "Erro do sistema no. %d"
 msgid "Signal no.%d"
 msgstr "Sinal no. %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: falha ao executar gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: erro interno do gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: não foi possível executar gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: erro interno do bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: não foi possível executar bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: descompressão"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: erro interno do gzip: read: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: erro interno do gzip: write: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: erro interno do gzip: read(%i) != write(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: falha ao executar gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: erro interno do bzip2: read: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: erro interno do bzip2: write: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: erro interno do bzip2: read(%i) != write(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: falha ao executar bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compressão"
@@ -174,7 +159,7 @@ msgstr "não foi possível varrer diretório de atualizações `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "remoção de arquivo de atualização incorporado %.255s falhou"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "não foi possível criar `%.255s'"
@@ -862,9 +847,7 @@ msgstr "precisa começar com um alfanumérico"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr ""
-"caracter `%c' não permitido (apenas letras, dígitos e caracteres "
-"`%s')"
+msgstr "caracter `%c' não permitido (apenas letras, dígitos e caracteres `%s')"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -914,30 +897,30 @@ msgstr "Fechamento de aspas faltando no formato\n"
 msgid "failed to realloc for variable buffer"
 msgstr "falha ao efetuar realloc para memória temporária variável"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... já desapareceu !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "erro lendo do pipe de dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "erro estabelecendo estampas de tempo de `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "erro estabelecendo posse de `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "erro estabelecendo permissões de `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -946,17 +929,17 @@ msgstr ""
 "tentando sobrescrever `%.250s', que é a versão desviada de `%.250s'%.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pacote: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 "não foi possível efetuar stat de `%.255s' (que eu estava prestes a instalar)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -965,120 +948,120 @@ msgstr ""
 "não foi possível limpar a sujeira em torno de `%.255s' antes de instalar "
 "outra versão"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "não foi possível efetuar stat `%.255s' restaurado antes de instalar outra "
 "versão"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arquivo continha objeto `%.255s' de tipo desconhecido 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Substituindo arquivos no pacote antigo %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Substituídos por arquivos no pacote instalado %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 "tentando sobrescrever diretório `%.250s' no pacote %.250s com não-diretório"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "tentando sobrescrever `%.250s', que também está no pacote %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "arquivo gooble substituído `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb durante `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "erro fechando/escrevendo `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "erro criando pipe `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "erro criando dispositivo `%.255s'"
 
 # NOTA: "hard link" = "link fixo" segundo a tradução do próprio `ln' - Carlos
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "erro criando link fixo `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "erro criando link simbólico `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "erro estabelecendo posse de link simbólico `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "erro criando diretório `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "não foi possível mover do caminho `%.255s' para instalar nova versão"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "não possível ler ligação `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "não foi possível criar link simbólico de backup para `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "não foi possível efetuar chown do link simbólico de backup para `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "não foi possível criar link de backup de `%.255s' antes de instalar nova "
 "versão"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "não consigo instalar nova versão de `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1087,7 +1070,7 @@ msgstr ""
 "dpkg: aviso - ignorando problema de dependência com remoção de %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1096,7 +1079,7 @@ msgstr ""
 "dpkg: aviso - considerando desconfiguração do pacote essencial\n"
 " %s, para permitir remoção de %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1105,7 +1088,7 @@ msgstr ""
 "dpkg: não, %s é essencial, não vou desconfigurá-lo\n"
 " para permitir remoção de %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1114,22 +1097,22 @@ msgstr ""
 "dpkg: não, não posso remover %s (--auto-deconfigure vai te ajudar):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: considerando remoção de %s em favor de %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s não está instalado corretamente - ignorando dependências a ele.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: pode haver problemas removendo %s, já que ele oferece %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1138,17 +1121,22 @@ msgstr ""
 "dpkg: pacote %s precisa de reinstalação, mas vou removê-lo assim mesmo como "
 "você pediu.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pacote %s precisa de reinstalação, não vou removê-lo.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: sim, vou remover %s em favor de %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1157,72 +1145,72 @@ msgstr ""
 "dpkg: sobre %s contendo %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pacotes conflitantes - não instalando %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: aviso - ignorando conflito, posso continuar de qualquer modo !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive precisa de ao menos um caminho como argumento"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "falha ao executar find para --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "falhei no fdopen do pipe do find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "erro lendo o pipe do find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "erro fechando o pipe do find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "procura por --recursive retornou erro não gerenciado %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "procurei, mas não achei pacotes (arquivos casando com *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s precisa de ao menos um arquivo de pacote como argumento"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Selecionando pacote previamente não selecionado %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Ignorando pacote não selecionado %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versão %.250s de %.250s já instalada, ignorando.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - aviso: rebaixando %.250s de %.250s para %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Não vou rebaixar %.250s da versão %.250s para %.250s, ignorando.\n"
@@ -1605,110 +1593,117 @@ msgstr "EOF em stdin no prompt do conffile"
 msgid "unable to check for existence of `%.250s'"
 msgstr "não foi possível checar a existência de `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depende de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pré-depende de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomenda "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " sugere "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " quebra"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " conflita com "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " sugere "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " aprimora "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s está para ser removido.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s está para ser desconfigurado.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s está para ser instalado, mas sua versão é %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas sua versão é %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está descompactado, mas nunca foi configurado.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr " %.250s está descompactado, mas sua versão é %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  a versão mais recente configurada de %.250s é %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s está %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s oferece %.250s mas está para ser removido.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s oferece %.250s mas está para ser desconfigurado.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s oferece %.250s mas está %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) está para ser instalado.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versão %.250s) está %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s oferece %.250s e está para ser instalado.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s oferece %.250s e está %s.\n"
@@ -2243,14 +2238,15 @@ msgstr ""
 "  -r|--remove        <pacote> ... | -a|--pending\n"
 "  -P|--purge         <pacote> ... | -a|--pending\n"
 "  --get-selections [<padrão> ...] Obtém lista de seleções para stdout.\n"
-"  --set-selections                Define selecções de pacotes a partir\n" 
+"  --set-selections                Define selecções de pacotes a partir\n"
 "                                  de stdin.\n"
 "  --clear-selections              Deseleciona cada pacote não essencial.\n"
 "  --update-avail <arq-Packages>   Substitui informaçao de pacotes\n"
 "                                      disponíveis.\n"
 "  --merge-avail <arq-Packages>    Mesclar com informação do arquivo.\n"
 "  --clear-avail                   Apagar informação de\n"
-"                                  disponibilidade\n exisnte.\n"
+"                                  disponibilidade\n"
+" exisnte.\n"
 "  --forget-old-unavail            Esquecer pacotes indisponíveis\n"
 "                                  desinstalados.\n"
 "  -s|--status <pacote> ...        Exibir detalhes de status de pacotes.\n"
@@ -2277,7 +2273,8 @@ msgid ""
 msgstr ""
 "  -h|--help                        Exibe esta mensagem de ajuda.\n"
 "  --version                        Exibe a versão.\n"
-"  --license|--licence              Exibe os termos de licenciamento e copyright.\n"
+"  --license|--licence              Exibe os termos de licenciamento e "
+"copyright.\n"
 "\n"
 
 #: src/main.c:94
@@ -2349,7 +2346,8 @@ msgstr ""
 "                             pacotes.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Somente diga p que seria feito - mas não faça\n"
-"  -D|--debug=<octal>         Habilitar depuração (veja -Dhelp ou --debug=help).\n"
+"  -D|--debug=<octal>         Habilitar depuração (veja -Dhelp ou --"
+"debug=help).\n"
 "  --status-fd <n>            Enviar atualizações de status de mudança\n"
 "                             para descritor de arquivo <n>.\n"
 "  --log=<nomearquivo>        Mudanças de status de log e ações para\n"
@@ -2374,19 +2372,18 @@ msgid ""
 "\n"
 msgstr ""
 "Operadores de comparação para --compare-versions are:\n"
-"  lt le eq ne ge gt       (trata versão vazia como anterior a qualquer "
-"                           outra versão);\n"
-"  lt-nl le-nl ge-nl gt-nl (trata versão vazia como posterior a qualquer "
-"                           outra versão);\n"
-"  < << <= = >= >> >       (somente para compatibiliade com a sintaxe do "
-"                           arquivo control).\n"
+"  lt le eq ne ge gt       (trata versão vazia como anterior a "
+"qualquer                            outra versão);\n"
+"  lt-nl le-nl ge-nl gt-nl (trata versão vazia como posterior a "
+"qualquer                            outra versão);\n"
+"  < << <= = >= >> >       (somente para compatibiliade com a sintaxe "
+"do                            arquivo control).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr ""
-"Use `dselect' ou `aptitude' para gerenciamento de pacotes amigável.\n"
+msgstr "Use `dselect' ou `aptitude' para gerenciamento de pacotes amigável.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2560,8 +2557,8 @@ msgstr ""
 "  confmiss [!]           Sempre instalar arquivos de configuração faltando\n"
 "  conflicts [!]          Permitir instalação de pacotes conflitantes\n"
 "  architecture [!]       Processar até mesmo pacotes com arquitetura errada\n"
-"  overwrite-dir [!]      Sobrepor um diretório de um pacote com um "
-"arquivo de outro\n"
+"  overwrite-dir [!]      Sobrepor um diretório de um pacote com um arquivo "
+"de outro\n"
 "  remove-reinstreq [!]   Remover pacotes que requerem instalação\n"
 "  remove-essential [!]   Remover um pacote essencial\n"
 "\n"
@@ -2614,7 +2611,7 @@ msgstr "não foi possível abrir `%i' para stream"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "preciso de uma opção de ação"
@@ -2691,6 +2688,10 @@ msgstr "  Pacote %s, o qual fornece %s não está instalado.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Pacote %s não está instalado.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depende de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; porém:\n"
@@ -2892,10 +2893,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "impossível fazer fstat em outro novo arquivo `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: aviso - arquivo de configuração antigo `%.250s' é o mesmo que diversos "
 "outros arquivos (ambos `%.250s' e `%.250s')"
@@ -3094,8 +3095,8 @@ msgstr ""
 "Comandos :\n"
 "  -s| --status <pacote> ...      Exibe detalhes do status do pacote.\n"
 "  -p| --print-avail <pacote> ... Exibe detalhes de versões disponíveis.\n"
-"  -L| --listfiles <pacote> ...   Lista arquivos de `propriedade' do(s) "
-"pacote(s).\n"
+"  -L| --listfiles <pacote> ...   Lista arquivos de `propriedade' do(s) pacote"
+"(s).\n"
 "  -l| --list [<padrão>] ...]     Lista pacotes abreviadamente.\n"
 "  -W| --show <padrão> ...        Exibe informação sobre o(s) pacote(s).\n"
 "  -S| --search <padrão> ...      Procura pacote(s) prorietário(s) do(s) "
@@ -3374,25 +3375,30 @@ msgstr "--forgt-old-unavail não recebe argumentos"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - erro: %s (`%s') não contém nenhum dígito\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build precisa de um diretório como argumento"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build precisa de no máximo dois argumentos"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "não foi possível checar a existência do repositório `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "alvo é um diretório - não é possível pular a checagem do arquivo de controle"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3401,46 +3407,46 @@ msgstr ""
 "dpkg-deb: aviso, não checando o conteúdo da área de controle.\n"
 "dpkg-deb: construíndo um pacote desconhecido em `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "nome do pacote possui caracteres que não são alfanúmericos em caixa-baixa ou "
 "`-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "aviso, `%s' contém valor Prioridade `%s' definido pelo usuário\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "aviso, `%s' contém campo `%s' definido pelo usuário\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d erros no arquivo de controle"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: construíndo pacote `%s' em `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "diretório de controle possui permissões ruins %03lo (devem ser >=0755 e "
 "<=0755)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "script de mantenedor `%.50s' não é um arquivo comum ou uma ligação simbólica"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3449,16 +3455,16 @@ msgstr ""
 "script de mantenedor `%.50s' possui permissões ruins %03lo (devem ser >=0555 "
 "e <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "não é possível obter estado do script `%.50s'"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "string vazia vinda de fgets ao ler conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3466,121 +3472,121 @@ msgstr ""
 "aviso, nome de conffile `%.50s...'é muito longo ou falta um caracter final "
 "de nova linha\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 "aviso, nome de arquivo conffile `%s' contém rastros de espaços em branco\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "conffile `%.250s' não aparece no pacote"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "não é possível obter estado do conffile `%.250s'"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "aviso, conffile `%s' não é um arquivo comum\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "erro lendo arquivo conffiles"
 
 # r dpkg-deb/build.c:356
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "erro abrindo arquivo conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignorando %d avisos sobre o(s) arquivo(s) de controle\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "não foi possível retirar `%.255s' do buffer"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "falhou ao mudar para o diretório `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "falhou ao mudar o diretório para .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "falhou ao executar tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "falhou ao criar tmpfile (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "falhou ao abrir tmpfile (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "falhou ao fazer unlink no tmpfile (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "controle"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "falhou ao fazer fstat no tmpfile (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "falhou ao fazer rewind no tmpfile (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "falhou ao criar tmpfile (data)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "falhou ao abrir tmpfile (data), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "falhou ao fazer unlink no tmpfile (data), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dado"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "falha ao executar find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "falhou ao gravar o nome de arquivo para o pipe tar (data)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Erro interno, tipo_compressão `%i' desconhecido !"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "falhou ao fazer rewind no tmpfile (data)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3659,23 +3665,23 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "versão do arquivo %.250s não compreendida, obtenha dpkg-deb mais recente"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "pulado dado membro de %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 "arquivo `%.250s' contém membros de dados não entendidos %.*s, desistindo"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "arquivo `%.250s' contém dois membros de controle, desistindo"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3684,16 +3690,16 @@ msgstr ""
 " novo pacote debian, versão %s.\n"
 " tamanho %ld bytes: arquivo de controle= %zi bytes.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "tamanho da informação de controle"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arquivo possui tamanho de controle malformado `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3702,15 +3708,15 @@ msgstr ""
 " antigo pacote debian , versão %s.\n"
 " tamanho %ld bytes: arquivo de controle= %zi, arquivo main= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "falha alocando memória para variável `crtlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "àrea de controle"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3719,67 +3725,67 @@ msgstr ""
 "dpkg-deb: arquivo parece ser um arquivo que foi corrompido por\n"
 "dpkg-deb:            ter sido baixado em modo ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' não é um formato de arquivo debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "falha obtendo a posição atual do arquivo"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "falha definindo a posição atual do arquivo"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "falha ao abrir descritor de arquivo `1' na colagem"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "falha ao gravar para gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "falha ao fechar gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 "não foi possível fazer a chamada de sistema lseek para a porção files do "
 "arquivo"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "não foi possível gravar para o pipe na cópia"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "não foi possível fechar o pipe na cópia"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "não foi possível criar diretório"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "não foi posível mudar para o diretório após criá-lo"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "não foi possível mudar para o diretório"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "não foi possível executar tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s precisa de um nome de arquivo .deb como argumento"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3788,12 +3794,12 @@ msgstr ""
 "--%s precisa de um diretório-alvo.\n"
 "Você não deveria estar usando dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s só pode levar dois argumentos (.deb e diretório)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s recebe somente um argumento (nome de arquivo .deb)"
@@ -3947,7 +3953,7 @@ msgstr ""
 "<ccampod> é o nome de um campo no arquivo `control' principal.\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3958,7 +3964,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opções:\n"
@@ -3997,7 +4004,7 @@ msgstr ""
 "Digite dpkg-deb --help para ajuda sobre manipulação de arquivos *.deb;\n"
 "Digite dpkg --help para ajuda sobre instalação e desinstalação de pacotes."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compressão desconhecido `%s' !"
@@ -4382,9 +4389,9 @@ msgstr "arquivo fonte `%.250s' não é um arquivo simples"
 msgid "unable to exec mksplit"
 msgstr "não é possível executar mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versão %s.\n"
@@ -4397,9 +4404,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4453,7 +4460,7 @@ msgid "try deleting %s"
 msgstr "tente remover %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "impossível abrir %s: %s"
@@ -4480,7 +4487,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossível fechar %s após leitura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossível fechar %s: %s"
@@ -4500,12 +4507,12 @@ msgstr "falha ao instalar %s; será deixado como %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: falha ao bloquar %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Naó foi possível obter valor de ENOENT de %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4515,7 +4522,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4553,12 +4560,13 @@ msgstr ""
 "  --truename <file>        retorna o arquivo divergido.\n"
 "\n"
 "Opções:\n"
-"  --package <package>      nome do pacote o qual a cópia de <arquivo>"
-"                           não será divergido.\n"
+"  --package <package>      nome do pacote o qual a cópia de "
+"<arquivo>                           não será divergido.\n"
 "  --local                  todas as versões dos pacotes são divergidas.\n"
 "  --divert <divergir-para> o nome usado por outras versãoes de pacotes.\n"
 "  --rename                 na verdade move o arquivo de lado (ou de volta).\n"
-"  --admindir <diretório>   define o diretório com o arquivo de divergências.\n"
+"  --admindir <diretório>   define o diretório com o arquivo de "
+"divergências.\n"
 "  --test                   não fazer nada, só demonstrar.\n"
 "  --quiet                  operação silenciosa, saída mínima.\n"
 "  --help                   exibe esta mensagem de ajuda.\n"
@@ -4566,92 +4574,93 @@ msgstr ""
 "\n"
 "Quando adicionado, o padrão é --local e --divert <original>.distrib.\n"
 "Quando removendo, --package ou --local e --divert devem casar caso "
-"especificados.\nScripts preinst/postrm de pacotes devem sempre "
-"especificar --package e --divert.\n"
+"especificados.\n"
+"Scripts preinst/postrm de pacotes devem sempre especificar --package e --"
+"divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "dois modos especificados: %s e --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s precisa de um argumento divergir-para"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divergir-para não pode conter novas linhas"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s precisa de um argumento <pacote>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pacote não pode conter novas linhas"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa de um argumento <diretório>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "não foi possível abrir divergências: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "altname faltando"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "pacote faltando"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s precisa de um único argumento"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "nome de arquivo \"%s\" não é absoluto"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "arquivo não pode conter novas linhas"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Não foi possível divergir diretórios"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Deixando `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' conflita com `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Adicionado `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4662,7 +4671,7 @@ msgstr ""
 "  na remoção de `%s'\n"
 "  encontrado `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4673,37 +4682,37 @@ msgstr ""
 "  na remoção de `%s'\n"
 "  encontrado `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Removendo `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Nenhuma divergência `%s', nenhuma removida"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "erro interno - modo ruim `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "não foi possível fazer stat em nome antigo `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "não foi possível fazer stat em novo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao checar `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4712,52 +4721,52 @@ msgstr ""
 "renomear involve sobreescrever `%s' com\n"
 "  arquivo diferente `%s', não permitido"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renomear: remover ligação antiga duplicada `%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renomear: renomear `%s' para `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "criar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "gravar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fechar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "remover antigo divergências-antigos: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "criar novo divergências-antigos: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalar novas divergências: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4765,7 +4774,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4795,111 +4804,112 @@ msgstr ""
 "Opções:\n"
 "  --admindir <diretório>   definir o diretório com o arquivo statoverride.\n"
 "  --update                 atualizar imediatamente permissoes de arquivo.\n"
-"  --force                  forçar uma ação mesmo caso a checagem de saniade falhe.\n"
+"  --force                  forçar uma ação mesmo caso a checagem de saniade "
+"falhe.\n"
 "  --quiet                  operação silenciosa, saída mínima.\n"
 "  --help                   exibe esta ajuda.\n"
 "  --version                exibir a versão.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nenhum modo especificado"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add precisa de quatro argumentos"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "usuário %s ilegal"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "usuário %s não-existente"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "grupo %s ilegal"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "grupo %s não existente"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "modo %s ilegal"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "removendo rastro /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Um override para \"%s\" já existe."
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "mas --force especificaso portanto será ignorado."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "abortando"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "aviso: --update informado mas %s não existe"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "falha ao executar chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "falha ao executar chmod %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Nenhum override presente."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "aviso: --update é inútil para --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "não foi possível abrir statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Múltiplos overrides para \"%s\", abortando"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "não foi possível abrir novo arquivo statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "erro removendo statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "erro criando novo statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "erro instalando novo statoverride: %s"
@@ -5031,8 +5041,7 @@ msgstr "%s: cópia de %s para %s falhou, desistindo: %s"
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
 msgstr ""
-"%s: nenhum arquivo de backup %s disponível, recuperando arquivo "
-"padrão."
+"%s: nenhum arquivo de backup %s disponível, recuperando arquivo padrão."
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5072,8 +5081,7 @@ msgstr "%s: ainda nenhuma seção, criando seção Miscelânea também."
 #: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
-msgstr ""
-"%s: nenhuma seção especificada para nova entrada, colocando no final"
+msgstr "%s: nenhuma seção especificada para nova entrada, colocando no final"
 
 #: scripts/install-info.pl:422
 #, perl-format
@@ -5125,7 +5133,7 @@ msgstr "impossível ler %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5135,8 +5143,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5156,7 +5164,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5181,7 +5189,8 @@ msgstr ""
 "  --install <ligação> <nome> <caminho> <prioridade>\n"
 "    [--slave <ligação> <nome> <caminho>] ...\n"
 "                            adicionar um grupo de alterntivas ao sistema.\n"
-"  --remove <nome> <caminho> remove <caminho> da alternativa de grupo <nome>.\n"
+"  --remove <nome> <caminho> remove <caminho> da alternativa de grupo "
+"<nome>.\n"
 "  --remove-all <nome>       remove grupo <nome> do sistema de alternativas.\n"
 "  --auto <nome>             muda a ligação principal <nome> para modo\n"
 "                            automático.\n"
@@ -5210,163 +5219,162 @@ msgstr ""
 "  --help                   exibir esta mensagem de ajuda.\n"
 "  --version                exibir a versão.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "argumento desconhecido `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install precisa de <ligação> <nome> <caminho> <prioridade>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioridade deve ser um inteiro"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s precisa de <nome> <caminho>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s precisa de <nome>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave precisa de <ligação> <nome> <caminho>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "nome escravo %s duplicado"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "ligação escrava %s duplicada"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "nome %s é ambos primário e escravo"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "ligação %s é ambos primário e escravo"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"precisa de --display, --config, --set, --install, --remove, --all, "
-"--remove-all ou --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave somente permitido com --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "ligação escrava é a mesma que ligação principal %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "caminho %s duplicado"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioridade %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
-"Alternativa para %s aponta para %s - o qual não foi encontrado. "
-"Removendo da lista de alternativas."
+"Alternativa para %s aponta para %s - o qual não foi encontrado. Removendo da "
+"lista de alternativas."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nenhuma alternativa para %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status é %s"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ligação atualmente aponta para %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " ligação atualmente ausente"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ligação ilegível - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nenhuma versão disponível."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "`Melhor' versão atual é %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "argumento desconhecido `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install precisa de <ligação> <nome> <caminho> <prioridade>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioridade deve ser um inteiro"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s precisa de <nome> <caminho>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s precisa de <nome>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave precisa de <ligação> <nome> <caminho>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "nome escravo %s duplicado"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "ligação escrava %s duplicada"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "nome %s é ambos primário e escravo"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "ligação %s é ambos primário e escravo"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"precisa de --display, --config, --set, --install, --remove, --all, --remove-"
+"all ou --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave somente permitido com --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando seleção automática de %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossível remover %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5375,83 +5383,81 @@ msgstr ""
 "%s foi modificado (manualmente ou por um script).\n"
 "Mudando para atualizaçãoes automáticas somente."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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 ""
 "Checando versões disponíveis de %s, atualizando ligações em %s ...\n"
-"(Você pode modificar as ligações simbólicas lá você mesmo caso desejado"
-" - veja `man ln'.)"
+"(Você pode modificar as ligações simbólicas lá você mesmo caso desejado - "
+"veja `man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renomeando ligação %s de %s para %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, 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:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
-"Removendo alternativa selecionada manualmente - mudando para modo "
-"automático"
+"Removendo alternativa selecionada manualmente - mudando para modo automático"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando ligação escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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."
+"Atualizações automáticas de %s estão desabilitadas, deixando-as intocadas."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, 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'."
+"Para retornar para atualizações automáticas utilize `update-alternatives --"
+"auto %s'."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, 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:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Último pacote fornecendo %s (%s) removido, removendo-o."
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5460,40 +5466,39 @@ msgstr ""
 "aviso: %s supostamente seria uma ligação simbólica para %s\n"
 " (ou inexistente); porém, readlink falhou: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "não foi possível assegurar %s inexistente: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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"
+"não foi possível fazer com que %s fosse uma ligação simbólica para %s: %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, 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:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Deixando %s (%s) apontando para %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Atualizando %s (%s) apontando para %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5502,13 +5507,13 @@ msgstr ""
 "aviso: %s supostamente seria uma ligação simbólica escrava para\n"
 " %s, ou inexistente; porém, readlink falhou: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Removendo %s (%s). inapropriado com %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5517,7 +5522,7 @@ msgstr ""
 "Existe somente 1 programa que fornece %s\n"
 "(%s). Nada a ser configurado.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5530,47 +5535,55 @@ msgstr ""
 "  Seleção      Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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: "
+"Pressione enter para manter o padrão[*] ou digite o número da seleção: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Usando `%s' para fornecer `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Não foi possível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "novas linhas proibidas em arquivos update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erro ou eof lendo %s para %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "nova linha faltando para %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: não foi possível executar gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: não foi possível executar bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: falha ao executar bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "não foi possível criar %.250s"
 
diff --git a/po/ro.po b/po/ro.po
index 006a9da2..372d5d25 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-12-22 13:49+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -27,7 +27,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
 
 # numele funcţilor şi argumentelor acestora rămân cele originale
 # pentru a nu induce în eroare utilizatorul
@@ -74,73 +75,57 @@ msgstr "Eroare sistem nr.%d"
 msgid "Signal no.%d"
 msgstr "Semnal nr.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: eşec la execuţie gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: eroare internă gzip: „%s”"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: eşec la execuţia gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: eroare internă bzip2: „%s”"
 
-# fişierul compression.c nu există nici în dpkg-1.9.16 nici în dpkg-1.10.10
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: eşec la execuţia bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decomprimare"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: eroare internă gzip: citire: „%s”"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: eroare internă gzip: scriere: „%s”"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: eroare internă gzip: citire(%i) != scriere(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: eşec la execuţie gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: eroare internă bzip2: citire: „%s”"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: eroare internă bzip2: scriere: „%s”"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: eroare internă bzip2: citire(%i) != scriere(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: eşec la execuţie bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compresie"
@@ -170,7 +155,8 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 "directorul cu actualizări conţine fişiere cu nume de diferite lungimi (atât %"
 "d cât şi %d)"
@@ -185,7 +171,7 @@ msgstr "nu poate fi examinat directorul cu actualizări „%.255s”"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "eşec la ştergerea fişierului cu actualizări încoroporat %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "imposibil a crea „%.255s”"
@@ -294,7 +280,8 @@ msgstr "eşec la închiderea „%.250s” după scrierea informaţiei %s"
 #: lib/dump.c:323
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
-msgstr "eşec la legarea lui „%.250s” la „%.250s” pentru salvarea informaţiei din %s"
+msgstr ""
+"eşec la legarea lui „%.250s” la „%.250s” pentru salvarea informaţiei din %s"
 
 #: lib/dump.c:326
 #, c-format
@@ -321,7 +308,8 @@ msgstr "dpkg: prea multe erori îmbricate pe durata revenirii din eroare !!\n"
 
 #: lib/ehandle.c:186
 msgid "out of memory for new cleanup entry with many arguments"
-msgstr "memorie insuficientă pentru noua intrare de curăţire cu multe argumente"
+msgstr ""
+"memorie insuficientă pentru noua intrare de curăţire cu multe argumente"
 
 #: lib/ehandle.c:198
 msgid "out of memory for new cleanup entry"
@@ -370,12 +358,14 @@ msgstr "câmp de detalii fişier „%s” nepermis în fişierul de stare"
 #: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
-msgstr "prea multe valori în câmpul detaliilor fişier „%s” (comparativ cu altele)"
+msgstr ""
+"prea multe valori în câmpul detaliilor fişier „%s” (comparativ cu altele)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "prea puţine valori în câmpul detaliilor fişier „%s” (comparativ cu altele)"
+msgstr ""
+"prea puţine valori în câmpul detaliilor fişier „%s” (comparativ cu altele)"
 
 # yes/no nu poate fi tradus deoarece e vorba de interpretarea valorilor existente în
 # fişerele de configurare(vezi codul sursă indicata)
@@ -429,7 +419,8 @@ msgstr "valoarea pentru „conffiles” are linie malformată „%.*s”"
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "valoarea pentru „conffiles” conţine o linie care nu începe cu spaţii „%c”"
+msgstr ""
+"valoarea pentru „conffiles” conţine o linie care nu începe cu spaţii „%c”"
 
 #: lib/fields.c:281
 msgid "root or null directory is listed as a conffile"
@@ -437,7 +428,8 @@ msgstr "director nul sau rădăcină este afişat ca un fişier conffile"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "câmpul „%s”, lipseşte numele pachetului, sau gunoi unde se aştepta numele "
 "pachetului"
@@ -736,12 +728,14 @@ msgstr ""
 #: lib/parse.c:111
 #, c-format
 msgid "can't stat package info file `%.255s'"
-msgstr "nu se poate citi starea fişierului de informaţii al pachetului „%.255s”"
+msgstr ""
+"nu se poate citi starea fişierului de informaţii al pachetului „%.255s”"
 
 #: lib/parse.c:116
 #, c-format
 msgid "can't mmap package info file `%.255s'"
-msgstr "nu se poate executa mmap pe fişierul de informaţii al pachetului „%.255s”"
+msgstr ""
+"nu se poate executa mmap pe fişierul de informaţii al pachetului „%.255s”"
 
 #: lib/parse.c:119
 #, c-format
@@ -865,7 +859,8 @@ msgstr "trebuie să înceapă cu un caracter alfanumeric"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "caracterul „%c” nu este permis (doar litere, cifre şi „%s” sunt permise)"
+msgstr ""
+"caracterul „%c” nu este permis (doar litere, cifre şi „%s” sunt permise)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -918,30 +913,30 @@ msgstr "Lipseşte paranteza de închidere în format\n"
 msgid "failed to realloc for variable buffer"
 msgstr "eşec în realloc pentru variabila buffer"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... deja dispărut !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "eroare la citirea din redirectarea lui dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "eroare la setarea momentului actualizării lui „%.255s”"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "eroare la setarea apartenenţei pentru „%.255s”"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "eroare la setarea permisiunilor pentru „%.255s”"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -950,16 +945,16 @@ msgstr ""
 "se încearcă suprascrierea „%.250s”, care este o versiune derivată a lui "
 "„%.250s”%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pachet: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "imposibil a citi starea lui „%.255s” (care urma să fie instalat)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -968,61 +963,62 @@ msgstr ""
 "imposibil a curăţa mizeria din jurul lui „%.255s” înainte de a instala altă "
 "versiune"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "imposibil a citi starea copiei restaurate a lui „%.255s” înaintea instalării "
 "altei versiuni"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arhiva conţine obiectul „%.255s” de tip necunoscut 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Se înlocuiesc fişierele în pachetul vechi %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Înlocuite de fişierele din pachetul instalat %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 "încercare de suprascriere a directorului „%.250s” în pachetul %.250s cu ceva "
 "care nu este director"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "încercare de suprascriere a „%.250s”, care este şi în pachetul %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "s-a citit şi s-a omis fişierul „%.255s”"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "dpkg-deb este împins în fundal în timpul „%.255s”"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "eroare în timpul închiderii/scrierii „%.255s”"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "eroare la crearea conexiunii „%.255s”"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "eroare la crearea dispozitivului „%.255s”"
@@ -1030,61 +1026,62 @@ msgstr "eroare la crearea dispozitivului „%.255s”"
 # hard link este un alt nume pentru un target şi spre
 # deosebire de symbolic link, target obligatoriu trebuie
 # să existe
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "eroare la crearea legăturii fizice „%.255s”"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "eroare la crearea legăturii simbolice „%.255s”"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "eroare la setarea apartenenţei legăturii simbolice „%.255s”"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "eroare la crearea directorului „%.255s”"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "imposibil a îndepărta „%.255s” pentru instalarea noii versiuni"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "imposibil a citi legătura „%.255s”"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
-msgstr "imposibil a crea o copie de siguranţă a legăturii simbolice pentru „%.255s”"
+msgstr ""
+"imposibil a crea o copie de siguranţă a legăturii simbolice pentru „%.255s”"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "nu se poate schimba apartenenţa copiei de siguranţă a legăturii simbolice "
 "pentru „%.255s”"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "imposibil a face o copie de siguranţă a legăturii lui „%.255s” înainte de "
 "instalarea noii versiuni"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "imposibil a instala noua versiune a lui „%.255s”"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1093,7 +1090,7 @@ msgstr ""
 "dpkg: avertisment - se ignoră problema de dependenţă prin ştergerea lui %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1102,7 +1099,7 @@ msgstr ""
 "dpkg: avertisment - se ia în considerare deconfigurarea \n"
 "pachetului esenţial %s, pentru a permite ştergerea lui %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1111,7 +1108,7 @@ msgstr ""
 "dpkg: nu, %s este esenţial, nu va fi deconfigurat\n"
 "pentru a permite ştergerea lui %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1120,22 +1117,22 @@ msgstr ""
 "dpkg: nu, nu se poate îndepărta %s (--auto-deconfigure vă va ajuta):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: se ia în considerare ştergerea lui %s în favoarea lui %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s nu este corect instalat - ignor orice dependenţă la el.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: puteţi avea probleme eliminând %s, deoarece furnizează %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1144,17 +1141,22 @@ msgstr ""
 "dpkg: pachetul %s necesită reinstalare, dar va fi oricum şters, aşa cum "
 "doriţi.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: pachetul %s necesită reinstalare, nu va fi înlăturat.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: da, va fi şters %s în favoarea lui %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1163,74 +1165,76 @@ msgstr ""
 "dpkg: cu privire la %s conţinând %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "conflict între pachete - nu se instalează %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
-msgstr "dpkg: avertisment - conflict ignorat, este permisă oricum continuarea!\n"
+msgstr ""
+"dpkg: avertisment - conflict ignorat, este permisă oricum continuarea!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive necesită cel puţin o cale ca argument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "eşec la execuţia lui find pentru --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "eşec la fdopen pentru conexiunea cu find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "eroare la citirea conexiunii cu find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "eroare la închiderea conexiunii cu find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find pentru --recursive a returnat codul de eroare netratată %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
-msgstr "a fost căutat, dar nu a fost găsit nici un pachet (fişiere de tip *.deb)"
+msgstr ""
+"a fost căutat, dar nu a fost găsit nici un pachet (fişiere de tip *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s necesită cel puţin un fişier-arhivă de pachet ca argument"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Se selectează pachetul %s, deselectat anterior.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Se omite pachetul deselectat %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versiunea %.250s a lui %.250s este deja instalată, se omite.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - atenţie: se instalează versiunea mai veche a lui %.250s pornind de la "
 "%.250s către %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1318,7 +1322,8 @@ msgstr "Se pregăteşte %s (%s) ...\n"
 #: src/configure.c:180
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
-msgstr "nu se poate citi starea noului fişier conffile al distribuţiei „%.250s”"
+msgstr ""
+"nu se poate citi starea noului fişier conffile al distribuţiei „%.250s”"
 
 #: src/configure.c:190 src/configure.c:431
 #, c-format
@@ -1346,7 +1351,8 @@ msgstr ""
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: avertisment - eşec la redenumirea lui „%.250s” în „%.250s”: %s\n"
+msgstr ""
+"dpkg: %s: avertisment - eşec la redenumirea lui „%.250s” în „%.250s”: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1451,7 +1457,8 @@ msgstr ""
 #: src/configure.c:438
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr "imposibil a stabili modul noului fişier conffile al distribuţiei „%.250s”"
+msgstr ""
+"imposibil a stabili modul noului fişier conffile al distribuţiei „%.250s”"
 
 #: src/configure.c:468
 #, c-format
@@ -1473,7 +1480,8 @@ msgstr "eşec la execuţia consolei (%.250s)"
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Nu uitaţi să readuceţi în prim-plan („fg ”) acest proces când terminaţi!\n"
+msgstr ""
+"Nu uitaţi să readuceţi în prim-plan („fg ”) acest proces când terminaţi!\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1614,110 +1622,117 @@ msgstr "EOF de la stdin la promptul fişierului conffile"
 msgid "unable to check for existence of `%.250s'"
 msgstr "imposibil a verifica existenţa lui „%.250s”"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " depinde de "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " ante-dependenţă faţă de "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " recomandă "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " sugerează "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " corupe pe "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " în conflict cu "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " sugerează "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " îmbunătăţeşte "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va fi şters.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va fi deconfigurat.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s este pe cale să fie instalat, dar este versiunea %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s este instalat, dar este versiunea %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s este despachetat, dar nu a fost niciodată configurat.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s este despachetat, dar este versiunea %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ultima versiune configurată este %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s este %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s furnizează %.250s dar va fi şters.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s furnizează %.250s dar va fi deconfigurat.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s furnizează %.250s dar este %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nu este instalat.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versiunea %.250s) este pe cale să fie instalat.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versiune %.250s) este %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s furnizează %.250s şi este pe cale să fie instalat.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s furnizează %.250s şi este %s.\n"
@@ -1835,7 +1850,8 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture nu ia nici un argument"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--compare-versions ia trei argumente: <versiune> <relaţie> <versiune>"
 
 #: src/enquiry.c:424
@@ -1857,7 +1873,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: eşec la alocarea memoriei pentru noua intrare în lista pachetelor "
 "eşuate."
@@ -1882,7 +1899,8 @@ msgstr "Pachetul %s a fost reţinut, va fi oricum procesat cum aţi cerut\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 "Pachetul %s este reţinut, nu-l atingeţi. Folosiţi --force-hold pentru al "
 "rescrie.\n"
@@ -1898,7 +1916,8 @@ msgstr ""
 #: src/filesdb.c:123
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
-msgstr "imposibil a deschide fişierul cu lista fişierelor pentru pachetul „%.250s”"
+msgstr ""
+"imposibil a deschide fişierul cu lista fişierelor pentru pachetul „%.250s”"
 
 #: src/filesdb.c:128
 #, c-format
@@ -1917,12 +1936,14 @@ msgstr "lista fişierelor pentru pachetul „%.250s”"
 #: src/filesdb.c:158
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
-msgstr "fişierul cu lista fişierelor pachetului „%.250s” conţine nume de fişier vide"
+msgstr ""
+"fişierul cu lista fişierelor pachetului „%.250s” conţine nume de fişier vide"
 
 #: src/filesdb.c:170
 #, c-format
 msgid "error closing files list file for package `%.250s'"
-msgstr "eroare la închiderea fişierului listei cu fişierele pentru pachetul „%.250s”"
+msgstr ""
+"eroare la închiderea fişierului listei cu fişierele pentru pachetul „%.250s”"
 
 #: src/filesdb.c:201
 #, c-format
@@ -1937,7 +1958,8 @@ msgstr "%d fişiere şi directoare actualmente instalate.)\n"
 #: src/filesdb.c:240
 #, c-format
 msgid "unable to create updated files list file for package %s"
-msgstr "imposibil a crea fişierul cu lista fişierelor actualizate pentru pachetul %s"
+msgstr ""
+"imposibil a crea fişierul cu lista fişierelor actualizate pentru pachetul %s"
 
 #: src/filesdb.c:250
 #, c-format
@@ -1976,7 +1998,8 @@ msgstr "eşec la deschiderea fişierului de înlocuire a permisiunilor implicite
 
 #: src/filesdb.c:327
 msgid "failed to fstat statoverride file"
-msgstr "eşec la citirea stării fişierului de înlocuire a permisiunilor implicite"
+msgstr ""
+"eşec la citirea stării fişierului de înlocuire a permisiunilor implicite"
 
 #: src/filesdb.c:330
 msgid "failed to fstat previous statoverride file"
@@ -2396,7 +2419,8 @@ msgstr ""
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Pentru o interfaţă mai prietenoasă folosiţi „dselect” sau „aptitude”.\n"
+msgstr ""
+"Pentru o interfaţă mai prietenoasă folosiţi „dselect” sau „aptitude”.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2487,7 +2511,8 @@ msgstr ""
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
-msgstr "--ignore-depends necesită un nume valid de pachet. „%.250s” nu este; %s"
+msgstr ""
+"--ignore-depends necesită un nume valid de pachet. „%.250s” nu este; %s"
 
 #: src/main.c:287 src/main.c:298
 #, c-format
@@ -2623,7 +2648,7 @@ msgstr "nu s-a putut deschide „%i” pentru fluxul de date"
 msgid "unexpected eof before end of line %d"
 msgstr "sfârşit neaşteptat de fişier înainte de terminarea liniei %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "e necesară o opţiune de acţiune"
@@ -2649,7 +2674,8 @@ msgstr ""
 #: src/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
-msgstr "Pachetul %s este listat de mai multe ori, va fi procesat doar o dată.\n"
+msgstr ""
+"Pachetul %s este listat de mai multe ori, va fi procesat doar o dată.\n"
 
 #: src/packages.c:154
 #, c-format
@@ -2700,6 +2726,10 @@ msgstr "  Pachetul %s care furnizează %s nu este instalat.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Pachetul %s nu este instalat.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " depinde de "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; oricum:\n"
@@ -2824,7 +2854,8 @@ msgstr "Se despachetează %s (din %s) ...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "numele fişierului conffile (începând „%.250s”) este prea lung (>%d caractere)"
+msgstr ""
+"numele fişierului conffile (începând „%.250s”) este prea lung (>%d caractere)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2854,7 +2885,8 @@ msgstr "Se dezarhivează pachetul înlocuitor (%.250s) ...\n"
 
 #: src/processarc.c:550
 msgid "unable to exec dpkg-deb to get filesystem archive"
-msgstr "imposibil a executa dpkg-deb pentru a obţine arhiva sistemului de fişiere"
+msgstr ""
+"imposibil a executa dpkg-deb pentru a obţine arhiva sistemului de fişiere"
 
 #: src/processarc.c:563
 msgid "error reading dpkg-deb tar output"
@@ -2897,10 +2929,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "imposibilitate de stat a altor fişiere noi „%.250s”"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: avertisment - vechiul fişier de configurare „%.250s” este similar cu "
 "alte câteva noi!  (şi „%.250s” şi „%.250s”)"
@@ -2908,7 +2940,8 @@ msgstr ""
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
-msgstr "dpkg: avertisment - imposibilitate de a %s vechiul fişier „%%.250s”: %%s\n"
+msgstr ""
+"dpkg: avertisment - imposibilitate de a %s vechiul fişier „%%.250s”: %%s\n"
 
 #: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
@@ -2956,7 +2989,8 @@ msgstr "rmdir „%.250s” nu a semnalat că nu este director"
 #: src/processarc.c:798
 #, c-format
 msgid "dpkg: warning - package %s contained list as info file"
-msgstr "dpkg: avertisment - pachetul %s a conţinut listă ca şi fişier de informaţii"
+msgstr ""
+"dpkg: avertisment - pachetul %s a conţinut listă ca şi fişier de informaţii"
 
 #: src/processarc.c:805
 #, c-format
@@ -3033,7 +3067,8 @@ msgstr "dpkg: %s negăsit.\n"
 #: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
-msgstr "Pachetul „%s” nu este instalat şi nu este disponibilă nici o informaţie.\n"
+msgstr ""
+"Pachetul „%s” nu este instalat şi nu este disponibilă nici o informaţie.\n"
 
 #: src/query.c:350
 #, c-format
@@ -3076,7 +3111,8 @@ msgstr ""
 #: src/query.c:465
 #, c-format
 msgid "Debian `%s' package management program query tool\n"
-msgstr "Debian „%s” unealtă de interogare a programului de management al pachetelor\n"
+msgstr ""
+"Debian „%s” unealtă de interogare a programului de management al pachetelor\n"
 
 #: src/query.c:482
 #, c-format
@@ -3153,7 +3189,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 "dpkg - avertisment: ignor cererea de îndepărtare a lui %.250s care nu este "
 "instalat.\n"
@@ -3254,12 +3291,14 @@ msgstr "Curăţ fişierele de configurare pentru %s ...\n"
 #: src/remove.c:454
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
-msgstr "nu se poate îndepărta vechiul fişier de configurare „%.250s” (= „%.250s”)"
+msgstr ""
+"nu se poate îndepărta vechiul fişier de configurare „%.250s” (= „%.250s”)"
 
 #: src/remove.c:469
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgstr "nu se poate citi directorul fişierului de configurare „%.250s” (din „%.250s”)"
+msgstr ""
+"nu se poate citi directorul fişierului de configurare „%.250s” (din „%.250s”)"
 
 #: src/remove.c:504
 #, c-format
@@ -3358,7 +3397,8 @@ msgstr "Se înlocuiesc informaţiile disponibile despre pachete, folosind %s.\n"
 #: src/update.c:69
 #, c-format
 msgid "Updating available packages info, using %s.\n"
-msgstr "Se actualizează informaţiile disponibile despre pachete, folosind %s.\n"
+msgstr ""
+"Se actualizează informaţiile disponibile despre pachete, folosind %s.\n"
 
 #: src/update.c:93
 #, c-format
@@ -3374,26 +3414,31 @@ msgstr "--forget-old-unavail nu ia argumente"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "eroare - dpkg-deb: %s („%s”) nu conţine nici un număr\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build necesită un director ca argument"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build ia cel mult două argumente"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "imposibil a verifica existenţa arhivei „%.250s”"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "ţinta este director - nu se poate sări peste verificarea fişierului de "
 "control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3402,47 +3447,48 @@ msgstr ""
 "dpkg-deb: avertisment, fără verificare a conţinutului zonei de control.\n"
 "dpkg-deb: se contruieşte un pachet necunoscut în „%s”.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "numele pachetului conţine caractere care nu sunt litere mici, cifre sau „-+.”"
+msgstr ""
+"numele pachetului conţine caractere care nu sunt litere mici, cifre sau „-+.”"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 "avertisment, „%s” conţine o valoare definită de utilizator pentru Priority „%"
 "s”\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "avertisment, „%s” conţine câmpul definit de utilizator „%s”\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d erori în fişierul de control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: se contruieşte pachetul „%s” în „%s”.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "directorul de control are drepturi de acces incorecte %03lo (trebuie să fie "
 ">=0755 şi <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "scriptul „%.50s” al responsabilului de pachet nu este fişier propriu-zis sau "
 "legătură simbolică"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3452,136 +3498,138 @@ msgstr ""
 "03lo (trebuie să fie >=0555 şi <=0775)"
 
 # codul a fost analizat pentru această traducere
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "citirea stării scriptului de întreţinere „%.50s” nu este posibilă"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "şir gol de la fgets la citirea fişierelor conffile"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 "avertisment, numele fişierului conffile „%.50s...” este prea lung sau îi "
 "lipseşte o linie nouă la sfârşit\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "atenţie, fişierul conffile „%s” conţine caractere de tip spaţiu la final\n"
+msgstr ""
+"atenţie, fişierul conffile „%s” conţine caractere de tip spaţiu la final\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "fişierul conffile „%.250s” nu apare în pachet"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "la fişierul conffile „%.250s” nu este posibilă citirea stării"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "atenţie, fişierul conffile „%s” nu este fişier propriu-zis\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "eroare la citirea fişierului conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "eroare la deschiderea fişierului conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignor %d avertismente legate de fişierul(ele) de control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "incapacitate de a renunţa la memoria tampon „%.255s”"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "eşec la schimbarea directorului în „%.255s”"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "eşec la schimbarea directorului în .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "eşec la execuţia comenzii tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "eşec la crearea unui fişier temporar (de control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "eşec la deschiderea de fişier temporar (de control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "eşec la desfacerea legăturii la fişierul temporar (de control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "eşec la citirea stării fişierului temporar (de control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "eşec la reîmpachtarea fişierului temporar (de control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "eşec la crearea fişierului temporar (date)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "eşec la deschiderea fişierului temporar (date), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "eşec la desfacerea legăturii fişierului temporar (date), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "date"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "eşec la execuţia comenzii find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "eşec la scrierea numelui de fişiere în conexiunea tar (date)"
 
 # e vorba de metoda de compresie
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Eroare internă, compress_type „%i” necunoscută!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "eşec la reîmpachetarea fişierului temporar (date)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (date)"
 
@@ -3641,7 +3689,8 @@ msgstr "fişierul „%.250s” este corupt - componentă cu lungime negativă %z
 #: dpkg-deb/extract.c:125
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
-msgstr "fişierul „%.250s” nu este o arhivă binară debian (încercaţi dpkg-split?)"
+msgstr ""
+"fişierul „%.250s” nu este o arhivă binară debian (încercaţi dpkg-split?)"
 
 #: dpkg-deb/extract.c:128
 msgid "header info member"
@@ -3660,23 +3709,24 @@ msgstr "arhiva nu conţine punct în numărul versiunii"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "versiunea de arhivă %.250s neînţeleasă, instalaţi un dpkg-deb mai nou"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "s-a omis componenta de date de la %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
-msgstr "fişierul „%.250s” conţine o componentă de date neînţeleasă %.*s, se renunţă"
+msgstr ""
+"fişierul „%.250s” conţine o componentă de date neînţeleasă %.*s, se renunţă"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "fişierul „%.250s” conţine două componente de control, se renunţă"
 
 # aici e ceva ciudat, %z: vezi "info libc printf", %zi bytes, e ce?
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3685,16 +3735,16 @@ msgstr ""
 " pachet debian nou, versiunea %s.\n"
 " dimensiune %ld octeţi: arhivă de control= %zi octeţi.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "lungimea informaţiei de control"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arhiva are lungimea informatiei de control malformată „%s”"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3703,15 +3753,15 @@ msgstr ""
 " pachet debian vechi, versiune %s.\n"
 " dimensiune %ld octeţi: arhivă de control= %zi, arhiva principală= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "eşec la alocarea memoriei pentru variabila „ctrlarea”"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "zonă de contrl"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3720,67 +3770,67 @@ msgstr ""
 "dpkg-deb: fişierul pare că ar putea fi o arhivă care a fost\n"
 "dpkg-deb:    coruptă prin descărcarea în mod ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "„%.255s” nu este o arhivă în format debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "eşec la obţinerea poziţiei curente în fişier"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "eşec la memorarea poziţiei curente în fişier"
 
 # in paste nu prea se traduce ca „la lipire”,
 # dar trebuie context pentru verificare
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "eşec la descidearea descriptorului de conexiune „1” la lipire"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "eşec la scrierea în gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "eşec la închiderea gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "eşec la apelul de sistem lseek pentru porţiunea de fişiere de arhivă"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "eşec la scrierea în conexiune în copie"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "eşec la închiderea conexiunii în copie"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "eşec la crearea directorului"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "eşec la schimbarea directorului după crearea lui"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "eşec la schimbarea directorului"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "eşec la execuţia comenzii tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s necesită un nume de fişier .deb ca argument"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3789,12 +3839,12 @@ msgstr ""
 "--%s necesită un director ţintă.\n"
 "Poate ar trebui să folosiţi dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s ia cel mult două argumente (.deb şi directorul)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s ia doar un argument (numele fişierului .deb)"
@@ -3836,7 +3886,8 @@ msgstr "dpkg-deb: „%.255s” nu conţine nici o componentă de control „%.25
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "componenta deschisă „%.255s” (în %.255s) a eşuat într-un mod neaşteptat"
+msgstr ""
+"componenta deschisă „%.255s” (în %.255s) a eşuat într-un mod neaşteptat"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3948,7 +3999,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3959,7 +4010,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opţiuni:\n"
@@ -3998,7 +4050,7 @@ msgstr ""
 "Tastaţi dpkg --help pentru ajutor despre instalarea şi dezinstalarea "
 "pachetelor."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tip de compresie necunoscut „%s”!"
@@ -4025,7 +4077,8 @@ msgstr "fişierul „%.250s” este corupt - caracter de umplere nepermis (cod %
 #: dpkg-split/info.c:109
 #, c-format
 msgid "file `%.250s' is corrupt - nulls in info section"
-msgstr "fişierul „%.250s” este corupt - conţine nuluri în secţiunea de informaţii"
+msgstr ""
+"fişierul „%.250s” este corupt - conţine nuluri în secţiunea de informaţii"
 
 #: dpkg-split/info.c:116
 #, c-format
@@ -4037,12 +4090,14 @@ msgstr ""
 #: dpkg-split/info.c:124
 #, c-format
 msgid "file `%.250s' is corrupt - bad MD5 checksum `%.250s'"
-msgstr "fişierul „%.250s” este invalid - suma de control MD5 neverificată „%.250s”"
+msgstr ""
+"fişierul „%.250s” este invalid - suma de control MD5 neverificată „%.250s”"
 
 #: dpkg-split/info.c:131
 #, c-format
 msgid "file `%.250s' is corrupt - no slash between part numbers"
-msgstr "fişierul „%.250s” este corupt - nu conţine „/” între numerele volumelor"
+msgstr ""
+"fişierul „%.250s” este corupt - nu conţine „/” între numerele volumelor"
 
 #: dpkg-split/info.c:140
 #, c-format
@@ -4059,7 +4114,8 @@ msgstr ""
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
-msgstr "fişierul „%.250s” este corupt - al doilea membru nu este membru de date"
+msgstr ""
+"fişierul „%.250s” este corupt - al doilea membru nu este membru de date"
 
 #: dpkg-split/info.c:153
 #, c-format
@@ -4293,7 +4349,8 @@ msgstr "imposibil a deschide noul fişier depozit „%.250s”"
 #: dpkg-split/queue.c:160
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
-msgstr "incapacitate de redenumire a noului fişier depozit „%.250s” în „%.250s”"
+msgstr ""
+"incapacitate de redenumire a noului fişier depozit „%.250s” în „%.250s”"
 
 #: dpkg-split/queue.c:162
 #, c-format
@@ -4384,9 +4441,9 @@ msgstr "fişierul sursă „%.250s” nu este un fişier propriu-zis"
 msgid "unable to exec mksplit"
 msgstr "imposibil a executa comanda mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versiunea %s.\n"
@@ -4399,9 +4456,9 @@ msgstr ""
 "\n"
 "Drepturi de autor (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4457,7 +4514,7 @@ msgid "try deleting %s"
 msgstr "încercaţi să ştergeţi %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "imposibil a deschide %s: %s"
@@ -4484,7 +4541,7 @@ msgid "unable to close %s after read: %s"
 msgstr "imposibil a închide %s după citire: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "imposibil a închide %s: %s"
@@ -4492,7 +4549,8 @@ msgstr "imposibil a închide %s: %s"
 #: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
-msgstr "imposibil a face copie de siguranţă pentru vechiul %s, se abandonează: %s"
+msgstr ""
+"imposibil a face copie de siguranţă pentru vechiul %s, se abandonează: %s"
 
 #: scripts/cleanup-info.pl:174
 #, perl-format
@@ -4504,12 +4562,12 @@ msgstr "eşec la instalarea lui %s; va fi lăsat ca %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: imposibil a debloca %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "nu se poate obţine valoarea ENOENT din %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4519,7 +4577,7 @@ msgstr ""
 "Drepturi de autor (C) 1995 Ian Jackson.\n"
 "Drepturi de autor (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4576,89 +4634,89 @@ msgstr ""
 "Scripturile preinst/postrm ale pachetelor ar trebui să specifice --package "
 "şi --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "au fost specificate două moduri: %s şi --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s necesită un loc de rediretare ca argument"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "locul de reidrectare nu poate conţine caractere „linie nouă”"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s necesită un <pachet> ca argument"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "pachetul nu poate conţine caractere „linie nouă”"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesită un <director> ca argument"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "„%s” opţiune necunoscută"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "nu se poate deschide fişierului de redirectări: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "lipseşte numele alternativ"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "lipseşte pachetul"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s necesită un singur argument"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "numele de fişier „%.250s” nu este absolut"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "numele de fişier nu poate conţine caractere „linie nouă”"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Nu se pot redirecta directoare"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Se părăseşte „%s”"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "„%s” este în conflict cu „%s”"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Se adaugă „%s”"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4669,7 +4727,7 @@ msgstr ""
 "  la ştergerea lui „%s”\n"
 "  a fost găsit „%s”"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4680,37 +4738,37 @@ msgstr ""
 "  la ştergerea lui „%s”\n"
 "  a fost găsit „%s”"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Se şterge „%s”"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Nu există nici o redirectare „%s”, nu se sterge nimic"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "eroare internă - mod incorect „%s”"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "nu se poate citi starea vechiului nume „%s”: „%s”"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "nu se poate citi starea noului nume „%s”: „%s”"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "eroare la verificarea lui „%s”: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4719,52 +4777,52 @@ msgstr ""
 "redenumirea implică supreascrierea lui „%s” cu\n"
 "  un alt fişier „%s”, lucru nepermis"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "redenumire: ştergerea vechii legături duplicate „%s”: %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "redenumire: redenumirea lui „%s” în „%s”: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "crearea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "scrierea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "închiderea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ştergerea vechii redirectări anterioare: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "crearea noii redirectări anterioare: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalarea noilor redirectări: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "eroare internă: %s corupt: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4772,7 +4830,7 @@ msgstr ""
 "\n"
 "Drepturi de autor (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4809,113 +4867,116 @@ msgstr ""
 "  --help                   afişează acest ajutor.\n"
 "  --version                afişează versiunea.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nu s-a specificat nici un mod"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add necesită patru argumente"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "%s, utlizator ilegal"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "%s, utilizator inexistent"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "%s, grup ilegal"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "%s, grup inexistent"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "%s, mod ilegal"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "se şterge / de la final"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Există deja o redirectare pentru „%s”, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "dar s-a specificat --force, deci va fi ignorat."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "se abandonează"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "avertisment: s-a furnizat --update dar %s nu există"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "eşec la schimbarea apartenenţei lui %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "eşec la schimbare permisiunilor lui %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Nu este prezentă nici o redirectare."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "avertisment: --update este inutil pentru --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
-msgstr "nu se poate deschide fişierul de înlocuire a permisiunilor implicite: %s"
+msgstr ""
+"nu se poate deschide fişierul de înlocuire a permisiunilor implicite: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Există redirectări multiple pentru „%s”, se abandonează"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
-msgstr "nu se poate deschide noul fişier de înlocuire a permisiunilor implicite: %s"
+msgstr ""
+"nu se poate deschide noul fişier de înlocuire a permisiunilor implicite: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 "eroare la şergerea fişierului anterior de înlocuire a permisiunilor "
 "implicite: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr ""
 "eroare la crearea noului fişier anterior de înlocuire a permisiunilor "
 "implicite: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
-msgstr "eroare la instalarea noului fişier de înlocuire a permisiunilor implicite: %s"
+msgstr ""
+"eroare la instalarea noului fişier de înlocuire a permisiunilor implicite: %s"
 
 #: scripts/install-info.pl:19
 msgid ""
@@ -5141,7 +5202,7 @@ msgstr "imposibil a citi %s: %d"
 msgid "dbg: %s"
 msgstr "depanare: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5151,8 +5212,8 @@ msgstr ""
 "Drepturi de autor (C) 1995 Ian Jackson.\n"
 "Drepturi de autor (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5172,7 +5233,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5230,96 +5291,37 @@ msgstr ""
 "  --help                   afişează acest ajutor\n"
 "  --version                afişează versiunea\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "argument necunoscut „%s”"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install necesită <legătură> <nume> <cale> <prioritate>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioritatea trebuie să fie un întreg"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s necesită <nume> <cale>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s necesită <nume>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave necesită <legătură> <nume> <cale>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "numele de sclav %s este duplicat"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "legătura de sclav %s este duplicată"
-
-#: scripts/update-alternatives.pl:164
-#, 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:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"est enevoie de --display, --config, --set, --install, --remove, --all, --"
-"remove-all sau--auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave este permis doar cu --install"
-
 # AJUTOR: totuşi ce e ăsta?
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "sclavul %s este duplicat"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "legătura sclav este aceiaşi cu legătura principală %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "legătura sclav %s este duplicată"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "calea %s este duplicată"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioritatea %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5328,66 +5330,124 @@ msgstr ""
 "Alternativa pentru %s indică spre %s - care nu  fost găsit. Se şterge din "
 "lista de alternative."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nu există alternative pentru %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - starea este %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " legătura indică acum spre %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " legătura este absentă acum"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " legătura nu poate fi citită - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritatea %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " sclav %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nici o versiune disponibilă."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Cea mai „bună” versiune în prezent este %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "argument necunoscut „%s”"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install necesită <legătură> <nume> <cale> <prioritate>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioritatea trebuie să fie un întreg"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s necesită <nume> <cale>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s necesită <nume>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave necesită <legătură> <nume> <cale>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "numele de sclav %s este duplicat"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "legătura de sclav %s este duplicată"
+
+#: scripts/update-alternatives.pl:284
+#, 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:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"est enevoie de --display, --config, --set, --install, --remove, --all, --"
+"remove-all sau--auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave este permis doar cu --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Se pregătesc selecţiile automate ale lui %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "imposibil a şterge %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5396,7 +5456,7 @@ msgstr ""
 "%s a fost schimbat (manual sau de un script).\n"
 "Se comută pe actualizare strict manuală."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5407,69 +5467,71 @@ msgstr ""
 "(Puteţi modifica the legăturile simbolice de acolo dacă doreţi - a se vedea "
 "„man ln”.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, 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:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "imposibil a redenumi %s în %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "numele de legătură sclav %s este duplicat"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Se şterge alternativa selectată manual - se comută în modul automat"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Se renunţă la legătura-sclav învechită %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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."
+msgstr ""
+"Actualizările automate ale lui %s sunt dezactivate, va fi lăsat în pace."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, 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:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "imposibil a deschide %s pentru scriere: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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."
+msgstr ""
+"Ultimul pachet care funiza %s (%s) a fost şters, se va şterge şi acesta."
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5478,38 +5540,38 @@ msgstr ""
 "avertisment: %s ar fi trebuit să fie o legătură simbolică spre %s\n"
 " (sau nonexistent); totuşi funcţia readlink a eşuat: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "imposibil a asigura %s nonexistent: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "imposibil a instala %s ca %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Se lasă %s (%s) să indice spre %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Se actualizează %s (%s) să indice spre %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5518,13 +5580,13 @@ msgstr ""
 "avertisment: %s ar fi trebuit să fie o legătură simbolică-sclav spre\n"
 " %s, sau nonexistent; totuşi funcţia readlink a eşuat: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Se şterge %s (%s), nepotrivit cu %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5533,7 +5595,7 @@ msgstr ""
 "Există doar un program care furnizează %s\n"
 "(%s). Nu e nimic de configurat.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5546,47 +5608,58 @@ msgstr ""
 "  Selecţia     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Se foloseşte „%s” pentru a furniza „%s”."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Alternativa „%s” nu poate fi găsită."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "eroare la scriere la ieşirea standard: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
-msgstr "caracterele „linie nouă” sunt interzise în fişierele update-alternatives (%s)"
+msgstr ""
+"caracterele „linie nouă” sunt interzise în fişierele update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lipseşte linie nouă după %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problemă gravă: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: eşec la execuţia gzip -dc"
+
+# fişierul compression.c nu există nici în dpkg-1.9.16 nici în dpkg-1.10.10
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: eşec la execuţia bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: eşec la execuţie bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "imposibil a crea %.250s"
 
@@ -6003,4 +6076,3 @@ msgstr "Problemă gravă: %s"
 #~ "8.3.\n"
 #~ "\n"
 #~ "Starea de ieşire: 0 = OK;  1 = -a nu este un volum;  2 = eroare!\n"
-
diff --git a/po/ru.po b/po/ru.po
index 9e5aee19..527db83f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.13.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-10-07 17:41+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -60,72 +61,57 @@ msgstr "Системная ошибка номер %d"
 msgid "Signal no.%d"
 msgstr "Сигнал номер %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: не удалось запустить gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: внутренняя ошибка gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: не удалось выполнить gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: внутренняя ошибка bzip2:`%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: не удалось выполнить bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: распаковка сжатых данных"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: внутренняя ошибка gzip: чтение: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: внутренняя ошибка gzip: запись: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: внутренняя ошибка gzip: прочитано(%i) != записано(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: не удалось запустить gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: внутренняя ошибка bzip2: чтение: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: внутренняя ошибка bzip2: запись: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: внутренняя ошибка bzip2: прочитано(%i) != записано(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: не удалось запустить bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: сжатие данных"
@@ -155,8 +141,10 @@ msgstr ""
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "каталог обновлений содержит файлы с разными длинами имён (как %d, так и %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"каталог обновлений содержит файлы с разными длинами имён (как %d, так и %d)"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -168,7 +156,7 @@ msgstr "не удалось просмотреть каталог обновле
 msgid "failed to remove incorporated update file %.255s"
 msgstr "не удалось удалить втянутый файл обновлений %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "не удалось создать %.255s"
@@ -308,7 +296,8 @@ msgstr ""
 
 #: lib/ehandle.c:186
 msgid "out of memory for new cleanup entry with many arguments"
-msgstr "недостаточно памяти для новой записи очистки с большим количеством аргументов"
+msgstr ""
+"недостаточно памяти для новой записи очистки с большим количеством аргументов"
 
 #: lib/ehandle.c:198
 msgid "out of memory for new cleanup entry"
@@ -357,12 +346,14 @@ msgstr "в файле состояний пакетов не может встр
 #: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
-msgstr "в информационном поле `%s' слишком много значений (по сравнению с остальными)"
+msgstr ""
+"в информационном поле `%s' слишком много значений (по сравнению с остальными)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "в информационном поле `%s' слишком мало значений (по сравнению с остальными)"
+msgstr ""
+"в информационном поле `%s' слишком мало значений (по сравнению с остальными)"
 
 #: lib/fields.c:133
 msgid "yes/no in boolean field"
@@ -422,7 +413,8 @@ msgstr "в качестве файла конфигурации указан к
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 "Поле `%s': отсутствует имя пакета или указана строка, не могущая являться "
 "именем пакета"
@@ -598,12 +590,14 @@ msgstr "не удалось установить флаг close-on-exec файл
 #: lib/mlib.c:199
 #, c-format
 msgid "failed in buffer_write(fd) (%i, ret=%li): %s"
-msgstr "при работе функции buffer_write(fd) произошла ошибка (%i, ret=%li): %s)"
+msgstr ""
+"при работе функции buffer_write(fd) произошла ошибка (%i, ret=%li): %s)"
 
 #: lib/mlib.c:206
 #, c-format
 msgid "eof in buffer_write(stream): %s"
-msgstr "при работе функции buffer_write(stream) обнаружен символ конца файла: %s"
+msgstr ""
+"при работе функции buffer_write(stream) обнаружен символ конца файла: %s"
 
 #: lib/mlib.c:208
 #, c-format
@@ -643,7 +637,8 @@ msgstr "при работе функции buffer_copy (%s) произошла 
 #: lib/mlib.c:338
 #, c-format
 msgid "short read in buffer_copy (%s)"
-msgstr "при работе функции buffer_copy (%s) прочитан слишком короткий блок данных"
+msgstr ""
+"при работе функции buffer_copy (%s) прочитан слишком короткий блок данных"
 
 #: lib/myopt.c:40
 #, c-format
@@ -788,7 +783,8 @@ msgstr "название пользовательского поля %.*s сли
 #: lib/parse.c:221
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
-msgstr "значение пользовательского поля %.*s должно встречаться только один раз"
+msgstr ""
+"значение пользовательского поля %.*s должно встречаться только один раз"
 
 #: lib/parse.c:234
 msgid "several package info entries found, only one allowed"
@@ -856,7 +852,8 @@ msgstr "должно начинаться с латинской буквы ил
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "символ `%c' недопустим (допустимы латинские буквы, цифры и символы `%s')"
+msgstr ""
+"символ `%c' недопустим (допустимы латинские буквы, цифры и символы `%s')"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -906,30 +903,30 @@ msgstr "В строке формата отсутствует закрывающ
 msgid "failed to realloc for variable buffer"
 msgstr "функции realloc не удалось выделить буфер переменных"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  уже исчез !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "ошибка чтения данных из канала dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "ошибка при установке времени модификации %.255s"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "ошибка при установке владельца %.255s"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "ошибка при установке прав доступа к %.255s"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -938,16 +935,17 @@ msgstr ""
 "попытка переписать файл `%.250s', являющийся файлом %.250s с изменённым\n"
 "размещением %.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (пакет: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
-msgstr "не удалось получить информацию о %.255s (который должен быть установлен)"
+msgstr ""
+"не удалось получить информацию о %.255s (который должен быть установлен)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -956,118 +954,120 @@ msgstr ""
 "при установке новой версии не удалось разобраться со старой мешаниной в "
 "%.255s"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "перед установкой новой версии не удалось получить информацию о "
 "восстановленном файле %.255s"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "архив содержит объект %.255s неизвестного типа 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Замена файлов в старом пакете %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Заменено файлами из установленного пакета %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 "попытка переписать каталог %.250s в пакете %.250s файлом, не являющимся "
 "каталогом"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "попытка перезаписать %.250s, который уже имеется в пакете %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "сожрано заменой файла `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "обработка файла %.255s процессом dpkg-deb"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "ошибка при закрытии/записи %.255s"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "ошибка создания канала %.255s"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "ошибка создания устройства %.255s"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "ошибка создания жёсткой ссылки %.255s"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "ошибка создания символической ссылки %.255s"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "ошибка при установке владельца символической ссылки %.255s"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "ошибка создания каталога %.255s"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 "не удалось переместить в другое место %.255s, что необходимо для установки "
 "новой версии"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "не удалось прочитать символическую ссылку %.255s"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "не удалось создать резервную ссылку на %.255s"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "не удалось сменить владельца резервной ссылки на %.255s"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "не удалось создать резервную ссылку на %.255s перед установкой новой версии"
+msgstr ""
+"не удалось создать резервную ссылку на %.255s перед установкой новой версии"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "не удалось установить новую версию %.255s"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1076,7 +1076,7 @@ msgstr ""
 "dpkg: предупреждение -- %s удаляется, несмотря на проблемы зависимостей:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1085,7 +1085,7 @@ msgstr ""
 "dpkg: предупреждение -- для удаления пакета %2$s необходимо\n"
 "удаление пакета первой необходимости %1$s и файлов его конфигурации.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1094,7 +1094,7 @@ msgstr ""
 "dpkg: пакет %s является пакетом первой необходимости и не будет\n"
 "удалён, хотя это и нужно для удаления пакета %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1103,22 +1103,24 @@ msgstr ""
 "dpkg: удалить %s невозможно (вам поможет --auto-deconfigure):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
-msgstr "dpkg: чтобы можно было установить пакет %2$s, необходимо удалить %1$s...\n"
+msgstr ""
+"dpkg: чтобы можно было установить пакет %2$s, необходимо удалить %1$s...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s не установлен корректно, все зависимости от него игнорируются.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
-msgstr "dpkg: возможны проблемы с удалением %s, поскольку он предоставляет %s...\n"
+msgstr ""
+"dpkg: возможны проблемы с удалением %s, поскольку он предоставляет %s...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1127,17 +1129,22 @@ msgstr ""
 "dpkg: пакет %s требует переустановки, но по вашему указанию всё равно будет "
 "удалён.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: пакет %s требует переустановки и не будет удалён.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: %s будет удалён, чтобы можно было установить %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1146,76 +1153,76 @@ msgstr ""
 "dpkg: анализ файла %s, содержащего пакет %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "конфликт пакетов -- %.250s не будет установлен"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: предупреждение -- конфликт игнорируется, можно продолжать!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive требует задания хотя бы одного имени каталога"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "не удалось запустить find для поиска файлов в каталогах"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "не удалось открыть дескриптор канала find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "ошибка чтения из канала find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "ошибка при закрытии канала find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 "при поиске файлов в каталогах программа find вернула неизвестный код ошибки %"
 "i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 "поиск завершён, пакеты (файлы с именами, удовлетворяющими шаблону *.deb) "
 "найти не удалось"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s требует задания хотя бы одного имени файла"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Выбор ранее не выбранного пакета %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Пропуск не выбранного пакета %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Версия %.250s пакета %.250s уже установлена, пропускаем пакет.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s: предупреждение -- снижение версии %.250s с %.250s до %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "Версия %.250s не будет снижена с %.250s до %.250s, пропускаем пакет.\n"
@@ -1325,7 +1332,8 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: предупреждение -- не удалось удалить резервную копию `%.250s': %s\n"
+msgstr ""
+"dpkg: %s: предупреждение -- не удалось удалить резервную копию `%.250s': %s\n"
 
 #: src/configure.c:241
 #, c-format
@@ -1438,7 +1446,8 @@ msgstr "не удалось изменить владельца нового ф
 #: src/configure.c:438
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
-msgstr "не удалось установить режим доступа к новому файлу конфигурации `%.250s'"
+msgstr ""
+"не удалось установить режим доступа к новому файлу конфигурации `%.250s'"
 
 #: src/configure.c:468
 #, c-format
@@ -1600,112 +1609,119 @@ msgstr "В ответе на запрос из потока stdin прочита
 msgid "unable to check for existence of `%.250s'"
 msgstr "не удалось проверить существование %.250s"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " зависит от "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " требует предварительной установки "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " рекомендует "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " предлагает "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " ломает "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " конфликтует с "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " предлагает "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " расширяет возможности "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  пакет %.250s будет удалён.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  файлы конфигурации пакета %.250s будут удалены.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr " пакет %.250s будет установлен, но его версия %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  пакет %.250s установлен, но его версия %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  пакет %.250s распакован, но не был настроен.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  пакет %.250s распакован, но его версия %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  последняя настроенная версия пакета %.250s -- %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  пакет %.250s %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr " пакет %.250s предоставляет %.250s, но должен быть удалён.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  пакет %.250s предоставляет %.250s, но должен быть удалён вместе с файлами "
 "конфигурации.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  пакет %.250s предоставляет %.250s, но он %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  пакет %.250s не установлен.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  пакет %.250s версии %.250s будет установлен.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  пакет %.250s версии %.250s %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  пакет %.250s предоставляет %.250s и будет установлен.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  пакет %.250s предоставляет %.250s и %s.\n"
@@ -1795,7 +1811,8 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg не обозначен как установленный, невозможно проверить поддержку эпох!\n"
+msgstr ""
+"dpkg не обозначен как установленный, невозможно проверить поддержку эпох!\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1823,7 +1840,8 @@ msgid "--print-architecture does not take any argument"
 msgstr "параметр --print-architecture не принимает аргументов"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "параметр --compare-versions требует наличия трёх аргументов: <версия> "
 "<отношение> <версия>"
@@ -1847,7 +1865,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: не удалось выделить память для нового элемента списка неудачно "
 "установленных пакетов."
@@ -1868,11 +1887,13 @@ msgstr "Обработка остановлена из-за слишком бо
 #: src/errors.c:112
 #, c-format
 msgid "Package %s was on hold, processing it anyway as you request\n"
-msgstr "Пакет %s зафиксирован, но по вашему указанию всё равно обрабатывается\n"
+msgstr ""
+"Пакет %s зафиксирован, но по вашему указанию всё равно обрабатывается\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 "Пакет %s зафиксирован и не будет обработан. Если вас это не устраивает, "
 "используйте --force-hold.\n"
@@ -1994,7 +2015,8 @@ msgstr "fgets прочитал пустую строку из файла diversi
 
 #: src/filesdb.c:475
 msgid "diversions file has too-long line or EOF [i]"
-msgstr "файл diversions содержит слишком длинную строку или символ конца файла [i]"
+msgstr ""
+"файл diversions содержит слишком длинную строку или символ конца файла [i]"
 
 #: src/filesdb.c:481
 msgid "read error in diversions [ii]"
@@ -2010,7 +2032,8 @@ msgstr "fgets прочитал пустую строку из файла diversi
 
 #: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
-msgstr "файл diversions содержит слишком длинную строку или символ конца файла [ii]"
+msgstr ""
+"файл diversions содержит слишком длинную строку или символ конца файла [ii]"
 
 #: src/filesdb.c:492
 msgid "read error in diversions [iii]"
@@ -2126,7 +2149,8 @@ msgstr "старый скрипт, выполняемый %s"
 #: src/help.c:354
 #, c-format
 msgid "dpkg: warning - unable to stat %s `%.250s': %s\n"
-msgstr "dpkg: предупреждение -- не удалось получить информацию о %s %.250s: %s\n"
+msgstr ""
+"dpkg: предупреждение -- не удалось получить информацию о %s %.250s: %s\n"
 
 #: src/help.c:361
 #, c-format
@@ -2499,7 +2523,8 @@ msgstr ""
 #: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
-msgstr "аргумент --%s (`%.250s') не является допустимым целочисленным значением"
+msgstr ""
+"аргумент --%s (`%.250s') не является допустимым целочисленным значением"
 
 #: src/main.c:318
 #, c-format
@@ -2632,7 +2657,7 @@ msgstr "не удалось открыть поток дескриптора `%i
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "требуется параметр действия"
@@ -2709,6 +2734,10 @@ msgstr "  Пакет %s, предоставляющий %s, не установ
 msgid "  Package %s is not installed.\n"
 msgstr "  Пакет %s не установлен.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " зависит от "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ", однако:\n"
@@ -2794,7 +2823,8 @@ msgstr ""
 #: src/processarc.c:260
 #, c-format
 msgid "unsupported dependency problem - not installing %.250s"
-msgstr "проблема с неподдерживаемой зависимостью, пакет %.250s не будет установлен"
+msgstr ""
+"проблема с неподдерживаемой зависимостью, пакет %.250s не будет установлен"
 
 #: src/processarc.c:262
 #, c-format
@@ -2818,7 +2848,8 @@ msgstr "не выполнены предварительные условия, 
 #: src/processarc.c:279
 #, c-format
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
-msgstr "dpkg: предупреждение -- игнорируются предварительные условия установки!\n"
+msgstr ""
+"dpkg: предупреждение -- игнорируются предварительные условия установки!\n"
 
 #: src/processarc.c:294
 #, c-format
@@ -2886,7 +2917,8 @@ msgstr ""
 #: src/processarc.c:629
 #, c-format
 msgid "dpkg: warning - unable to delete old directory `%.250s': %s\n"
-msgstr "dpkg: предупреждение -- не удалось удалить старый каталог `%.250s': %s\n"
+msgstr ""
+"dpkg: предупреждение -- не удалось удалить старый каталог `%.250s': %s\n"
 
 #: src/processarc.c:633
 #, c-format
@@ -2894,8 +2926,8 @@ msgid ""
 "dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
 "been deleted)\n"
 msgstr ""
-"dpkg: предупреждение -- старый conffile `%.250s' является пустым "
-"каталогом (и был удалён)\n"
+"dpkg: предупреждение -- старый conffile `%.250s' является пустым каталогом "
+"(и был удалён)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2903,10 +2935,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "не удалось получить статус другого нового файла `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: предупреждение -- старый файл `%.250s' такой же как несколько новых "
 "файлов! (`%.250s' и `%.250s')"
@@ -2935,7 +2967,8 @@ msgstr "не удалось удалить устаревший информац
 #: src/processarc.c:769
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
-msgstr "не удалось установить(предположительно) новый информационный файл `%.250s'"
+msgstr ""
+"не удалось установить(предположительно) новый информационный файл `%.250s'"
 
 #: src/processarc.c:776
 msgid "unable to open temp control directory"
@@ -2944,7 +2977,9 @@ msgstr "не удалось открыть временный каталог у
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "пакет содержит очень длинное имя файла управляющей информации (начинается с `%.50s')"
+msgstr ""
+"пакет содержит очень длинное имя файла управляющей информации (начинается с `"
+"%.50s')"
 
 #: src/processarc.c:790
 #, c-format
@@ -3165,7 +3200,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr ""
 "dpkg: предупреждение -- запрос на удаление неустановленного пакета %.250s "
 "игнорируется.\n"
@@ -3182,7 +3218,8 @@ msgstr ""
 
 #: src/remove.c:109
 msgid "This is an essential package - it should not be removed."
-msgstr "Этот пакет является пакетом первой необходимости и не должен быть удалён."
+msgstr ""
+"Этот пакет является пакетом первой необходимости и не должен быть удалён."
 
 #: src/remove.c:135
 #, c-format
@@ -3387,26 +3424,31 @@ msgstr "параметр --forget-old-unavail не принимает аргум
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb: ошибка -- %s (%s) не содержит ни одной цифры\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "параметр --build требует задания в качестве аргумента имени каталога"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "параметр --build может иметь не более двух аргументов"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "не удалось проверить существование архива %.250s"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "в качестве места назначения задан каталог, пропустить проверку управляющего "
 "файла невозможно"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3415,47 +3457,48 @@ msgstr ""
 "dpkg-deb: предупреждение -- содержимое управляющей области не проверяется.\n"
 "dpkg-deb: сборка неизвестного пакета в файл %s.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "имя пакета содержит символы, отличные от строчных латинских букв, цифр, -, + "
 "и ."
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr "предупреждение: %s содержит не предопределённое значение приоритета %s\n"
+msgstr ""
+"предупреждение: %s содержит не предопределённое значение приоритета %s\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "предупреждение: %s содержит не предопределённое поле %s\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "в управляющем файле обнаружено %d ошибок"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: сборка пакета %s в файл %s.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "у управляющего каталога установлен недопустимый режим доступа %03lo (должен "
 "быть >=0755 и <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 "скрипт сопровождения %.50s не является обычным файлом или символической "
 "ссылкой"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3464,135 +3507,138 @@ msgstr ""
 "у скрипта сопровождения %.50s установлен недопустимый режим доступа %03lo "
 "(должен быть >=0755 и <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "получить информацию о скрипте сопровождения %.50s невозможно"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "при чтении списка файлов конфигурации fgets вернул пустую строку"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 "предупреждение: имя файла конфигурации (%.50s...) слишком длинное или "
 "пропущен символ конца строки\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "предупреждение: имя файла conffile `%s' содержит в конце пробельные символы\n"
+msgstr ""
+"предупреждение: имя файла conffile `%s' содержит в конце пробельные символы\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "файл конфигурации `%.250s' в пакете отсутствует"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "получить информацию о файле конфигурации `%.250s' невозможно"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "предупреждение: файл конфигурации `%s' не является обычным файлом\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "ошибка чтения списка файлов конфигурации"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "ошибка при открытии списка файлов конфигурации"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: проигнорировано %d предупреждений об управляющих файлах\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "не удалось отменить буферизацию %.255s"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "не удалось перейти в каталог %.255s"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "не удалось перейти в каталог .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "не удалось запустить tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "не удалось создать временный файл (управляющая информация)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "не удалось открыть временный файл (управляющая информация) %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "не удалось удалить временный файл (управляющая информация) %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "управляющая информация"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
-msgstr "не удалось получить информацию о временном файле (управляющая информация)"
+msgstr ""
+"не удалось получить информацию о временном файле (управляющая информация)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "не удалось перейти к началу временного файла (управляющая информация)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "не удалось создать временный файл (данные)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "не удалось открыть временный файл (данные) %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "не удалось удалить временный файл (данные) %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "данные"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "не удалось запустить find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "не удалось записать имя файла в канал программы tar (данные)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Внутренняя ошибка, неизвестный compress_type `%i'!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "не удалось перейти к началу временного файла (данные)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (данные)"
 
@@ -3671,24 +3717,25 @@ msgstr "в номере версии архива нет точки"
 #: dpkg-deb/extract.c:137
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
-msgstr "архивы версии %.250s не поддерживаются, используйте более новый dpkg-deb"
+msgstr ""
+"архивы версии %.250s не поддерживаются, используйте более новый dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "пропущены данные компонента файла %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "файл %.250s содержит не распознаваемый компонент данных %.*s, сдаёмся"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "файл %.250s содержит два управляющих компонента, сдаёмся"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3697,16 +3744,17 @@ msgstr ""
 " новый пакет Debian, версия %s.\n"
 " размер %ld байт(а): управляющий архив длиной %zi байт(а).\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "длина управляющей информации"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
-msgstr "запись о длине управляющей информации архива `%s' имеет недопустимый формат"
+msgstr ""
+"запись о длине управляющей информации архива `%s' имеет недопустимый формат"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3716,15 +3764,15 @@ msgstr ""
 " размер %ld байт(а): управляющий архив длиной %zi байт(а),\n"
 "основной архив длиной %ld байт(а).\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "не удалось выделить память для переменной `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "область управляющей информации"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3733,65 +3781,66 @@ msgstr ""
 "dpkg-deb: файл выглядит так, как будто его загрузили в ASCII\n"
 "dpkg-deb:    режиме и сделали, таким образом, нечитаемым.\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' не является архивом в формате debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "не удалось получить текущую позицию в файле"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "не удалось установить текущую позицию в файле"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "не удалось открыть дескриптор потока `1' для вставки"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "не удалось осуществить запись в канал gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "не удалось закрыть канал gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
-msgstr "не удалось установить позицию чтения на часть архива, содержащую данные"
+msgstr ""
+"не удалось установить позицию чтения на часть архива, содержащую данные"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "не удалось осуществить запись в канал ввода/вывода при копировании"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "не удалось закрыть канал ввода/вывода при копировании"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "не удалось создать каталог"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "не удалось после создания каталога перейти в него"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "не удалось перейти в каталог"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "не удалось запустить tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s требует указания в качестве аргумента имени файла .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3800,12 +3849,12 @@ msgstr ""
 "--%s требует указания каталога назначения.\n"
 "Вероятно, вам следует использовать dpkg --install"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s принимает не более двух аргументов (имя файла .deb и каталог)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s принимает только один аргумент (имя файла .deb)"
@@ -3820,7 +3869,8 @@ msgstr "при очистке не удалось разветвить проц
 
 #: dpkg-deb/info.c:56
 msgid "failed to wait for rm cleanup"
-msgstr "при очистке ожидание завершения выполнения команды rm завершилось неудачно"
+msgstr ""
+"при очистке ожидание завершения выполнения команды rm завершилось неудачно"
 
 #: dpkg-deb/info.c:57
 #, c-format
@@ -3847,7 +3897,8 @@ msgstr "dpkg-deb: %.255s не содержит управляющего комп
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "по непонятной причине не удалось открыть компонент %.255s (каталог %.255s)"
+msgstr ""
+"по непонятной причине не удалось открыть компонент %.255s (каталог %.255s)"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3963,7 +4014,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3974,7 +4025,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Параметры:\n"
@@ -4014,7 +4066,7 @@ msgstr ""
 "Чтобы получить информацию об установке и удалении пакетов, введите dpkg --"
 "help."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "неизвестный тип сжатия --`%s'!"
@@ -4027,7 +4079,8 @@ msgstr "файл `%.250s' повреждён -- отсутствует %.250s"
 #: dpkg-split/info.c:67
 #, c-format
 msgid "file `%.250s' is corrupt - missing newline after %.250s"
-msgstr "файл `%.250s' повреждён -- отсутствует символ конца строки после %.250s"
+msgstr ""
+"файл `%.250s' повреждён -- отсутствует символ конца строки после %.250s"
 
 #: dpkg-split/info.c:91
 msgid "unable to seek back"
@@ -4046,7 +4099,8 @@ msgstr "файл `%.250s' повреждён -- нулевые символы в
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "формат файла `%.250s' имеет версию `%.250s' -- вам нужен новый dpkg-split"
+msgstr ""
+"формат файла `%.250s' имеет версию `%.250s' -- вам нужен новый dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -4056,7 +4110,8 @@ msgstr "файл `%.250s' повреждён -- неверная сумма MD5
 #: dpkg-split/info.c:131
 #, c-format
 msgid "file `%.250s' is corrupt - no slash between part numbers"
-msgstr "файл `%.250s' повреждён -- отсутствует косая черта между номерами частей"
+msgstr ""
+"файл `%.250s' повреждён -- отсутствует косая черта между номерами частей"
 
 #: dpkg-split/info.c:140
 #, c-format
@@ -4073,12 +4128,14 @@ msgstr ""
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
-msgstr "файл `%.250s' повреждён -- второй компонент не является компонентом данных"
+msgstr ""
+"файл `%.250s' повреждён -- второй компонент не является компонентом данных"
 
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "файл `%.250s' повреждён -- неверное число частей при заданном размере части"
+msgstr ""
+"файл `%.250s' повреждён -- неверное число частей при заданном размере части"
 
 #: dpkg-split/info.c:157
 #, c-format
@@ -4400,9 +4457,9 @@ msgstr "исходный файл %.250s не является обычным ф
 msgid "unable to exec mksplit"
 msgstr "не удалось запустить mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s, версия %s.\n"
@@ -4415,9 +4472,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4475,7 +4532,7 @@ msgid "try deleting %s"
 msgstr "попытка удалить %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "не удалось открыть %s: %s"
@@ -4502,7 +4559,7 @@ msgid "unable to close %s after read: %s"
 msgstr "не удалось закрыть %s после чтения: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "не удалось закрыть %s: %s"
@@ -4522,12 +4579,12 @@ msgstr "не удалось установить %s; будет оставлен
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: не удалось разблокировать %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Не удалось получить значение ENOENT из %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4537,7 +4594,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4594,89 +4651,89 @@ msgstr ""
 "В сценариях preinst/postrm пакетов всегда нужно указывать --package и --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "указано два режима: %s и --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "для --%s требуется аргумент divert-to"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to не может содержать символов новой строки"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "для --%s требуется аргумент <пакет>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "пакет не может содержать символов новой строки"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s требуется аргумент <каталог>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "неизвестный параметр `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "не удалось открыть файл diversions: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "отсутствует altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "отсутствует пакет"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s нужен один аргумент"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "имя файла \"%s\" указано не с полным путём"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "файл не может содержать символов новой строки"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Нельзя отклонять каталоги"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Оставляется `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' расходится с `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Добавляется `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4687,7 +4744,7 @@ msgstr ""
 "  при удалении `%s'\n"
 "  найдено `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4698,37 +4755,37 @@ msgstr ""
 "  при удалении `%s'\n"
 "  найдено `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Удаляется `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Нет отклонения `%s', ничего не удалено"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "внутренняя ошибка -- неправильный режим `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "не удалось выполнить stat старого имени `%s': %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "не удалось выполнить stat нового имени `%s': %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "ошибка при проверке `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4737,52 +4794,52 @@ msgstr ""
 "переименование вызовет перезапись `%s'\n"
 "  другим файлом `%s', что не разрешено"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: удаление дублирующей старой ссылки `%s': %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: переименование `%s' в `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "создание diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "запись diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "закрытие diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "удаление старого diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "создание нового diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "установка нового файла diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "внутренняя ошибка: %s повреждён: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4790,7 +4847,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4826,106 +4883,106 @@ msgstr ""
 "  --help                   вывести это сообщение.\n"
 "  --version                вывести номер версии.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "не указан режим"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "для --add требуется четыре параметра"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "недопустимый пользователь %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "несуществующий пользователь %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "недопустимая группа %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "несуществующая группа %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "недопустимый режим %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "удаляются конечные /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Замещение для \"%s\" уже существует, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "но указан параметр --force, поэтому ошибка игнорируется."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "аварийное прекращение"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "предупреждение: указан --update, но %s не существует"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "не удалось выполнить chown %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "не удалось выполнить chmod %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Нет замещений."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "предупреждение: --update бесполезен вместе с --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "не удалось открыть statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Несколько замещений для \"%s\", аварийное завершение"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "не удалось открыть новый файл statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "ошибка при удалении statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "ошибка при создании нового statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "ошибка при установке нового statoverride: %s"
@@ -5054,7 +5111,8 @@ msgstr "%s: копирование %s в %s завершилось неудач
 #: scripts/install-info.pl:288
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
-msgstr "%s: файл %s с резервной копией недоступен, получение файла по умолчанию."
+msgstr ""
+"%s: файл %s с резервной копией недоступен, получение файла по умолчанию."
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5146,7 +5204,7 @@ msgstr "не удалось прочитать %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5156,8 +5214,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5177,7 +5235,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5233,95 +5291,36 @@ msgstr ""
 "  --help                   вывести это сообщение.\n"
 "  --version                вывести номер версии.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "неизвестный аргумент `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "для --install требуется указать <ссылку> <имя> <путь> <приоритет>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "приоритет должен быть целым числом"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "для --%s требуется <имя> <путь>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "для --%s требуется <имя>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "для --slave требуются аргументы <ссылка> <имя> <путь>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "повторяющееся подчинённое имя %s"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "повторяющаяся подчинённая ссылка %s"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "имя %s принадлежит и мастеру и подчинённому"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "ссылка %s принадлежит и мастеру и подчинённому"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"требуется --display, --config, --set, --install, --remove, --all, --remove-"
-"all или --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "команда --slave возможна только вместе с --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "повторение подчинённого %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "совпадение подчинённой ссылки с главной ссылкой %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "повторение подчинённой ссылки %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "повторение пути %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "приоритет %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5330,66 +5329,124 @@ msgstr ""
 "Альтернатива для %s указывает на %s, которая не найдена. Удаляется из списка "
 "альтернатив."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Нет альтернатив для %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "состояние %s: %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ссылка сейчас указывает на %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " ссылка сейчас отсутствует"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ссылка не читается - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "приоритет %s: %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " подчинённый %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Нет доступных версий."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Текущая `лучшая' версия: %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "неизвестный аргумент `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "для --install требуется указать <ссылку> <имя> <путь> <приоритет>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "приоритет должен быть целым числом"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "для --%s требуется <имя> <путь>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "для --%s требуется <имя>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "для --slave требуются аргументы <ссылка> <имя> <путь>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "повторяющееся подчинённое имя %s"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "повторяющаяся подчинённая ссылка %s"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "имя %s принадлежит и мастеру и подчинённому"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "ссылка %s принадлежит и мастеру и подчинённому"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"требуется --display, --config, --set, --install, --remove, --all, --remove-"
+"all или --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "команда --slave возможна только вместе с --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Настройка автоматического выбора %s."
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "не удалось удалить %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5398,7 +5455,7 @@ msgstr ""
 "%s была изменена (вручную или сценарием).\n"
 "Переключение на режим только ручного обновления."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5407,71 +5464,71 @@ msgstr ""
 "Проверка доступных версий %s, обновление ссылок в %s ...\n"
 "(Вы можете изменить символические ссылки, если хотите -- смотрите `man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Переименовывается ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "не удалось переименовать %s в %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "повторяется имя подчинённой ссылки %s"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Переименовывается подчинённая ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Удаляется альтернатива выбранная вручную -- переключение в автоматический "
 "режим"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Альтернатива %s для %s не зарегистрирована, не удаляется."
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Отбрасывается устаревшая подчинённая ссылка %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Автоматическое обновление %s выключено, оставлено как есть."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Чтобы вернуться в автоматический режим выполните команду `update-"
 "alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Восстановление раннее неудачного обновления %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "не удалось открыть %s на запись: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Последний пакет, предоставлявший %s (%s) удалён, удаление."
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5480,38 +5537,38 @@ msgstr ""
 "предупреждение: %s предположительно является символической ссылкой на %s\n"
 " (или на не существующую); однако, readlink завершился неудачно: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "не удалось убедиться в не существовании %s: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "не удалось создать символическую ссылку %s на %s: %s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "не удалось установить %s как %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Оставляется %s (%s), указывающая на %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Обновляется %s (%s), указывающая на %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5521,13 +5578,13 @@ msgstr ""
 "ссылкой на %s, или на несуществующую; однако, readlink завершилась неудачно: "
 "%s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Удаляется %s (%s) не соответствующая %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5536,7 +5593,7 @@ msgstr ""
 "Есть только одна программа, которая предоставляет %s\n"
 "(%s). Настраивать нечего.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5549,44 +5606,52 @@ msgstr ""
 "  Выбор        Альтернатива\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Нажмите enter, чтобы сохранить значение по умолчанию[*], или введите "
 "выбранное число: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Используется `%s' для предоставления `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Не удалось найти альтернативу `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "ошибка записи в stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "символы новой строки запрещены в файлах update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ошибка или конец файла при чтении %s для %s (%s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "пропущен символ новой строки после %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Серьёзная проблема: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: не удалось выполнить gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: не удалось выполнить bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: не удалось запустить bzip2 %s"
diff --git a/po/sk.po b/po/sk.po
index f9baf033..0e75999e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -57,72 +57,57 @@ msgstr "Systémová chyba č.%d"
 msgid "Signal no.%d"
 msgstr "Signál č.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: zlyhalo vykonanie gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: interná chyba gzip-u: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: zlyhalo vykonanie gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: interná chyba bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: zlyhalo vykonanie bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekompresia"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: interná chyba gzip-u: čítanie: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: interná chyba gzip-u: zápis: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: interná chyba gzip-u: čítanie(%i) != zápis (%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: zlyhalo vykonanie gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: interná chyba bzip2: čítanie: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: interná chyba bzip2: zápis: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: interná chyba bzip2: čítanie(%i) != zápis (%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: zlyhalo vykonanie bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: kompresia"
@@ -169,7 +154,7 @@ msgstr "nemôžem zistiť obsah adresára s aktualizáciami `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "zlyhalo odstránenie pridruženého aktualizačného súboru %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "nedá sa vytvoriť `%.255s'"
@@ -896,30 +881,30 @@ msgstr "Uzatváracia zátvorka chýba vo formáte\n"
 msgid "failed to realloc for variable buffer"
 msgstr "zlyhalo vykonanie funkcie realloc pre zásobník premenných"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ... už zmizol !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "chyba pri čítaní z rúry dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "chyba pri nastavovaní časovej značky u `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "chyba pri nastavovaní vlastníckych práv u `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "chyba pri nastavovaní prístupových práv u `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -928,16 +913,16 @@ msgstr ""
 "skúšam prepísať `%.250s', ktorý je odklonenou verziou `%.250s'%.10s%.100s"
 "%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (balík: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "nie je možné zistiť stav `%.255s' (ktorý bude práve nainštalovaný)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -946,117 +931,117 @@ msgstr ""
 "nie je možné upratať odpad obklopujúci `%.255s' pred nainštalovaním inej "
 "verzie"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 "nie je možné zistiť stav obnoveného `%.255s' pred nainštalovaním inej verzie"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "archív obsahoval objekt `%.255s' neznámeho typu 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Nahradzujú sa súbory v starom balíku %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Nahradzujú sa súbory v nainštalovanom balíku %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "skúšam prepísať adresár `%.250s' v balíku %.250s neadresárom"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "skúšam prepísať `%.250s', ktorý je tiež v balíku %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "spracovanie nahradilo súbor `%.250s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "backend dpkg-deb počas `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "chyba pri uzatváraní/zápise `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "chyba pri vytváraní rúry `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "chyba pri vytváraní zariadenia `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "chyba pri vytváraní pevného odkazu `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "chyba pri vytváraní symbolického odkazu `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "chyba pri nastavovaní vlastníckych práv symbolického odkazu `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "chyba pri vytváraní adresára `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "nie je možné odsunúť `%.255s' pre nainštalovanie novej verzie"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "nie je možné čítať linku `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "nie je možné vytvoriť záložný symbolický odkaz pre `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 "nie je možné zmeniť vlastnícke práva na záložnom symbolickom odkaze pre `"
 "%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "nie je možné vytvoriť záložný odkaz `%.255s' pred nainštalovaním novej verzie"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "nie je možné nainštalovať novú verziu `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1066,7 +1051,7 @@ msgstr ""
 "balíku %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1075,7 +1060,7 @@ msgstr ""
 "dpkg: upozornenie - uvažujem o odkonfigurovaní nutného\n"
 " balíku %s, ktoré umožní odstránenie %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1084,7 +1069,7 @@ msgstr ""
 "dpkg: nie, %s je nutný, nebude odkonfigurovaný\n"
 " pre odstránenie %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1093,23 +1078,23 @@ msgstr ""
 "dpkg: nie, nemôžem odstrániť %s (--auto-deconfigure pomôže):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: uvažujem o odstránení %s v prospech %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "%s nie je správne nainštalovaný - ignorujem všetky závislosti na ňom.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: možné problémy s odstránením %s, pretože poskytuje %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1118,17 +1103,22 @@ msgstr ""
 "dpkg: balík %s vyžaduje reinštaláciu, bude ale odstránený podľa vašej "
 "požiadavky.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: balík %s vyžaduje reinštaláciu, nepokračujem v odinštalácii.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: áno, odstránim %s v prospech %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1137,73 +1127,73 @@ msgstr ""
 "dpkg: ohľadom %s obsahujúci %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "konflikt balíkov - nebudem inštalovať %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: upozornenie - ignorujem konflikt, pokračujem ďalej !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive vyžaduje aspoň jednu cestu ako argument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "zlyhalo spustenie prikazu find pre --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "zlyhalo vykonanie funkcie fdopen na rúre príkazu find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "chyba pri čítaní z rúry príkazu find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "chyba pri uzatváraní rúry príkazu find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "príkaz find pre --recursive vrátil nespracovanú chybu %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "prehľadané, nebol ale nájdený žiadny balík (súbory vyhovujúce *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s vyžaduje ako argument aspoň jeden súbor s balíkom"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Vyberám predtým zrušený balík %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Preskakujem zrušený balík %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Verzia %.250s %.250s je uz nainštalovaná, preskakujem.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 "%s - upozornenie: inštalujem staršiu verziu %.250s z %.250s na %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1591,110 +1581,117 @@ msgstr "EOF na štandardnom vstupe pri otázke na konfiguračné súbory"
 msgid "unable to check for existence of `%.250s'"
 msgstr "nie je možné overiť existenciu `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " závisí na "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " pred-závisí na "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " odporúča "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " navrhuje "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " porušuje "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " je v konflikte s "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " navrhuje "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " rozširuje "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sa odstráni.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  zruší sa nastavenie %.250s.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s sa nainštaluje, ale vo verzii %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s je nainštalovaný, ale vo verzii %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s je rozbalený, ale sa ešte nenastavil.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s je rozbalený, ale vo verzii %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s naposledy nastavená verzia je %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s je %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s poskytuje %.250s, ale sa odstráni.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s poskytuje %.250s, ale jeho nastavenie sa zruší.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nie je nainštalovaný.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (verzia %.250s) sa nainštaluje.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (verzia %.250s) je %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s poskytuje %.250s a bude sa inštalovať.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s poskytuje %.250s a je %s.\n"
@@ -2224,15 +2221,20 @@ msgstr ""
 "  --configure        <balík> ... | -a|--pending\n"
 "  -r|--remove        <balík> ... | -a|--pending\n"
 "  -P|--purge         <balík> ... | -a|--pending\n"
-"  --get-selections [<vzor> ...]    vypíše zvolené balíky na štandartný výstup.\n"
-"  --set-selections                 nastaví zvolené balíky zo štandartného vstupu.\n"
-"  --clear-selections               zruší označenie všetkých balíov okrem nutných.\n"
+"  --get-selections [<vzor> ...]    vypíše zvolené balíky na štandartný "
+"výstup.\n"
+"  --set-selections                 nastaví zvolené balíky zo štandartného "
+"vstupu.\n"
+"  --clear-selections               zruší označenie všetkých balíov okrem "
+"nutných.\n"
 "  --update-avail <súbor Packages>  nahradí údaje o dostupných balíkoch.\n"
 "  --merge-avail <súbor Packages>   zlúči údaje o dostupných balíkoch.\n"
 "  --clear-avail                    odstráni údaje o dostupných balíkoch.\n"
-"  --forget-old-unavail             zabudne nenainštalované nedostupné balíky.\n"
+"  --forget-old-unavail             zabudne nenainštalované nedostupné "
+"balíky.\n"
 "  -s|--status <balík> ...          zobrazí podrobný stav balíka.\n"
-"  -p|--print-avail <balík> ...     zobrazí údaje o dostupných verziách balíka.\n"
+"  -p|--print-avail <balík> ...     zobrazí údaje o dostupných verziách "
+"balíka.\n"
 "  -L|--listfiles <balík> ...       zobrazí súbory `patriace' balíku.\n"
 "  -l|--list [<vzor> ...]           zobrazí stručný zoznam balíkov.\n"
 "  -S|--search <vzor> ...           nájde balík vlastniaci súbor(y).\n"
@@ -2263,7 +2265,8 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help).\n"
 "\n"
 msgstr ""
-"Na archívy použijte dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
+"Na archívy použijte dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-"
+"f|--field|\n"
 " -x|--extract|-X|--vextract|--fsys-tarfile  (napíšte %s --help).\n"
 "\n"
 
@@ -2310,17 +2313,23 @@ msgid ""
 msgstr ""
 "Voľby:\n"
 "  --admindir=<adresár>       použije <adresár> namiesto %s.\n"
-"  --root=<adresár>           inštaluje do systému s iným koreňovým adresárom.\n"
+"  --root=<adresár>           inštaluje do systému s iným koreňovým "
+"adresárom.\n"
 "  --instdir=<adresár>        zmení inštalačný koreň bez zmeny admindir.\n"
-"  -O|--selected-only         preskočí balíky, ktoré nie sú zvolené na inštaláciu/aktualizáciu.\n"
+"  -O|--selected-only         preskočí balíky, ktoré nie sú zvolené na "
+"inštaláciu/aktualizáciu.\n"
 "  -E|--skip-same-version     preskočí balíky s totožnou verziou.\n"
 "  -G|--refuse-downgrade      nenainštaluje staršiu verziu balíka.\n"
-"  -B|--auto-deconfigure      nainštaluje aj napriek možnému poškodeniu iného balíka.\n"
+"  -B|--auto-deconfigure      nainštaluje aj napriek možnému poškodeniu iného "
+"balíka.\n"
 "  --no-debsig                nebude sa pokúšať o overenie podpisu balíka.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                             iba vypíše, čo sa bude vykonávať, ale nič nevykonáva.\n"
-"  -D|--debug=<octal>         povolí ladenie (viď -Dhelp alebo --debug=help).\n"
-"  --status-fd <n>            pošle zmeny stavu balíka na popisovač súboru <n>.\n"
+"                             iba vypíše, čo sa bude vykonávať, ale nič "
+"nevykonáva.\n"
+"  -D|--debug=<octal>         povolí ladenie (viď -Dhelp alebo --"
+"debug=help).\n"
+"  --status-fd <n>            pošle zmeny stavu balíka na popisovač súboru "
+"<n>.\n"
 "  --log=<súbor>              zaznamená zmeny stavu a akcie do <súboru>.\n"
 "  --ignore-depends=<balík>,...\n"
 "                             ignoruje závislosti s <balíkom>.\n"
@@ -2342,15 +2351,20 @@ msgid ""
 "\n"
 msgstr ""
 "Operátory porovnania pre --compare-versions sú:\n"
-"  lt le eq ne ge gt       (neexistenciu verzie považuje za staršiu ako čokoľvek);\n"
-"  lt-nl le-nl ge-nl gt-nl (neexistenciu verzie považuje za novšiu ako čokoľvek);\n"
-"  < << <= = >= >> >       (iba kvôli kompatibilite so syntaxou súboru control).\n"
+"  lt le eq ne ge gt       (neexistenciu verzie považuje za staršiu ako "
+"čokoľvek);\n"
+"  lt-nl le-nl ge-nl gt-nl (neexistenciu verzie považuje za novšiu ako "
+"čokoľvek);\n"
+"  < << <= = >= >> >       (iba kvôli kompatibilite so syntaxou súboru "
+"control).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Skúste používateľsky prívetivú správu balíkov pomocou `dselect' alebo `aptitude'.\n"
+msgstr ""
+"Skúste používateľsky prívetivú správu balíkov pomocou `dselect' alebo "
+"`aptitude'.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2572,7 +2586,7 @@ msgstr "nie je možné otvoriť `%i' pre tok"
 msgid "unexpected eof before end of line %d"
 msgstr "nečakaný koniec súboru pred koncom riadku %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "potrebujem zadať akciu"
@@ -2650,6 +2664,10 @@ msgstr "  Balík `%s', ktorý poskytuje %s, nie je nainštalovaný.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Balík %s nie je nainštalovaný.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " závisí na "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; aj keď:\n"
@@ -2845,10 +2863,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "nedá sa zistiť stav ďalšieho nového súboru `%.250s'"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: upozornenie - starý konfiguračný súbor `%.250s' je taký istý ako zopár "
 "nových súborov!  (obidva `%.250s' a `%.250s')"
@@ -3313,24 +3331,29 @@ msgstr "--forget-old-unavail nevyžaduje žiaden argument"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - chyba: %s (`%s') neobsahuje žiadne čísla\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--builds vyžaduje adresár ako argument"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build vyžaduje najviac dva argumenty"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "nie je možné overiť existenciu archívu `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "cieľ je adresárom - nemôžem preskočiť kontrolu riadiaceho súboru"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3339,41 +3362,41 @@ msgstr ""
 "dpkg-deb: upozornenie, nekontrolujem obsah riadiaceho priestoru.\n"
 "dpkg-deb: generovanie neznámeho balíku v `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "meno balíku obsahuje znaky, ktoré nie sú malými písmenami alebo `-+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "upozornenie, `%s' obsahuje užívateľsky definované pole Priority `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "upozornenie, `%s' obsahuje užívateľsky definované pole `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d chyby v riadiacom súbore"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: generovanie balíku `%s' v `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "riadiaci adresár má zlé práva %03lo (musia byť >=0755 a <=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "skript správcu `%.50s' nie je obyčajný súbor ani symbolický odkaz"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3381,16 +3404,16 @@ msgid ""
 msgstr ""
 "skript správcu `%.50s' má nesprávne práva %03lo (musí byť >=0555 a <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "u skriptu správcu `%.50s' nie je možné zistiť stav"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "prázdny reťazec z funkcie fgets počas čítania súboru"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3398,120 +3421,120 @@ msgstr ""
 "upozornenie, názov konfiguračného súboru `%.50s...' je príliš dlhý, alebo "
 "chýba koncový nový riadok\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr ""
 "upozornenie, názov konfiguračného súboru `%s' obsahuje na konci medzery\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "konfiguračný súbor `%.250s' nebol v balíku nájdený"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "u konfiguračného súboru `%.250s' nie je možné zistiť stav"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "upozornenie, konfiguračný súbor `%s' nie je obyčajný súbor\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "chyba pri čítaní konfiguračných súborov"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "chyba pri otváraní konfiguračných súborov"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignorujem %d upozornenie o riadiacom súbore(och)\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "nie je možné odbufferovať `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "nie je možné zmeniť adresár na `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "nie je možné zmeniť adresár na .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "nie je možné spustiť príkaz tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "zlyhalo vytvorenie dočasného súboru (riadenie)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "zlyhalo otvorenie dočasného súboru (riadenie), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "zlyhalo odpojenie dočasného súboru (riadenie), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "riadenie"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "nie je možné vykonať fstat na dočasný súbor (riadenie)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "nie je možné prejsť na začiatok dočasného súboru (riadenie)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "nie je možné vytvoriť dočasný súbor (dáta)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "zlyhalo otvorenie dočasného súboru (dáta), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "zlyhalo odpojenie dočasného súboru (dáta), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dáta"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "zlyhalo spustenie príkazu find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "nie je možné zapísať názov súboru do rúry programu tar (dáta)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Interná chyba, compress_type `%i' je neznámy!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "nie je možné prejsť na začiatok dočasného súboru (dáta)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (dáta)"
 
@@ -3588,22 +3611,22 @@ msgstr "archív nemá bodku v čísle verzie"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "neznáma archívna verzia %.250s , nainštalujte novšiu dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "preskočil som dáta časti z %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "súbor `%.250s' obsahuje neznáme časti dát %.*s, končím"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "súbor `%.250s' obsahuje dvoch riadiacich členov, končím"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3612,16 +3635,16 @@ msgstr ""
 " nový debian balík, verzia %s.\n"
 " veľkosť %ld bajtov: riadiaci archív= %zi bajtov.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "dĺžka riadiacej informácie"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "archív má zdeformovanú riadiacu dĺžku `%s'"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3630,15 +3653,15 @@ msgstr ""
 " starý debian balík, verzia %s.\n"
 " veľkosť %ld bajtov: riadiaci archív= %zi, hlavný archív= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "chyba pri alokovaní pamäte pre premennú `ctrlarea'"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "riadiaca oblasť"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3647,65 +3670,65 @@ msgstr ""
 "dpkg-deb: súbor vyzerá ako archív, ktorý bol poškodený\n"
 "dpkg-deb:    pri jeho sťahovaní v ASCII móde\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' nemá formát debianovského archívu"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "nedá sa získať aktuálna pozícia v súbore"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "nedá sa nastaviť aktuálna pozícia v súbore"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "nedá sa otvoriť deskriptor rúry `1' v paste"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "nedá sa zapísať do gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "nedá sa zatvoriť gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "nedá sa vykonať syscall lseek na časť archívu súborov"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "zlyhal zápis do rúry pri kopírovaní"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "zlyhalo uzatvorenie rúry pri kopírovaní"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "zlyhalo vytvorenie adresára"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "zlyhalo vykonanie chdir do adresára po jeho vytvorení"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "zlyhalo vykonanie chdir do adresára"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "zlyhalo spustenie programu tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s potrebuje názov .deb súboru"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3714,12 +3737,12 @@ msgstr ""
 "--%s potrebuje cieľový adresár.\n"
 "Možno by ste mali použiť dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s potrebuje najviac dva parametre (.deb a adresár)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s potrebuje len jeden parameter (názov .deb súboru)"
@@ -3873,7 +3896,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3884,7 +3907,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Voľby:\n"
@@ -3920,7 +3944,7 @@ msgstr ""
 "Napíšte dpkg-deb --help pre pomocníka o manipulácii s *.deb súbormi;\n"
 "Napíšte dpkg --help pre pomocníka o inštalácii a deinštalácii balíkov."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámy typ kompresie `%s'!"
@@ -4129,7 +4153,8 @@ msgstr ""
 "Voľby:\n"
 "  --depotdir <adresár>             použije <adresár> namiesto %s/%s\n"
 "  -S|--partsize <veľkosť>          v KiB, pre -s (predvolená je 450)\n"
-"  -o|--output <súbor>              pre -j (predvolený je <balík>-<verzia>.deb)\n"
+"  -o|--output <súbor>              pre -j (predvolený je <balík>-<verzia>."
+"deb)\n"
 "  -Q|--npquiet                     nič nevypisuje, pokiaľ -a nie je časťou\n"
 "  --msdos                          generuje názvy 8.3\n"
 "\n"
@@ -4295,9 +4320,9 @@ msgstr "zdrojový súbor `%.250s' nie je obyčajný súbor"
 msgid "unable to exec mksplit"
 msgstr "nie je možné spustiť funkciu mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s verzia %s.\n"
@@ -4310,9 +4335,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4368,7 +4393,7 @@ msgid "try deleting %s"
 msgstr "skúste zmazať %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "nedá sa otvoriť %s: %s"
@@ -4395,7 +4420,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nedá sa zatvoriť %s po načítaní: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nedá sa zatvoriť %s: %s"
@@ -4415,12 +4440,12 @@ msgstr "inštalácia %s zlyhala; ponechá sa to ako %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: nedá sa odomknúť %s: %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Nedá sa zistiť ENOENT hodnota z %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4430,7 +4455,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4468,10 +4493,12 @@ msgstr ""
 "  --truename <súbor>        vráti odklonený súbor\n"
 "\n"
 "Voľby:\n"
-"  --package <balík>         názov balíka, ktorému sa neodkloní kópia <súboru>\n"
+"  --package <balík>         názov balíka, ktorému sa neodkloní kópia "
+"<súboru>\n"
 "  --local                   odklonené budú všetky verzie balíka\n"
 "  --divert <kam-odkloniť>   názov používaný zvyšnými verziami balíka\n"
-"  --rename                  skutočne presunie súbor do ústrania (alebo späť)\n"
+"  --rename                  skutočne presunie súbor do ústrania (alebo "
+"späť)\n"
 "  --admindir <adresár>      určí adresár so súborom diversions\n"
 "  --test                    nič nevykonáva, len simuluje\n"
 "  --quiet                   stručný režim, minimálny výstup\n"
@@ -4483,89 +4510,89 @@ msgstr ""
 "Predinštalačné a poinštalačné skripty by mali vždy používať --package\n"
 "a --divert.\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "zadané dva režimy: %s a --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s vyžaduje parameter kam-odkloniť"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "kam-odkloniť nemôže obsahovať znaky nového riadku"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s vyžaduje názov balíka ako argument"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "názov balíka nemôže obsahovať znaky nového riadku"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje parameter <adresár>"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznáma voľba `%s'"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "nedá sa otvoriť súbor s odchýlkami: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "chýba alternatívny názov %s"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "chýba názov balíka"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s vyžaduje jediný parameter"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "názov súboru \"%s\" nie je absolútny"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "názov súboru nemôže obsahovať znaky nového riadku"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Adresáre sa nedajú odkloniť"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Opúšťa sa `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "`%s' je v kolízii s `%s'"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Pridáva sa `%s'"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4576,7 +4603,7 @@ msgstr ""
 "  pri odstraňovaní `%s'\n"
 "  nájdené `%s'"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4587,37 +4614,37 @@ msgstr ""
 "  pri odstraňovaní `%s'\n"
 "  nájdené `%s'"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Odstraňuje sa `%s'"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Odklonenie `%s' neexistuje, takže sa neodstránilo"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "interná chyba - nesprávny spôsob `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "nedá sa zistiť stav starého názvu `%s': `%s'"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "nedá sa zistiť stav nového názvu `%s': `%s'"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "chyba pri kontrole `%s': %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4626,52 +4653,52 @@ msgstr ""
 "premenovanie znamená prepísanie `%s'\n"
 "  súborom `%s', čo nie je povolené"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "premenovanie: premenovanie `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "vytváranie súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zápis súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zatvorenie súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "zmazanie starého súboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "vytváranie nového súboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "inštalácia nového súboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interná chyba: %s poškodenie: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4679,7 +4706,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4714,106 +4741,106 @@ msgstr ""
 "  --help                   zobrazí tohto pomocníka\n"
 "  --version                zobrazí verziu\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "nie je uvedený žiaden spôsob"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add vyžaduje štyri parametre"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "chybný používateľ %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "neexistujúci používateľ %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "chybná skupina %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "neexistujúca skupina %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "chybný spôsob %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "odstraňujú sa koncové /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Prepísanie \"%s\" už existuje, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "ale kvôli --force ho budeme ignorovať."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "prerušuje sa"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "upozornenie: bolo zadané --update, ale %s neexistuje"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "zlyhala zmena vlastníka %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "zlyhala zmena atribútov %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Neexistuje žiadne povýšenie."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "upozornenie: --update je nepoužiteľný pri --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "nedá sa otvoriť súbor statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Viacero povýšení pre \"%s\", prerušuje sa"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "nedá sa otvoriť nový súbor statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "chyba pri odstraňovaní súboru statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "chyba pri vytváraní nového súboru statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "chyba pri inštalovaní nového súboru statoverride-old: %s"
@@ -4857,19 +4884,24 @@ msgstr ""
 "\n"
 "Voľby:\n"
 "  --section <reg.výraz> <nadpis>\n"
-"                           vloží nový záznam do sekcie určenej <reg.výrazom>,\n"
-"                           alebo vytvorí novú sekciu s názvom <nadpis> ak neexistuje\n"
+"                           vloží nový záznam do sekcie určenej <reg."
+"výrazom>,\n"
+"                           alebo vytvorí novú sekciu s názvom <nadpis> ak "
+"neexistuje\n"
 "  --menuentry=<text>       nastaví položku menu\n"
 "  --description=<text>     nastaví popis, ktorý sa použije pre položku menu\n"
-"  --info-file=<cesta>      určí info súbor, ktorý sa nainštaluje do adresára\n"
+"  --info-file=<cesta>      určí info súbor, ktorý sa nainštaluje do "
+"adresára\n"
 "  --dir-file=<cesta>       určí súbor, ktorý slúži ako adresár pre info\n"
 "  --infodir=<adresár>      rovnako ako '--dir-file=<adresár>/dir'\n"
 "  --info-dir=<adresár>     rovnako ako '--dir-file=<adresár>/dir'\n"
 "  --keep-old               neprepíše staré záznamy ani neodstráni nové\n"
 "  --remove                 odstráni záznam zadaný ako basename <súbor>\n"
 "  --remove-exactly         odstráni presne záznam <súbor>\n"
-"  --test                   povolí testovací režim (nevykonajú sa žiadne akcie)\n"
-"  --debug                  povolí ladiaci režim (zobrazí podrobnejšie informácie)\n"
+"  --test                   povolí testovací režim (nevykonajú sa žiadne "
+"akcie)\n"
+"  --debug                  povolí ladiaci režim (zobrazí podrobnejšie "
+"informácie)\n"
 "  --quiet                  nevypisuje žiadne správy\n"
 "  --help                   zobrazí tohto pomocníka\n"
 "  --version                zobrazí verziu\n"
@@ -4907,7 +4939,7 @@ msgstr "%s: testovací režim - adr. súbor sa nebude aktualizovať"
 #: scripts/install-info.pl:191
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
-msgstr "%s: upozornenie, ignoruje sa zmätený INFO-DIR-ENTRY v súbore." 
+msgstr "%s: upozornenie, ignoruje sa zmätený INFO-DIR-ENTRY v súbore."
 
 #: scripts/install-info.pl:200
 msgid "invalid info entry"
@@ -5029,7 +5061,7 @@ msgstr "nedá sa načítať %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -5039,8 +5071,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5060,7 +5092,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5101,7 +5133,8 @@ msgstr ""
 "  (napr. pager)\n"
 "<cesta> je umiestnenie jedného z cieľových súborov\n"
 "  (napr. /usr/bin/less)\n"
-"<priorita> je celé číslo; pri automatickom režime sa vyberú voľby s vyššími číslami\n"
+"<priorita> je celé číslo; pri automatickom režime sa vyberú voľby s vyššími "
+"číslami\n"
 "\n"
 "Voľby:\n"
 "  --altdir <adresár>       zmení adresár pre alternatívy\n"
@@ -5112,95 +5145,36 @@ msgstr ""
 "  --help                   zobrazí tohto pomocníka\n"
 "  --version                zobrazí verziu\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "neznámy parameter `%s'"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install vyžaduje <linku> <názov> <cestu> <prioritu>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "priorita musí byť celé číslo"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s vyžaduje <názov> <cestu>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s vyžaduje <názov>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave vyžaduje <linku> <názov> <cestu>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "závislý názov %s je duplicitný"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "závislý odkaz %s je duplicitný"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "názov %s je primárny aj závislý"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "odkaz %s je primárny aj závislý"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"potrebujete --display, --config, --set, --install, --remove, --all, --remove-"
-"all alebo --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave je povolené iba s --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "duplicitná závislosť %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "závislý odkaz je totožný s hlavným odkazom %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "duplicitný závislý odkaz %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "duplicitná cesta %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "priorita %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
@@ -5209,66 +5183,124 @@ msgstr ""
 "Alternatíva %s ukazuje na verziu %s, ktorá sa nenašla. Odstraňuje sa zo "
 "zoznamu alternatív."
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Žiadne alternatívy pre %s"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - stav je %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " linka práve ukazuje na %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " odkaz momentálne chýba"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " odkaz sa nedá načítať = %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorita %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " závislosť %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Nie sú dostupné žiadne verzie."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Momentálne je `najlepšia' verzia %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "neznámy parameter `%s'"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install vyžaduje <linku> <názov> <cestu> <prioritu>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "priorita musí byť celé číslo"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s vyžaduje <názov> <cestu>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s vyžaduje <názov>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave vyžaduje <linku> <názov> <cestu>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "závislý názov %s je duplicitný"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "závislý odkaz %s je duplicitný"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "názov %s je primárny aj závislý"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "odkaz %s je primárny aj závislý"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"potrebujete --display, --config, --set, --install, --remove, --all, --remove-"
+"all alebo --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave je povolené iba s --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuje sa automatický výber %s"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nedá sa odstrániť %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5277,7 +5309,7 @@ msgstr ""
 "%s sa zmenil (manuálne alebo skriptom).\n"
 "Prepína sa len na manuálne aktualizácie."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5286,67 +5318,70 @@ msgstr ""
 "Kontrolujú sa dostupné verzie %s, aktualizujú sa odkazy v %s ...\n"
 "(Odkazy môžete zmeniť podľa vašich potrieb - pozrite si `man ln'.)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Linka %s sa premenuje z %s na %s."
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nedá sa premenovať %s na %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "názov závislého odkazu %s je duplicitný"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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"
+msgstr ""
+"Odstraňuje sa manuálne zvolená alternatíva - prepína sa na automatický režim"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahadzuje sa zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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."
+msgstr ""
+"Použitím `update-alternatives --auto %s' sa prepnete na automatické "
+"aktualizácie."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s sa nedá otvoriť na zápis: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5355,38 +5390,38 @@ msgstr ""
 "upozornenie: %s by mal byť symbolický odkaz na %s,\n"
 " (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nedá sa zaručiť, že %s neexistuje: %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nedá sa nainštalovať %s ako %s: %s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s) sa ponecháva, aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) sa aktualizuje, aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5395,13 +5430,13 @@ msgstr ""
 "upozornenie: %s by mal byť závislý symbolický odkaz na %s,\n"
 " (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) sa odstraňuje, nepatrí k %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5410,7 +5445,7 @@ msgstr ""
 "Existuje len jeden program poskytujúci %s\n"
 "(%s). Nie je čo nastavovať.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5423,42 +5458,51 @@ msgstr ""
 "  Výber        Alternatíva\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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: "
+msgstr ""
+"Stlačením enter zvolíte predvolenú možnosť[*], ináč zadajte číslo výberu: "
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Použije sa `%s' na poskytnutie `%s'."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nedá sa nájsť alternatíva `%s'."
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba pri zápise na štandartný výstup: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chýbajúci nový riadok za %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážny problém: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: zlyhalo vykonanie gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: zlyhalo vykonanie bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: zlyhalo vykonanie bzip2 %s"
diff --git a/po/sv.po b/po/sv.po
index fc0b5b3e..1b964e42 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.11.0.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-11-01 19:58+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -57,72 +57,57 @@ msgstr "Systemfel nr %d"
 msgid "Signal no.%d"
 msgstr "Signal nr %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: kunde inte köra gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: internt gzip-fel: \"%s\""
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: kunde inte köra gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: internt bzip2-fel: \"%s\""
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: kunde inte köra bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: dekomprimering"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: internt gzip-fel: läsning: \"%s\""
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: internt gzip-fel: skrivning: \"%s\""
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: internt gzip-fel: läs(%i) != skriv(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: kunde inte köra gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: internt bzip2-fel: läsning: \"%s\""
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: internt bzip2-fel: skrivning: \"%s\""
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: internt bzip2-fel: läs(%i) != skriv(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: kunde inte köra bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: komprimering"
@@ -143,13 +128,19 @@ msgstr "misslyckades med att skriva under \"hashreport\""
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "uppdateringskatalogen innehåller filen \"%.250s\" vars namn är för långt (längd=%d, max=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"uppdateringskatalogen innehåller filen \"%.250s\" vars namn är för långt "
+"(längd=%d, max=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "uppdateringskatalogen innehåller filer med olika långa namn (både %d och %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"uppdateringskatalogen innehåller filer med olika långa namn (både %d och %d)"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -161,9 +152,7 @@ msgstr "kan inte genoms
 msgid "failed to remove incorporated update file %.255s"
 msgstr "kunde inte ta bort den hanterade uppdateringsfilen \"%.255s\""
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kunde inte skapa \"%.255s\""
@@ -272,7 +261,9 @@ msgstr "kunde inte st
 #: lib/dump.c:323
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
-msgstr "kunde inte länka \"%.250s\" till \"%.250s\" för att säkerhetskopiera %s-information"
+msgstr ""
+"kunde inte länka \"%.250s\" till \"%.250s\" för att säkerhetskopiera %s-"
+"information"
 
 #: lib/dump.c:326
 #, c-format
@@ -405,7 +396,8 @@ msgstr "v
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "värde för \"conffiles\" innehåller rad som börjar med icke-blanksteg \"%c\""
+msgstr ""
+"värde för \"conffiles\" innehåller rad som börjar med icke-blanksteg \"%c\""
 
 #: lib/fields.c:281
 msgid "root or null directory is listed as a conffile"
@@ -413,8 +405,11 @@ msgstr "rot- eller tom katalog listas som konfigurationsfil"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "\"%s\"-fältet: saknat paketnamn, eller skräptecken där paketnamnet förväntades"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"\"%s\"-fältet: saknat paketnamn, eller skräptecken där paketnamnet "
+"förväntades"
 
 #: lib/fields.c:340
 #, c-format
@@ -461,8 +456,7 @@ msgstr ""
 "\"%s\"-fältet: referens till \"%.255s\":\n"
 " versionsvärdet börjar med icke-alfanumeriskt tecken, lägg till ett blanksteg"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \"%c\""
@@ -512,8 +506,7 @@ msgstr "kunde inte l
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc misslyckades (%ld byte)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc misslyckades (%ld byte)"
@@ -556,8 +549,7 @@ msgstr "underprocess %s gav felkod %d"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: varning - %s dödades av signal (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", minnesutskrift skapad"
 
@@ -666,8 +658,7 @@ msgstr "fel vid l
 msgid "error closing configuration file `%.255s'"
 msgstr "fel vid läsning av konfigurationsfil \"%.250s\""
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Fel vid allokering av minne för cfgfilename"
 
@@ -836,7 +827,8 @@ msgstr "m
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "tecknet \"%c\" ej tillåtet (ndast tecken, siffror och tecknen \"%s\" tillåts)"
+msgstr ""
+"tecknet \"%c\" ej tillåtet (ndast tecken, siffror och tecknen \"%s\" tillåts)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -886,77 +878,87 @@ msgstr "Avslutande klammerparentes i format\n"
 msgid "failed to realloc for variable buffer"
 msgstr "misslyckades med att återallokera variabelbuffert"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  har redan försvunnit!"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "fel vid läsning från dpkg-deb-rör"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "fel när tidsstämplingarna på \"%.255s\" skulle ställas in"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fel när ägandeskap för \"%.255s\" skulle ställas in"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fel när behörighet för \"%.255s\" skulle ställas in"
 
 # ??!?!?
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av \"%.250s\"%.10s%.100s%.10s"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av "
+"\"%.250s\"%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (paket: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
-msgstr "kunde inte läsa status för \"%.255s\" (vilket var vad jag just skulle installera)"
+msgstr ""
+"kunde inte läsa status för \"%.255s\" (vilket var vad jag just skulle "
+"installera)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
-msgstr "kunde inte rensa upp i röran runt \"%.255s\" innan en ny version installeras"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
+msgstr ""
+"kunde inte rensa upp i röran runt \"%.255s\" innan en ny version installeras"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "kunde inte ta status på återställd \"%.255s\" innan en ny version installeras"
+msgstr ""
+"kunde inte ta status på återställd \"%.255s\" innan en ny version installeras"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "arkivet innehåller objektet \"%.255s\" av okänd typ 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Ersätter filer i det gamla paketet %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ersätta av filer i installerat paket %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "försöker skriva över katalog \"%.250s\" i paket %.250s med icke-katalog"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"försöker skriva över katalog \"%.250s\" i paket %.250s med icke-katalog"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "försöker skriva över \"%.250s\" som också finns i paketet %.250s"
@@ -965,85 +967,85 @@ msgstr "f
 # /* We need to advance the tar file to the next object, so read the
 #  * file data and set it to oblivion.
 #  */
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "hoppade över ersatt fil \"%.255s\""
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakändan dpkg-deb under \"%.255s\""
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "fel vid stängning/skrivning \"%.255s\""
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "fel vid skapande av rör \"%.255s\""
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fel vid skapande av enhet \"%.255s\""
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "fel vid skapande av hård länk \"%.255s\""
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "fel vid skapande av symbolisk länk \"%.255s\""
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "fel vid inställning av ägandeskap av symbolisk länk \"%.255s\""
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "fel vid skapande av katalog \"%.255s\""
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "kunde inte flytta undan \"%.255s\" för att installera ny version"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "kunde inte läsa link \"%.255s\""
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kunde inte säkerhetskopiera symbolisk länk för \"%.255s\""
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
-msgstr "kunde inte byta ägare på säkerhetskopierad symbolisk länk för \"%.255s\""
+msgstr ""
+"kunde inte byta ägare på säkerhetskopierad symbolisk länk för \"%.255s\""
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "kunde inte skapa säkerhetskopierad länk av \"%.255s\" innan den nya versionen installeras"
+msgstr ""
+"kunde inte skapa säkerhetskopierad länk av \"%.255s\" innan den nya "
+"versionen installeras"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "kunde inte installera ny version av \"%.255s\""
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1052,7 +1054,7 @@ msgstr ""
 "dpkg: varning - ignorerar beroendeproblem vid borttagning av %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1061,7 +1063,7 @@ msgstr ""
 "dpkg: varning - funderar på att avkonfigurera det systemkritiska\n"
 " paketet %s för att kunna ta bort %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1070,7 +1072,7 @@ msgstr ""
 "dpkg: nej, %s är systemkritiskt, kommer inte att avkonfigurera\n"
 " det för att möjliggöra borttagning av %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1079,37 +1081,47 @@ msgstr ""
 "dpkg: nej, kan inte ta bort %s (--auto-deconfigure hjälper):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: funderar på att ta bort %s till förmån för %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s är ej korrekt installerat - ignorerar dess beroenden.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
-msgstr "dpkg: kan ha problem att ta bort %s, eftersom det tillhandahåller %s ...\n"
+msgstr ""
+"dpkg: kan ha problem att ta bort %s, eftersom det tillhandahåller %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
-msgstr "dpkg: paketet %s måste ominstalleras, men tar bort det ändå enligt ditt önskemål.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
+msgstr ""
+"dpkg: paketet %s måste ominstalleras, men tar bort det ändå enligt ditt "
+"önskemål.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: paketet %s kräver återinstallation, tar inte bort.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: ja, kommer att ta bort %s till förmån för %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1118,80 +1130,85 @@ msgstr ""
 "dpkg: angående %s innehållandes %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "paketkonflikt - installerar inte %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: varning - ignorerar konflikt, kan ändå fortsätta!\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive kräver åtminstone ett sökvägsargument"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "kunde inte köra \"find\" för --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "kunde inte ansluta fil till finds rör"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "kunde inte läsa från finds rör"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "fel vid stängning av finds rör"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find för --recursive returnerade ohanterat fel %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "sökte, men hittade inga paket (filer som matchar *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s kräver åtminstone ett argument som är en paketfil"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Väljer tidigare ej valt paket %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hoppar över ej valt paket %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Version %.250s av %.250s redan installerat, hoppar över.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - varning: nedgraderar %.250s från %.250s till %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "Nedgraderar inte %.250s från version %.250s till %.250s, hoppar över.\n"
+msgstr ""
+"Nedgraderar inte %.250s från version %.250s till %.250s, hoppar över.\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "kunde inte ta bort nyss installerad version av \"%.250s\" för att möjliggöra återinstallation av säkerhetskopia"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"kunde inte ta bort nyss installerad version av \"%.250s\" för att möjliggöra "
+"återinstallation av säkerhetskopia"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1267,8 +1284,7 @@ msgstr "St
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "kunde inte ta status på ny medsänd konfigurationsfil \"%.250s\""
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "kunde inte ta status på nu installerad konfigurationsfil \"%.250s\""
@@ -1287,12 +1303,16 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: varning - misslyckades med att ta bort gammal säkerhetskopia \"%.250s\": %s\n"
+msgstr ""
+"dpkg: %s: varning - misslyckades med att ta bort gammal säkerhetskopia "
+"\"%.250s\": %s\n"
 
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: varning - misslyckades med att namnändra \"%.250s\" till \"%.250s\": %s\n"
+msgstr ""
+"dpkg: %s: varning - misslyckades med att namnändra \"%.250s\" till \"%.250s"
+"\": %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1302,17 +1322,23 @@ msgstr "dpkg: %s: varning - misslyckades med att ta bort \"%.250s\": %s\n"
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: varning - misslyckades med att ta bort tidigare distribuerad version \"%.250s\": %s\n"
+msgstr ""
+"dpkg: %s: varning - misslyckades med att ta bort tidigare distribuerad "
+"version \"%.250s\": %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: varning - misslyckades med att ta bort \"%.250s\" (före överskrivning): %s\n"
+msgstr ""
+"dpkg: %s: varning - misslyckades med att ta bort \"%.250s\" (före "
+"överskrivning): %s\n"
 
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: varning - misslyckades med att länka \"%.250s\" till \"%.250s\": %s\n"
+msgstr ""
+"dpkg: %s: varning - misslyckades med att länka \"%.250s\" till \"%.250s\": %"
+"s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1357,13 +1383,18 @@ msgid ""
 "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
 " (`%s' is a symlink to `%s')\n"
 msgstr ""
-"dpkg: %s: varning - konfigurationsfilen \"%.250s\" blir ett degenererat filnamn\n"
+"dpkg: %s: varning - konfigurationsfilen \"%.250s\" blir ett degenererat "
+"filnamn\n"
 " (\"%s\" är en symbolisk länk till \"%s\")\n"
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
-msgstr "dpkg: %s: varning -  konfigurationfilen \"%.250s\" är inte en vanlig fil eller symbolisk länk (= \"%s\")\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: varning -  konfigurationfilen \"%.250s\" är inte en vanlig fil "
+"eller symbolisk länk (= \"%s\")\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1372,7 +1403,9 @@ msgstr "md5hash"
 #: src/configure.c:417
 #, c-format
 msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
-msgstr "dpkg: %s: varning - kunde inte öppna konfigurationsfilen %s för hashning: %s\n"
+msgstr ""
+"dpkg: %s: varning - kunde inte öppna konfigurationsfilen %s för hashning: %"
+"s\n"
 
 #: src/configure.c:435
 #, c-format
@@ -1389,8 +1422,7 @@ msgstr "kunde inte st
 msgid "failed to run %s (%.250s)"
 msgstr "kunde inte starta %s (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "kunde inte vänta på skalet"
 
@@ -1405,7 +1437,8 @@ msgstr "kunde inte starta skalet (%.250s)"
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Glöm inte att flytta denna process till förgrunden (\"fg\") när du är klar!\n"
+msgstr ""
+"Glöm inte att flytta denna process till förgrunden (\"fg\") när du är klar!\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1528,7 +1561,8 @@ msgstr "[inget f
 
 #: src/configure.c:631
 msgid "error writing to stderr, discovered before conffile prompt"
-msgstr "fel vid skrivning till stderr, upptäcktes innan konfigurationsfilfrågan"
+msgstr ""
+"fel vid skrivning till stderr, upptäcktes innan konfigurationsfilfrågan"
 
 #: src/configure.c:638
 msgid "read error on stdin at conffile prompt"
@@ -1543,118 +1577,122 @@ msgstr "Filslut p
 msgid "unable to check for existence of `%.250s'"
 msgstr "kunde inte kontrollera om \"%.250s\" existerar"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " beror på "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " beror i förväg på "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " rekommenderar "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " föreslår "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " förstör "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " är i konflikt med "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " föreslår "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " förbättrar "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s kommer att tas bort.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s kommer att avkonfigureras.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s kommer att installeras, men är version %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s är installerad, men är version %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s är uppackad, men har aldrig konfigurerats.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s är uppackad, men är version %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  senast konfigurerad version av %.250s är %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s är %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tillhandahåller %.250s men kommer att tas bort.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tillhandahåller %.250s men kommer att avkonfigureras.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "%.250s tillhandahåller %.250s men men är %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s är inte installerad.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) kommer att installeras.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) är %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tillhandahåller %.250s och kommer att installeras.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s tillhandahåller %.250s och är %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(beskrivning saknas)"
 
@@ -1736,7 +1774,8 @@ msgstr ""
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg finns inte listad som installerad, kan inte kontrollera epochstöd!\n"
+msgstr ""
+"dpkg finns inte listad som installerad, kan inte kontrollera epochstöd!\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1754,22 +1793,24 @@ msgstr ""
 #: src/enquiry.c:360
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "kan inte tillfredsställa i förvägberoende för %.250s (krävs på grund av %.250s)"
+msgstr ""
+"kan inte tillfredsställa i förvägberoende för %.250s (krävs på grund av "
+"%.250s)"
 
 #: src/enquiry.c:377
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture tar inget argument"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr "--compare-versions tar tre argument: <version> <relation> <version>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions: ogiltig relation"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: version \"%s\" har felaktig syntax: %s\n"
@@ -1784,8 +1825,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: misslyckades med att allokera minne för ny post i listan över misslyckade paket."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: misslyckades med att allokera minne för ny post i listan över "
+"misslyckade paket."
 
 #: src/errors.c:91
 #, c-format
@@ -1807,7 +1851,8 @@ msgstr "Paketet %s skulle kvarh
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "Paketet %s kvarhålles, rör det inte. --force-hold ignorerar.\n"
 
 #: src/errors.c:125
@@ -1825,8 +1870,12 @@ msgstr "kunde inte 
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
-msgstr "dpkg: allvarlig varning: fillistfilen för paketet \"%.250s\" saknas, antar att paketet inte har några filer installerade.\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
+msgstr ""
+"dpkg: allvarlig varning: fillistfilen för paketet \"%.250s\" saknas, antar "
+"att paketet inte har några filer installerade.\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -1936,8 +1985,7 @@ msgstr "ov
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets gav en tom sträng från omdirigeringsfil [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "omdirigeringsfilen har en för lång rad eller filslut [ii]"
 
@@ -2002,7 +2050,8 @@ msgid ""
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
 msgstr ""
 "%d förväntade program som inte finns i PATH.\n"
-"Obs! roots PATH bör vanligtvis innehålla /usr/local/sbin, /usr/sbin och /sbin."
+"Obs! roots PATH bör vanligtvis innehålla /usr/local/sbin, /usr/sbin och /"
+"sbin."
 
 #: src/help.c:179
 #, c-format
@@ -2029,9 +2078,7 @@ msgstr "kunde inte st
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "kunde inte ta status på installerat %s-skript \"%.250s\""
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "kunde inte köra %s"
@@ -2089,8 +2136,7 @@ msgstr "avl
 msgid "chmod"
 msgstr "anropa chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "ta bort"
 
@@ -2099,8 +2145,7 @@ msgstr "ta bort"
 msgid "failed to %s `%%.255s'"
 msgstr "misslyckades med att %s \"%%.255s\""
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "kunde inte utföra rm för upprensning"
 
@@ -2109,10 +2154,7 @@ msgstr "kunde inte utf
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian \"%s\" pakethanteringsprogram version %s.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2123,10 +2165,7 @@ msgstr ""
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 "Se %s --licence för upphovsrättsliga och licenstekniska detaljer.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2187,10 +2226,7 @@ msgstr ""
 "  --force-help                     Visa hjälp för tvingande.\n"
 "  -Dh|--debug=help                 Visa hjälp för felsökning.\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2229,16 +2265,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2252,16 +2293,22 @@ msgstr ""
 "  --admindir=<katalog>       Använd <katalog> i.st.f %s\n"
 "  --root=<katalog>           Installera på alternativt system med annan rot\n"
 "  --instdir=<katalog>        Byt installationsrot, men inte admin.-katalog\n"
-"  -O|--selected-only         Hoppa över paket ej valda för install./uppgrad.\n"
-"  -E|--skip-same-version     Hoppa över paket med samma version som install.\n"
-"  -G|--refuse-downgrade      Hoppa över paket med tidigare version än install.\n"
+"  -O|--selected-only         Hoppa över paket ej valda för install./"
+"uppgrad.\n"
+"  -E|--skip-same-version     Hoppa över paket med samma version som "
+"install.\n"
+"  -G|--refuse-downgrade      Hoppa över paket med tidigare version än "
+"install.\n"
 "  -B|--auto-deconfigure      Installera även om det förstör andra paket\n"
 "  --no-debsig                Försök inte verifiera paketsignaturer\n"
 "  --no-act|--dry-run|--simulate\n"
-"                             Säg bara vad som skulle hända - utför ingenting.\n"
-"  -D|--debug=<oktalt>        Slå på felsökning (se -Dhelp eller --debug=help).\n"
+"                             Säg bara vad som skulle hända - utför "
+"ingenting.\n"
+"  -D|--debug=<oktalt>        Slå på felsökning (se -Dhelp eller --"
+"debug=help).\n"
 "  --status-fd <n>            Sänd statusändringar till filidentifierare <n>\n"
-"  --log=<filnamn>            Logga statusändringar och åtgärder till <filnamn>\n"
+"  --log=<filnamn>            Logga statusändringar och åtgärder till "
+"<filnamn>\n"
 "  --ignore-depends=<paket>,...\n"
 "                             Ignorera beroenden angående <paket>\n"
 "  --force-...                Tvinga utförande - se --force-help\n"
@@ -2274,9 +2321,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "Jämförelseoperatorer för --compare-versions är:\n"
@@ -2287,7 +2336,8 @@ msgstr ""
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\n"
+msgstr ""
+"Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2296,9 +2346,11 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
 "Skriv dpkg --help för hjälp om att installera och avinstallera paket [*];\n"
 "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering;\n"
@@ -2308,12 +2360,10 @@ msgstr ""
 "Skriv dpkg --license för upphovsrättslig licens och avsaknad av garanti\n"
 "                     (GNU GPL) [*].\n"
 "\n"
-"Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more\"!"
+"Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more"
+"\"!"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "motstridiga åtgärder %c (--%s) och -%c (--%s)"
@@ -2372,10 +2422,10 @@ msgstr "tomt paketnamn i --ignore-depends kommaseparerade lista \"%.250s\""
 #: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
-msgstr "--ignore-depends behöver ett giltigt paketnamn. \"%.250s\" är inte det; %s"
+msgstr ""
+"--ignore-depends behöver ett giltigt paketnamn. \"%.250s\" är inte det; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ogiltigt heltal för --%s: \"%.250s\""
@@ -2391,23 +2441,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2431,9 +2486,12 @@ msgstr ""
 "  depends [!]            Gör alla beroendeproblem till varningar\n"
 "  confnew [!]            Använd alltid nya konfigurationsfiler, fråga ej\n"
 "  confold [!]            Använd alltid gamla konfigurationsfiler, fråga ej\n"
-"  confdef [!]            Använd förval för nya konfigurationsfiler om sådant\n"
-"                         finns, fråga ej. Om inget förval finns tillfrågas du\n"
-"                         om ingen av flaggorna confold eller confnew också har\n"
+"  confdef [!]            Använd förval för nya konfigurationsfiler om "
+"sådant\n"
+"                         finns, fråga ej. Om inget förval finns tillfrågas "
+"du\n"
+"                         om ingen av flaggorna confold eller confnew också "
+"har\n"
 "                         angivits\n"
 "  confmiss [!]           Installera alltid saknade konfigurationsfiler\n"
 "  conflicts [!]          Tillåt installation av paket som är i konflikt\n"
@@ -2442,7 +2500,8 @@ msgstr ""
 "  remove-reinstreq [!]   Ta bort paket som kräver installation\n"
 "  remove-essential [!]   Ta bort ett systemkritiskt paket\n"
 "\n"
-"VARNING - flaggor markerade [!] kan tillfoga stor skada till din installation\n"
+"VARNING - flaggor markerade [!] kan tillfoga stor skada till din "
+"installation\n"
 "om de används. Flaggor markerade [*] är förvalda.\n"
 
 #: src/main.c:363
@@ -2455,14 +2514,11 @@ msgstr "ok
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Varning: föråldrad tvingande/vägrande flagga \"%s\"\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kunde inte allokera i execbackend"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "kunde inte duplicera sträng i execbackend"
 
@@ -2493,10 +2549,7 @@ msgstr "kunde inte 
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "behöver en åtgärd att utföra"
@@ -2506,15 +2559,18 @@ msgstr "beh
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tar inga argument som inte är flaggor"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s behöver åtminstone ett paket som argument"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
-msgstr "du måste ange paket med sina egna namn, inte genom att ange namnen på de filer de kommer i"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"du måste ange paket med sina egna namn, inte genom att ange namnen på de "
+"filer de kommer i"
 
 #: src/packages.c:150
 #, c-format
@@ -2570,6 +2626,10 @@ msgstr "  Paketet %s, som tillhandah
 msgid "  Package %s is not installed.\n"
 msgstr "  Paketet %s är ej installerat.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " beror på "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr ", men:\n"
@@ -2585,7 +2645,8 @@ msgstr "fel d
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "kunde inte köra dpkg-split för att se om det är en del av ett flerdelat paket"
+msgstr ""
+"kunde inte köra dpkg-split för att se om det är en del av ett flerdelat paket"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2692,7 +2753,8 @@ msgstr "Packar upp %s (fr
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "namn på konfigurationsfil (som börjar på \"%.250s\") är för lång (>%d tecken)"
+msgstr ""
+"namn på konfigurationsfil (som börjar på \"%.250s\") är för lång (>%d tecken)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2738,7 +2800,9 @@ msgstr "dpkg-deb: d
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: varning - kan inte ta status på gammal fil \"%.250s\" så den tas inte bort: %s"
+msgstr ""
+"dpkg: varning - kan inte ta status på gammal fil \"%.250s\" så den tas inte "
+"bort: %s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2747,8 +2811,12 @@ msgstr "dpkg: varning - kan inte ta bort gammal katalog \"%.250s\": %s\n"
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg: varning - gammal konfigurationfil \"%.250s\" var en tom katalog (och har nu tagits bort)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg: varning - gammal konfigurationfil \"%.250s\" var en tom katalog (och "
+"har nu tagits bort)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2756,25 +2824,29 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "kunde inte ta status på andra ny fil \"%.250s\""
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
-msgstr "dpkg: varning - gammal filen \"%.250s\" är samma som ett flertal nya filer! (både \"%.250s\" och \"%.250s\")"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: varning - gammal filen \"%.250s\" är samma som ett flertal nya filer! "
+"(både \"%.250s\" och \"%.250s\")"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: varning - kan inte %s gammal fil \"%%.250s\": %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "kan inte läsa infokatalog"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "gammal version av paketet har för lång informationsfilnamn som börjar på \"%.250s\""
+msgstr ""
+"gammal version av paketet har för lång informationsfilnamn som börjar på "
+"\"%.250s\""
 
 #: src/processarc.c:766
 #, c-format
@@ -2784,7 +2856,8 @@ msgstr "kunde inte ta bort gammal informationsfil \"%.250s\""
 #: src/processarc.c:769
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
-msgstr "kunde inte installera (vad som antas vara) ny informationsfil \"%.250s\""
+msgstr ""
+"kunde inte installera (vad som antas vara) ny informationsfil \"%.250s\""
 
 #: src/processarc.c:776
 msgid "unable to open temp control directory"
@@ -2793,7 +2866,9 @@ msgstr "kunde inte 
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "paketet innehåller för långt kontrollinformationsfilnamn (börjar på \"%.50s\")"
+msgstr ""
+"paketet innehåller för långt kontrollinformationsfilnamn (börjar på \"%.50s"
+"\")"
 
 #: src/processarc.c:790
 #, c-format
@@ -2803,7 +2878,9 @@ msgstr "paketets kontrollinformation inneh
 #: src/processarc.c:792
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
-msgstr "\"rmdir\" på paketets kontrollinformation \"%.250s\" svarade inte \"ej katalog\""
+msgstr ""
+"\"rmdir\" på paketets kontrollinformation \"%.250s\" svarade inte \"ej "
+"katalog\""
 
 #: src/processarc.c:798
 #, c-format
@@ -2829,7 +2906,8 @@ msgstr "kunde inte ta bort f
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "Önskat=Okänd(U)/Installera(I)/Radera(R)/Rensa(P)/Håll(H)\n"
 "| Status=Ej(N)/Installerad(I)/Konf.(C)/Uppackad(U)/Misslyckad(F)/Delvis(H)\n"
@@ -2847,9 +2925,7 @@ msgstr "Version"
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Inga paket matchar %s.\n"
@@ -2963,24 +3039,24 @@ msgstr ""
 "  -f|--showformat=<format>         Använd alternativt format för --show\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Formatsyntax:\n"
 "  Ett format är en sträng som kommer skrivas ut för varje paket. Formatet\n"
-"  kan innehålla de vanliga teckensekvenserna \\n"
-" (ny rad), \\r (vagnretur)\n"
-"  eller \\\\ (vanligt omvänt snedstreck). Paketinformation kan läggas in genom\n"
+"  kan innehålla de vanliga teckensekvenserna \\n (ny rad), \\r (vagnretur)\n"
+"  eller \\\\ (vanligt omvänt snedstreck). Paketinformation kan läggas in "
+"genom\n"
 "  att lägga in variabelreferenser till paketfält genom att använda syntaxen\n"
 "  ${var[;bredd]}. Fälten kommer att högerjusteras såvida inte bredden anges\n"
 "  negativt, i vilket fall vänsterjustering kommer användas.\n"
@@ -2992,13 +3068,17 @@ msgid ""
 "\n"
 msgstr ""
 "Använd --help för hjälp om att fråga efter paket;\n"
-"Använd --license för upphovsrättslig licens och avsaknad av garanti (GNU GPL).\n"
+"Använd --license för upphovsrättslig licens och avsaknad av garanti (GNU "
+"GPL).\n"
 "\n"
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - varning: ignorerar begäran att ta bort %.250s som inte har installerats.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - varning: ignorerar begäran att ta bort %.250s som inte har "
+"installerats.\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3053,14 +3133,16 @@ msgstr "Skulle ta bort eller helt radera %s ...\n"
 msgid "Removing %s ...\n"
 msgstr "Tar bort %s ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - varning: när %.250s togs bort kunde inte katalogen \"%.250s\" tas bort: %s - katalogen kan vara en monteringspunkt?\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - varning: när %.250s togs bort kunde inte katalogen \"%.250s\" tas "
+"bort: %s - katalogen kan vara en monteringspunkt?\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "kan inte ta bort \"%.250s\""
@@ -3077,8 +3159,12 @@ msgstr "kunde inte ta bort kontrollinformationsfil \"%.250s\""
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - varning: när %.250s togs bort var inte katalogen \"%.250s\" tom, så den togs inte bort.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - varning: när %.250s togs bort var inte katalogen \"%.250s\" tom, så "
+"den togs inte bort.\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3098,7 +3184,8 @@ msgstr "kan inte l
 #: src/remove.c:504
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
-msgstr "kan inte ta bort gammal kopia av konfigurationsfil \"%.250s\" (av \"%.250s\")"
+msgstr ""
+"kan inte ta bort gammal kopia av konfigurationsfil \"%.250s\" (av \"%.250s\")"
 
 #: src/remove.c:540
 #, c-format
@@ -3172,11 +3259,15 @@ msgstr "--%s beh
 
 #: src/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
-msgstr "kunde inte komma åt dpkgs statusområde för sammanslagen uppdatering av tillgängliga paket"
+msgstr ""
+"kunde inte komma åt dpkgs statusområde för sammanslagen uppdatering av "
+"tillgängliga paket"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "sammanslagen uppdatering av tillgängliga paket kräver tillgång till dpkgs statusområde"
+msgstr ""
+"sammanslagen uppdatering av tillgängliga paket kräver tillgång till dpkgs "
+"statusområde"
 
 #: src/update.c:66
 #, c-format
@@ -3202,24 +3293,30 @@ msgstr "--forget-old-unavail tar inget argument"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - fel: %s (\"%s\") innehåller inga siffror\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build behöver ett katalogargument"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build tar högst två argument"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "kunde inte kontrollera om arkivet \"%.250s\" existerar"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
-msgstr "målet är en katalog - kan inte hoppa över kontroll av konfigurationsfiler"
+msgstr ""
+"målet är en katalog - kan inte hoppa över kontroll av konfigurationsfiler"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3228,178 +3325,183 @@ msgstr ""
 "dpkg-deb: varning, kontrollerar inte innehållet i kontrollområdet.\n"
 "dpkg-deb: bygger ett okänt paket i \"%s\".\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "paketnamnet har tecken som inte är gemena alfanumeriska eller \"-+.\""
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr "varning, \"%s\" innehåller användardefinierat värde för Priority \"%s\"\n"
+msgstr ""
+"varning, \"%s\" innehåller användardefinierat värde för Priority \"%s\"\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "varning, \"%s\" innehåller användardefinierat fält \"%s\"\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d fel i kontrollfilen"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: bygger paketet \"%s\" i \"%s\".\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
-msgstr "kontrollkatalogen har felaktig behörighet %03lo (måste vara >=0755 och <=0775)"
+msgstr ""
+"kontrollkatalogen har felaktig behörighet %03lo (måste vara >=0755 och "
+"<=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "utvecklarskript \"%.50s\" är inte en vanlig fil eller symbolisk länk"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "utvecklarskript \"%.50s\" har felaktig behörighet %03lo (måste vara >=0555 och <=0775)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"utvecklarskript \"%.50s\" har felaktig behörighet %03lo (måste vara >=0555 "
+"och <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "kunde inte ta status på utvecklarskript \"%.50s\""
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "tom sträng från fgets när conffiles lästes"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "varning, konfigurationsfilnamnet \"%.50s...\" är för långt eller saknar nyradstecken på slutet\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"varning, konfigurationsfilnamnet \"%.50s...\" är för långt eller saknar "
+"nyradstecken på slutet\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
-msgstr "varning, konfigurationsfilnamnet \"%s\" innehåller avslutande blanksteg\n"
+msgstr ""
+"varning, konfigurationsfilnamnet \"%s\" innehåller avslutande blanksteg\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "konfigurationsfilen \"%.250s\" finns inte i paketet"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "kunde inte ta status på konfigurationsfilen \"%.50s\""
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "varning, konfigurationsfilen \"%s\" är inte en vanlig fil\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "fel vid läsning av filen conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "fel vid öppning av filen conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: ignorerar %d varningar om kontrollfilerna\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "kunde inte stänga av buffert för \"%.255s\""
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "kunde inte byta katalog till \"%.255s\""
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "kunde inte byta katalog till .../DEBIAN"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "kunde inte köra tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "kunde inte skapa temporärfil (kontrolldel)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "kunde inte öppna temporärfil (kontrolldel), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "kunde inte ta bort temporärfil (kontrolldel), %s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "kontrolldel"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "kunde inte ta status på temporär fil (kontrolldel)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "kunde inte gå till början av temporär fil (kontrolldel)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "kunde inte skapa temporärfil (datadel)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "kunde inte öppna temporärfil (datadel), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "kunde inte ta bort temporärfil (datadel), %s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "datadel"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "kunde inte köra find"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "kunde inte skriva filnamn till tar-rör (datadel)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Internt fel, compress_type \"%i\" okänd!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "kunde inte gå till början av temporär fil (datadel)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (data)"
 
@@ -3417,14 +3519,12 @@ msgstr "fel vid l
 msgid "unexpected end of file in %s in %.255s"
 msgstr "oväntat filslut i %s i %.255s"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "filen \"%.250s\" är trasig - %.250s längd innehåller nulltecken"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "filen \"%.250s\" är trasig - felaktig siffra (kod %d) i %s"
@@ -3446,11 +3546,11 @@ msgstr "versionsnummer"
 msgid "between members"
 msgstr "mellan medlemmar"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "filen \"%.250s\" är trasig - fel magisk siffra i slutet av första huvudet"
+msgstr ""
+"filen \"%.250s\" är trasig - fel magisk siffra i slutet av första huvudet"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3479,23 +3579,22 @@ msgstr "arkivet har ingen punkt i versionsnumret"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "arkivets versionen %.250s förstods inte, hämta en nyare dpkg-deb"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "överhoppad medlemsdata från %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "filen \"%.250s\" innehåler okänd datadel %.*s, ger upp"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "filen \"%.250s\" innehåller två kontrolldelar, ger upp"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3504,16 +3603,16 @@ msgstr ""
 " nytt debianpaket, version %s.\n"
 " storlek %ld byte: kontrollarkiv= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "längd på kontrollinformation"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "arkivet har felformaterad kontrollängd \"%s\""
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3522,15 +3621,15 @@ msgstr ""
 " gammalt debianpaket, version %s.\n"
 " storlek %ld byte: kontrollarkiv= %zi, huvudarkiv= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "misslyckades med allokera minnet till variabeln \"ctrlarea\""
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "kontrollområde"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3539,67 +3638,65 @@ msgstr ""
 "dpkg-deb: filen verkar vara ett arkiv som har gått sönder genom\n"
 "dpkg-deb:    att ha hämtats i ASCII-läge\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "\"%.255s\" är inte ett debianarkiv"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "misslyckades hämta aktuell filposition"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "misslyckades ställa in aktuell filposition"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "kunde inte ansluta röridentifierare \"1\" i \"klistra in\""
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "kunde inte skriva till gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "kunde inte stänga gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "kunde inte utföra systemanropet \"lseek\" för filarkivdelen"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "kunde inte skriva till rör i \"kopiera\""
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "kunde inte stänga rör i \"kopiera\""
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "kunde inte skapa katalog"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "kunde inte byta till katalog efter att ha skapat den"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "kunde inte byta till katalogen"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "kunde inte köra tar"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s behöver ett .deb-filnamn som argument"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3608,12 +3705,12 @@ msgstr ""
 "--%s behöver en målkatalog.\n"
 "Kanske är det dpkg --install du vill använda?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s tar som mest två argument (.deb och katalog)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s tar bara ett argument (.deb-filnamn)"
@@ -3655,7 +3752,9 @@ msgstr "dpkg-deb: \"%.255s\" inneh
 #: dpkg-deb/info.c:113
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr "öppnande av komponenten \"%.255s\" (i %.255s) misslyckades på ett oväntat sätt"
+msgstr ""
+"öppnande av komponenten \"%.255s\" (i %.255s) misslyckades på ett oväntat "
+"sätt"
 
 #: dpkg-deb/info.c:119
 msgid "One requested control component is missing"
@@ -3767,7 +3866,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3776,8 +3875,10 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Flaggor:\n"
@@ -3800,7 +3901,8 @@ msgid ""
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "\n"
-"Använd \"dpkg\" för att installera och ta bort paket från ditt system, eller\n"
+"Använd \"dpkg\" för att installera och ta bort paket från ditt system, "
+"eller\n"
 "\"dselect\" eller \"aptitude\" för användarvänlig pakethantering.  Paket\n"
 "som packas upp med \"dpkg-deb --extract\" blir inte korrekt installerade!\n"
 
@@ -3812,7 +3914,7 @@ msgstr ""
 "Skriv dpkg-deb --help för hjälp om att hantera *.deb-filer\n"
 "Skriv dpkg --help för hjälp om att installera och avinstallera paket."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "okänd komprimeringstyp \"%s\"."
@@ -3844,7 +3946,8 @@ msgstr "filen \"%.250s\" 
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "filen \"%.250s\" är av version \"%.250s\" - du behöver en nyare dpkg-split"
+msgstr ""
+"filen \"%.250s\" är av version \"%.250s\" - du behöver en nyare dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3864,7 +3967,8 @@ msgstr "filen \"%.250s\" 
 #: dpkg-split/info.c:145
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
-msgstr "filen \"%.250s\" är trasig - felaktig magisk siffra i slutet på andra huvudet"
+msgstr ""
+"filen \"%.250s\" är trasig - felaktig magisk siffra i slutet på andra huvudet"
 
 #: dpkg-split/info.c:147
 #, c-format
@@ -3891,8 +3995,7 @@ msgstr "kunde inte ta status p
 msgid "file `%.250s' is corrupt - too short"
 msgstr "filen \"%.250s\" är trasig - för kort"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan inte öppna arkivdelen i fil \"%.250s\""
@@ -3963,7 +4066,8 @@ msgstr "filerna \"%.250s\" och \"%.250s\" 
 #: dpkg-split/join.c:89
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
-msgstr "det finns flera versioner av del %d - åtminstone \"%.250s\" och \"%.250s\""
+msgstr ""
+"det finns flera versioner av del %d - åtminstone \"%.250s\" och \"%.250s\""
 
 #: dpkg-split/join.c:102
 msgid "--join requires one or more part file arguments"
@@ -4011,7 +4115,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4119,8 +4224,7 @@ msgstr "--listq tar inget argument"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Skräpfiler kvar i depåkatalogen:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "kunde inte ta status på \"%.250s\""
@@ -4185,11 +4289,9 @@ msgstr "k
 msgid "unable to exec mksplit"
 msgstr "kunde inte köra mksplit"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -4202,11 +4304,9 @@ msgstr ""
 "\n"
 "Copyright © 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4231,30 +4331,27 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 "  --unsafe     välj några ytterligare möjligen användbara alternativ.\n"
-"               varning: detta alternativ kan förstöra en i övrigt korrekt fil.\n"
+"               varning: detta alternativ kan förstöra en i övrigt korrekt "
+"fil.\n"
 "  --help       visa detta hjälpmeddelande.\n"
 "  --version    visa versionen.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: varning - kunde inte låsa upp %s: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: okänd flagga \"%s\""
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: för många argument"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: kunde inte låsa katalog för redigering! %s"
@@ -4264,48 +4361,40 @@ msgstr "%s: kunde inte l
 msgid "try deleting %s"
 msgstr "testa att ta bort %s"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "kunde inte öppna %s: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "kunde inte skapa %s: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "kunde inte skriva till %s: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "kunde inte läsa %s: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "kunde inte stänga %s efter läsning: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunde inte stänga %s: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "kunde inte säkerhetskopiera gammal %s, ger upp: %s"
@@ -4320,13 +4409,12 @@ msgstr "misslyckades med att installera %s; den kommer l
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: kunde inte låsa upp %s: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Kunde inte hämta ENOENT-värde från %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4336,7 +4424,7 @@ msgstr ""
 "Copyright © 1995 Ian Jackson.\n"
 "Copyright © 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4348,7 +4436,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4361,7 +4450,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "Använd: %s [<flagga> ...] <kommando>\n"
 "\n"
@@ -4372,7 +4462,8 @@ msgstr ""
 "  --truename <fil>         visa den omdirigerade filen.\n"
 "\n"
 "Flaggor:\n"
-"  --package <paket>        namn på paketet vars exemplar av <fil> inte skall\n"
+"  --package <paket>        namn på paketet vars exemplar av <fil> inte "
+"skall\n"
 "                           omdirigeras.\n"
 "  --local                  versioner från alla paket omdirigeras.\n"
 "  --divert <mål>           namnet som används av andra pakets versioner.\n"
@@ -4385,99 +4476,92 @@ msgstr ""
 "\n"
 "När du lägger till är förval --local och --divert <original>.distrib.\n"
 "När du tar bort måste --package eller --local samt --divert stämma om de\n"
-"anges. Skripten preinst/postrm i paket skall alltid ange --package och --divert.\n"
+"anges. Skripten preinst/postrm i paket skall alltid ange --package och --"
+"divert.\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "två lägen angivna: %s och --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s behöver ett mål som argument"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "målet kan inte innehålla nyradstecken"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s behöver ett <paket> som argument"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "paket kan inte innehålla nyradstecken"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s behöver ett <katalog>-argument"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "kunde inte öppna omdirigeringsfil: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "saknat alternativt namn"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "saknat paket"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s behöver ett ensamt argument"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "filnamnet \"%s\" är inte absolut"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "filnamnet kan inte innehålla nyradstecken"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Kan inte omdirigera kataloger"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Låter \"%s\" vara"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "\"%s\" krockar med \"%s\""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Lägger till \"%s\""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4488,7 +4572,7 @@ msgstr ""
 "  vid borttagning av \"%s\"\n"
 "  hittade \"%s\""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4499,37 +4583,37 @@ msgstr ""
 "  vid borttagning av \"%s\"\n"
 "  hittade \"%s\""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Tar bort \"%s\""
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Ingen omdirigering \"%s\", ingen borttagen"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "internt fel - fel läge \"%s\""
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "kan inte ta status på gammalt namn \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "kan inte ta status på nytt namn \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "fel vid kontroll av \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4538,53 +4622,52 @@ msgstr ""
 "namnbyte innebär överskrivning av \"%s\" med\n"
 "  annan fil \"%s\", ej tillåtet"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "namnbyte: ta bort duplicerad gammal länk \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "namnbyte: namnbyte på \"%s\" till \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "skapa diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriva ny diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "stänga diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ta bort gammal diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "skapa ny diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installera ny diversions: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "internt fel: %s trasig: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4592,7 +4675,7 @@ msgstr ""
 "\n"
 "Copyright © 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4622,112 +4705,112 @@ msgstr ""
 "Flaggor:\n"
 "  --admindir <katalog>     väljer katalog för statoverride-filen.\n"
 "  --update                 uppdatera filläge med en gång.\n"
-"  --force                  tvinga ett kommando även om sundhetstestet misslyckas.\n"
+"  --force                  tvinga ett kommando även om sundhetstestet "
+"misslyckas.\n"
 "  --quiet                  arbeta tyst, minimal utdata.\n"
 "  --help                   visa detta hjälpmmeddelande.\n"
 "  --version                visa versionen.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "inget läge angavs"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add behöver fyra argument"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "ogiltig användare %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "icke-existerande användare %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "ogiltig grupp %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "icke-existerande grupp %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "ogiltigt läge %s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "tar bort avslutande /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Det finns redan en överskrivning för \"%s\", "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "men --force angavs, så den kommer att ignoreras."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "avbryter"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "varning: --upgrade angavs med %s finns inte"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "kunde inte byta ägare %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "kunde inte byta läge %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Det finns inga överskrivningar."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "varning: --update är oandvändbar tillsammans med --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "kunde inte öppna statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Flera överskrivningar för \"%s\", avbryter"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "kunde inte öppna ny statoverride-fil: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "fel vid borttagning av statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "fel vid skapande av ny statoverride-old: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "fel vid installation av ny statoverride: %s"
@@ -4748,15 +4831,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4768,20 +4854,25 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 "  --section <reguttr> <titel>\n"
-"                           lägger den nya posten i avdelningen som träffas av\n"
-"                           <reguttr> eller skapar en ny med <titel> om den inte\n"
+"                           lägger den nya posten i avdelningen som träffas "
+"av\n"
+"                           <reguttr> eller skapar en ny med <titel> om den "
+"inte\n"
 "                           finns.\n"
 "  --menuentry=<text>       sätt menyvalet.\n"
-"  --description=<text>     sätt beskrivningen som skall användas i menyvalet.\n"
+"  --description=<text>     sätt beskrivningen som skall användas i "
+"menyvalet.\n"
 "  --info-file=<sökväg>     ange infofil att installera i katalogen.\n"
 "  --dir-file=<sökväg>      ange filnamn till en directory-fil.\n"
 "  --infodir=<katalog>      samma som \"--dir-file=<katalog>/dir\".\n"
 "  --info-dir=<katalog>     dito.\n"
 "  --keep-old               ersätt inte poster eller ta bort tomma.\n"
-"  --remove                 ta bort posten som anges med basnamnet <filnamn>.\n"
+"  --remove                 ta bort posten som anges med basnamnet "
+"<filnamn>.\n"
 "  --remove-exactly         ta bort den exakta posten <filnamn>.\n"
 "  --test                   aktiverar testläge (inga funktioner utförs).\n"
-"  --debug                  aktiverar felsökningsläge (visar mer information).\n"
+"  --debug                  aktiverar felsökningsläge (visar mer "
+"information).\n"
 "  --quiet                  visa inte utdatameddelanden.\n"
 "  --help                   visar detta hjälpmeddelande.\n"
 "  --version                visar versionen.\n"
@@ -4841,8 +4932,7 @@ msgstr ""
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: filen %s finns inte, hämtar säkerhetskopia %s."
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: misslyckades kopiera %s till %s, ger upp: %s"
@@ -4942,7 +5032,7 @@ msgstr "kunde inte l
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4952,8 +5042,8 @@ msgstr ""
 "Copyright © 1995 Ian Jackson.\n"
 "Copyright © 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4962,22 +5052,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -5000,7 +5093,8 @@ msgstr ""
 "  --auto <namn>            växla huvudlängen <namn> till automatiskt läge.\n"
 "  --display <namn>         visa information om gruppen <namn>.\n"
 "  --list <namn>            visa alla mål för gruppen <namn>.\n"
-"  --config <namn>          visa alternativ för gruppen <namn> och be användaren\n"
+"  --config <namn>          visa alternativ för gruppen <namn> och be "
+"användaren\n"
 "                           välja vilken som skall användas.\n"
 "  --set <namn> <sökväg>    lägg till <sökväg> som alternativ för <namn>.\n"
 "  --all                    anropa --config på samtliga alternativ.\n"
@@ -5023,162 +5117,162 @@ msgstr ""
 "  --help                   visa detta hjälpmeddelande.\n"
 "  --version                visa versionen.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "okänt argument \"%s\""
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install behöver <länk> <namn> <sökväg> <prioritet>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "prioritet måste vara ett heltal"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s behöver <namn> <sökväg>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s behöver <namn>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave behöver <länk> <namn> <sökväg>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "slavnamnet %s duplicerat"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "slavlänken %s duplicerad"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "namnet %s är både primär och slav"
-
-#: scripts/update-alternatives.pl:165
-#, 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:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "behöver --display, --config, --set, --install, --remove, --all, --remove-all eller --auto"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave tillåts endast tillsammans med --install"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflagga"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "duplicerad slav %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "slavlänken är samma som huvudlänken %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "duplicerad slavlänk %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "duplicerad sökväg %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "prioritet %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "Alternativet för %s pekar till %s - vilket inte hittades. Tar bort från listan över alternativ."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"Alternativet för %s pekar till %s - vilket inte hittades. Tar bort från "
+"listan över alternativ."
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Inga alternativ för %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status är %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " länk pekar för närvarande på %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " länk saknas för närvarande"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " länk oläslig - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slav %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Inga versioner tillgängliga."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Nuvarande \"bästa\" version är %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "okänt argument \"%s\""
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install behöver <länk> <namn> <sökväg> <prioritet>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "prioritet måste vara ett heltal"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s behöver <namn> <sökväg>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s behöver <namn>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave behöver <länk> <namn> <sökväg>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "slavnamnet %s duplicerat"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "slavlänken %s duplicerad"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "namnet %s är både primär och slav"
+
+#: scripts/update-alternatives.pl:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"behöver --display, --config, --set, --install, --remove, --all, --remove-all "
+"eller --auto"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave tillåts endast tillsammans med --install"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Aktiverar automatiskt val av %s."
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "kunde inte ta bort %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5187,7 +5281,7 @@ msgstr ""
 "%s har ändrats (manuellt eller av ett skript).\n"
 "Växlar till enbart manuella uppdateringar."
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5196,69 +5290,69 @@ msgstr ""
 "Kontrollerar tillgängliga versioner av %s, uppdaterar länkar i %s ...\n"
 "(Du kan ändra de symboliska länkarna själv om du vill - se \"man ln\".)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, 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:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunde inte byta namn på %s till %s: %s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavlänknamnet %s duplicerat"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Tar bort manuellt valda alternativ - växlar till autoläge"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kastar bort föråldrad slavlänk %s (%s)."
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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\"."
+msgstr ""
+"För att återgå till automatiska uppdateringar, använd \"update-alternatives "
+"--auto %s\"."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Återhämtar från tidigare misslyckad uppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunde inte öppna %s för skrivning: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5267,48 +5361,38 @@ msgstr ""
 "varning: %s skulle vara en symbolisk länk till %s\n"
 " (eller inte finnas); readlink misslyckades dock: %s"
 
-#: scripts/update-alternatives.pl:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kunde inte försäkra att %s inte finns: %s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kunde inte installera %s som %s: %s"
 
-#: scripts/update-alternatives.pl:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lämnar %s (%s) att peka på %s."
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Uppdaterar %s (%s) att peka på %s."
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5317,14 +5401,13 @@ msgstr ""
 "varning: %s skulle vara en slav-symbolisk länk till\n"
 " %s, eller inte finnas; readlink misslyckades dock: %s"
 
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Tar bort %s (%s), inte lämplig med %s."
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5333,7 +5416,7 @@ msgstr ""
 "Endast ett program tillhandahåller %s\n"
 "(%s). Inget att konfigurera.\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5346,125 +5429,171 @@ msgstr ""
 "    Urval      Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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: "
+msgstr ""
+"Tryck Enter för att behålla standardvärdet[*], eller ange ett urvalsnummer: "
 
-#: scripts/update-alternatives.pl:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Låter \"%s\" tillhandahålla \"%s\"."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Hittar inte alternativet \"%s\"."
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fel vid skrivning till stdout: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nyradstecken tillåts inte i update-alternatives-file (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "saknat nyradstecken efter %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Allvarligt problem: %s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: kunde inte köra gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: kunde inte köra bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: kunde inte köra bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "kunde inte skapa %.250s"
+
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
 #~ msgstr "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \" \""
+
 #~ msgid "%s: can't open %s: %s"
 #~ msgstr "%s: kunde inte öppna %s: %s"
+
 #~ msgid "%s: can't create %s: %s"
 #~ msgstr "%s: kan inte skapa %s: %s"
+
 #~ msgid "%s: error writing %s: %s"
 #~ msgstr "%s: fel vid skrivning av %s: %s"
+
 #~ msgid "%s: read %s: %s"
 #~ msgstr "%s: läsa %s: %s"
+
 #~ msgid "%s: close %s after read: %s"
 #~ msgstr "%s: stänga %s efter läsning: %s"
+
 #~ msgid "%s: error closing %s: %s"
 #~ msgstr "%s: fel vid stängning av %s: %s"
+
 #~ msgid "%s: can't backup old %s, giving up: %s"
 #~ msgstr "%s: kunde inte ta säkerhetskopia av gammal %s, ger upp: %s"
+
 #~ msgid "--admindir needs a directory argument"
 #~ msgstr "--admindir behöver ett katalogargument"
+
 #~ msgid "--remove needs a single argument"
 #~ msgstr "--remove behöver ett ensamt argument"
+
 #~ msgid "--truename needs a single argument"
 #~ msgstr "--truename behöver ett ensamt argument"
+
 #~ msgid "dpkg-divert: %s"
 #~ msgstr "dpkg-divert: %s"
+
 #~ msgid "You need --help"
 #~ msgstr "Skriv --help för hjälp"
+
 #~ msgid "--remove needs one arguments"
 #~ msgstr "--remove behöver ett argument"
+
 #~ msgid "--remove needs one argument"
 #~ msgstr "--remove behöver ett argument"
+
 #~ msgid "dpkg-statoverride: %s"
 #~ msgstr "statoverride-fil \"%.250s\""
+
 #~ msgid "You need --help."
 #~ msgstr "Skriv --help för hjälp."
+
 #~ msgid "open %s: %s"
 #~ msgstr "öppna %s: %s"
+
 #~ msgid "read %s: %s"
 #~ msgstr "läsa %s: %s"
+
 #~ msgid "create %s: %s"
 #~ msgstr "skapa %s: %s"
+
 #~ msgid "write %s: %s"
 #~ msgstr "skriva %s: %s"
+
 #~ msgid "close %s: %s"
 #~ msgstr "stänga %s: %s"
+
 #~ msgid "install new %s: %s"
 #~ msgstr "installera ny %s: %s"
+
 #~ msgid "%s: unlock %s: %s"
 #~ msgstr "%s: låsa upp %s: %s"
+
 #~ msgid "%s: read %s: %d"
 #~ msgstr "%s: läs %s: %d"
+
 #~ msgid "update-alternatives: %s"
 #~ msgstr "update-alternatives: %s"
+
 #~ msgid "--admindir needs a <directory> argument"
 #~ msgstr "--admindir behöver ett katalogargument"
+
 #~ msgid "failed to open %s: %s"
 #~ msgstr "kunde inte öppna %s: %s"
+
 #~ msgid "unable to install %s as %s"
 #~ msgstr "kunde inte installera %s som %s"
+
 #~ msgid "version a has bad syntax: %s\n"
 #~ msgstr "version a har felaktig syntax: %s\n"
+
 #~ msgid "  Package "
 #~ msgstr "  Paket "
+
 #~ msgid " which provides "
 #~ msgstr " vilket tillhandahåller "
+
 #~ msgid " is to be removed.\n"
 #~ msgstr " är på väg att tas bort.\n"
+
 #~ msgid "  Version of "
 #~ msgstr "  Versionen av "
+
 #~ msgid " on system is "
 #~ msgstr " på systemet är "
+
 #~ msgid " is not installed.\n"
 #~ msgstr " är ej installerat.\n"
+
 #~ msgid " to: %s\n"
 #~ msgstr " till: %s\n"
+
 #~ msgid "fgetpos failed"
 #~ msgstr "fgetpos misslyckades"
+
 #~ msgid "fsetpos failed"
 #~ msgstr "fsetpos misslyckades"
-
diff --git a/po/tl.po b/po/tl.po
index 47961118..b3da9c4a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -58,72 +58,57 @@ msgstr "Error ng sistema bilang %d"
 msgid "Signal no.%d"
 msgstr "Hudyat bilang %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: bigo sa pag-exec gzip %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: error na internal sa gzip: `%s'"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: bigo sa pag-exec ng gzip -dc"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: error na internal sa bzip2: `%s'"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: bigo sa pag-exec bzip2 -dc"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: decompression"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: internal gzip error: pagbasa: `%s'"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: internal gzip error: pagsulat: `%s'"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: internal gzip error: pagbasa(%i) != pagsulat(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: bigo sa pag-exec gzip %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: internal bzip2 error: pagbasa: `%s'"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: internal bzip2 error: pagsulat: `%s'"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: internal bzip2 error: pagbasa(%i) != pagsulat(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: bigo sa pag-exec bzip2 %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: compression"
@@ -169,7 +154,7 @@ msgstr "hindi ma-scan ang directory ng mga update `%.255s'"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "bigo sa pagtanggal ng naisamang mga talaksang update %.255s"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "hindi malikha ang `%.255s'"
@@ -910,30 +895,30 @@ msgstr "Kulang ang pansarang brace sa anyo\n"
 msgid "failed to realloc for variable buffer"
 msgstr "bigo sa pag-realloc para sa variable buffer"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive... nawala na !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "error sa pagbasa mula sa dpkg-deb pipe"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "error sa pagtakda ng timestamp ng `%.255s'"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "error sa pagtakda ng pagmamayari ng `%.255s'"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "error sa pagtakda ng pahintulo ng `%.255s'"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -942,16 +927,16 @@ msgstr ""
 "sinusubukang patungan ang `%.250s', na siyang dibertadong bersyon ng `"
 "%.250s'%.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (pakete: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "hindi ma-stat ang `%.255s' (na siyang iluluklok sana)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
@@ -960,27 +945,27 @@ msgstr ""
 "hindi malinis ang kalat sa paligid ng `%.255s' bago magluklok ng ibang "
 "bersyon"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "hindi ma-stat ang ibinalik na `%.255s' bago magluklok ng ibang bersyon"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "naglalaman ang arkibo ng bagay na `%.255s' ng hindi kilalang uri 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Pinapalitan ang talaksan sa lumang paketeng %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Pinalitan ng mga talaksan sa nakaluklok na paketeng %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
@@ -988,88 +973,88 @@ msgstr ""
 "sinusubukang patungan ang directory `%.250s' sa paketeng %.250s ng hindi "
 "directory"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "sinusubukang patungan ang `%.250s', na nasa paketeng %.250s din"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "pinalitan ng gobble ang talaksang `%.255s'"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "bakend dpkg-deb habang `%.255s'"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "error sa pagsara/pagsulat `%.255s'"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "error sa paglikha ng pipe `%.255s'"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "error sa paglikha ng hard link `%.255s'"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "error sa paglikha ng symbolic link `%.255s'"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "error sa pagtakda ng pagmamayari ng symlink `%.255s'"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "error sa paglikha ng directory `%.255s'"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "hindi malipat ang `%.255s' upang iluklok ang bagong bersyon"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "hindi mabasa ang link `%.255s'"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "hindi ma-chown ang backup symlink para sa `%.255s'"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 "hindi makagawa ng backup link ng `%.255s' bago iluklok ang bagong bersyon"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1079,7 +1064,7 @@ msgstr ""
 "s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1088,7 +1073,7 @@ msgstr ""
 "dpkg: babala - inaayunan na tanggalin ang pagkaayos ng kailangang\n"
 " pakete %s, upang maaaring tanggalin ang %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1097,7 +1082,7 @@ msgstr ""
 "dpkg: hindi, %s ay kailangan, hindi ito tatanggalan ng pagkaayos\n"
 " nito upang maaaring tanggalin ang %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1107,26 +1092,26 @@ msgstr ""
 "deconfigure):\n"
 " %s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: inaayunan ang pagtanggal ng %s pabor sa %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 "hindi nakaluklok ng tama ang %s - hindi pinapansin ang mga dependensiya sa "
 "kanya.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 "dpkg: maaaring magkaproblema sa pagtanggal ng %s, dahil nagbibigay ito ng %"
 "s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1135,17 +1120,22 @@ msgstr ""
 "dpkg: kinakailangan iluklok muli ang paketeng %s, ngunit tatanggalin na rin "
 "ito gaya ng hiling niyo.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: kinakailangan iluklok muli ang paketeng %s, hindi tatanggalin.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: oo, tatanggalin ang %s pabor sa %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1154,78 +1144,78 @@ msgstr ""
 "dpkg: tungkol sa %s na naglalaman ng %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "magkatunggaling mga pakete - hindi iluluklok %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 "dpkg: babala - hindi pinapansin ang tunggalian, maaaring magpatuloy pa "
 "rin !\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 "--%s --recursive ay nangangailangan ng hindi kukulang sa isang argumentong "
 "path"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "bigo sa pag-exec ng find para sa --recursive"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "bigo sa pag-fdopen ng pipe ng find"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "error sa pagbasa ng pipe ng find"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "error sa pagsara ng pipe ng find"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find para sa --recursive ay nagbalik ng hindi maprosesong error %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "naghanap, ngunit walang nahanap na pakete (talaksang pumares sa *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 "--%s ay nangangailangan ng hindi kulang sa isa talaksang arkibong pakete "
 "argumento"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Pinipili ang nakaraang hindi piniling pakete %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Linampasan ang hindi piniling pakete %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Bersyon %.250s ng %.250s ay nakaluklok na, linalampasan.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - babala: downgrade ng %.250s mula %.250s tungong %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1603,111 +1593,118 @@ msgstr "EOF sa stdin sa prompt ng conffile"
 msgid "unable to check for existence of `%.250s'"
 msgstr "hindi masiguro ang pagkakaroon ng `%.250s'"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " nagdedepende sa "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " nag-pre-depende sa "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " rekomendado ang "
 
-#: src/depcon.c:156
-msgid " breaks "
-msgstr ""
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " mungkahi ang "
 
-#: src/depcon.c:157
-msgid " conflicts with "
-msgstr " katunggali ang "
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
+msgstr "%s (subprocess): %s\n"
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " mungkahi ang "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " katunggali ang "
 
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " nagpapabuti sa "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s ay tatanggalin.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s ay tatanggalin ang pagkaayos.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s ay iluluklok, ngunit ito'y bersyon %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ay nakaluklok, ngunit ang bersyon nito ay %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ay nakabuklat, ngunit hindi ito isinaayos kailanman.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ay nakabuklat, ngunit ito'y bersyon %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  Ang huling bersyon ng pagkaayos ng %.250s ay %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ay %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalin.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalan ng pagkaayos.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s ngunit ito'y %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ay hindi nakaluklok.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (bersyon %.250s) ay iluluklok.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (bersyon %.250s) ay %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s at iluluklok.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s ay nagbibigay ng %.250s at ay %s.\n"
@@ -2547,7 +2544,7 @@ msgstr "hindi mabuksan ang `%i' para sa stream"
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %d"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "kailangan ng opsyon ng gagawin"
@@ -2629,6 +2626,10 @@ msgstr "Di nakaluklok ang paketeng `%s'.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "Di nakaluklok ang paketeng `%s'.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " nagdedepende sa "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; gayunpaman:\n"
@@ -2825,7 +2826,7 @@ msgstr "hindi ma-fstat ang talaksang bahagi `%.250s'"
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg: %s: babala - conffile `%.250s' ay hindi payak na talaksan o symlink\n"
 " (= `%s')\n"
@@ -3320,25 +3321,30 @@ msgstr "--forget-old-unavail ay hindi tumatanggap ng argumento"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - error: %s (`%s') ay hindi naglalaman ng mga digit\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build ay tumatanggap ng hanggang dalawang argumento lamang"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "hindi matiyak na mayroong arkibong `%.250s'"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 "ang target ay directory - hindi malaktawan ang pagsuri ng talaksang control"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3347,45 +3353,45 @@ msgstr ""
 "dpkg-deb: babala, hindi sinusuri ang nilalaman ng control area.\n"
 "dpkg-deb: binubuo ang hindi kilalang pakete sa `%s'.\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 "pangalan ng pakete ay may mga karakter na hindi maliit na titik, numero o `-"
 "+.'"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "babala, `%s' ay naglalaman ng halagang user-defined Priority `%s'\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "babala, `%s' ay naglalaman ng user-defined na saklaw `%s'\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d na error sa talaksang control"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: binubuo ang paketeng `%s' sa `%s'.\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 "control directory ay may masamang pahintulot %03lo (kailangang >=0755 at "
 "<=0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "skripto ng tagapangalaga `%.50s' ay hindi payak na talaksan o symlink"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
@@ -3394,16 +3400,16 @@ msgstr ""
 "skripto ng tagapangalaga `%.50s' ay may masamang pahintulot %03lo\n"
 "(kailangang >=0555 at <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "skripto ng tagapangalaga `%.50s' ay hindi ma-stat"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "walang laman ang string mula sa fgets habang binabasa ang conffiles"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
@@ -3411,120 +3417,120 @@ msgstr ""
 "babala, pangalan ng conffile `%.50s...' ay labis ang haba, o kulang\n"
 "ng pangwakas na newline\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, fuzzy, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "babala, conffile `%s' ay hindi payak na talaksan\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "conffile `%.250s' ay wala sa pakete"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "conffile `%.250s' ay hindi ma-stat"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "babala, conffile `%s' ay hindi payak na talaksan\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "error sa pagbasa ng talaksang conffiles"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "error sa pagbukas ng talaksang conffiles"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 "dpkg-deb: hindi pinansin %d na babala tungkol sa (mga) talaksang control\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "hindi ma-unbuffer ang `%.255s'"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "bigo sa pag-chdir sa `%.255s'"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "bigo sa pag-chdir sa .../DEBIAN"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "bigo sa pag-exec ng tar -cf"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "bigo na likhain ang tmpfile (control)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "bigo sa pagbukas ng tmpfile (control), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "bigo na i-unlink ang tmpfile (control), %s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "control"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "bigo na i-fstat ang tmpfile (control)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "bigo na i-rewind ang tmpfile (control)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "bigo na likhain ang tmpfile (datos)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "bigo na buksan ang tmpfile (datos), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "bigo na i-unlink ang tmpfile (datos), %s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "datos"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "bigo sa pag-exec ng find"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "bigo na isulat ang pangalan ng talaksan sa tar pipe (datos)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Internal na error, compress_type `%i' hindi kilala!"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "bigo na i-rewind ang tmpfile (datos)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (datos)"
 
@@ -3603,12 +3609,12 @@ msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 "di maintindihan ang bersyon ng arkibong %.250s, kumuha ng mas bagong dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "linaktawan ang datos na kasapi mula sa %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
@@ -3616,13 +3622,13 @@ msgstr ""
 "*s,\n"
 "sumusuko na"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 "naglalaman ng dalawang kasaping control ang talaksang `%.250s', sumusuko na"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3631,17 +3637,17 @@ msgstr ""
 " bagong paketeng debian, bersyong %s.\n"
 " laki %ld na byte: arkibong control= %zi na byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 #, fuzzy
 msgid "control information length"
 msgstr "haba ng impormasyong ctrl"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, fuzzy, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "may maling anyong ctrl len `%s' ang arkibo"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3650,17 +3656,17 @@ msgstr ""
 " lumang paketeng debian, bersyong %s.\n"
 " laki %ld na byte: arkibong control= %zi, pangunahing arkibo= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 #, fuzzy
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "Error sa pag-allocate ng memory para sa cfgfilename"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 #, fuzzy
 msgid "control area"
 msgstr "ctrlarea"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3669,66 +3675,66 @@ msgstr ""
 "dpkg-deb: mukhang ang talaksan ay arkibo na nasira dahil sa\n"
 "dpkg-deb:  kinuha ito na gamit ang ASCII mode\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "`%.255s' ay hindi arkibong anyong debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 #, fuzzy
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "bigo ang fdopen p1 sa pag-paste"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "bigo ang pagsulat sa gzip -dc"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "bigo ang pagsara ng gzip -dc"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "bigo na mag-syscall ng lseek sa bahagi ng arkibong talaksan"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "bigo sa pagsulat sa pipe sa copy"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "bigo na isara ang pipe sa copy"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "bigo na likhain ang directory"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "bigo na mag-chdir sa directory matapos likhain ito"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "bigo na mag-chdir sa directory"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "bigo na i-exec ang tar"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3737,14 +3743,14 @@ msgstr ""
 "--%s ay nangangailangan ng target directory.\n"
 "Siguro ang kailangan niyong gamitin ay dpkg --install ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 "--%s ay tumatanggap ng hindi lalabis sa dalawang argumento (.deb at "
 "directory)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3896,7 +3902,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 
@@ -3917,7 +3924,7 @@ msgstr ""
 "dpkg-deb --help para sa tulong tungkol sa pag-manipulate ng *.deb;\n"
 "dpkg --help para sa tulong tungkol sa pagluklok at pagtanggal ng mga pakete."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "di kilalang uri ng compression `%s'!"
@@ -4297,9 +4304,9 @@ msgstr "pinagmulan na talaksan `%.250s' ay hindi payak na talaksan"
 msgid "unable to exec mksplit"
 msgstr "hindi ma-exec ang mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "' bersyon ng backend ng arkibong pakete"
@@ -4310,9 +4317,9 @@ msgid ""
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 #, fuzzy
 msgid ""
 "\n"
@@ -4362,7 +4369,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, fuzzy, perl-format
 msgid "unable to open %s: %s"
 msgstr "hindi ma-execute ang %s"
@@ -4389,7 +4396,7 @@ msgid "unable to close %s after read: %s"
 msgstr "bigo sa pagsara matapos ng pagbasa: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "hindi ma-execute ang %s"
@@ -4409,19 +4416,19 @@ msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: bigo sa pag-exec gzip %s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4451,95 +4458,95 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, fuzzy, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, fuzzy, perl-format
 msgid "--%s needs a <package> argument"
 msgstr ""
 "--%s ay nangangailangan ng hindi kukulang sa isa na argumentong pangalan ng "
 "pakete"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 #, fuzzy
 msgid "package may not contain newlines"
 msgstr "Walang laman ang paketeng `%s' (!)\n"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "di kilalang opsyon --%s"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, fuzzy, perl-format
 msgid "cannot open diversions: %s"
 msgstr "bigo sa pagbukas ng talaksang dibersyon"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 #, fuzzy
 msgid "missing altname"
 msgstr "kulang na %s"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 #, fuzzy
 msgid "missing package"
 msgstr "kulang na %s"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, fuzzy, perl-format
 msgid "--%s needs a single argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, fuzzy, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "conffile `%.250s' ay hindi ma-stat"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 #, fuzzy
 msgid "Cannot divert directories"
 msgstr "hindi mabasa ang info directory"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, fuzzy, perl-format
 msgid "Leaving `%s'"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4547,7 +4554,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4555,96 +4562,96 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, fuzzy, perl-format
 msgid "Removing `%s'"
 msgstr "Tinatanggal ang %s ...\n"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, fuzzy, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "%s: internal gzip error: pagbasa: `%s'"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, fuzzy, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, fuzzy, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, 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:260
+#: scripts/dpkg-divert.pl:275
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "error sa pagbasa sa dibersyon [i]"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "dibersyon ng %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "dibersyon ng %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "error sa pagbasa sa dibersyon [i]"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: internal gzip error: pagsulat: `%s'"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4664,108 +4671,108 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 #, fuzzy
 msgid "aborting"
 msgstr "babala"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, fuzzy, perl-format
 msgid "failed to chown %s: %s"
 msgstr "bigo ang pagpatakbo ng %s (%.250s)"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, fuzzy, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "bigo sa pag-exec ng %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, fuzzy, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "bigo sa pagbukas ng talaksang statoverride"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, fuzzy, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "bigo sa pagbukas ng talaksang statoverride"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, fuzzy, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
@@ -4956,14 +4963,14 @@ msgstr "hindi ma-execute ang %s"
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:51
+#: scripts/update-alternatives.pl:78
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4984,7 +4991,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5004,292 +5011,291 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:117
-#, fuzzy, perl-format
-msgid "unknown argument `%s'"
-msgstr "di kilalang uri ng compression `%s'!"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr ""
-
-#: scripts/update-alternatives.pl:136
-#, fuzzy, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
-
-#: scripts/update-alternatives.pl:141
-#, fuzzy, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s ay hindi tumatanggap ng mga argumento"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr ""
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr ""
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr ""
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr ""
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr ""
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, fuzzy, perl-format
 msgid "duplicate slave %s"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, fuzzy, perl-format
 msgid "duplicate slave link %s"
 msgstr "nadobleng halaga para sa saklaw na `%s'"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 #, fuzzy
 msgid "No versions available."
 msgstr "(walang paglalarawan)"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, fuzzy, perl-format
+msgid "unknown argument `%s'"
+msgstr "di kilalang uri ng compression `%s'!"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
+
+#: scripts/update-alternatives.pl:261
+#, fuzzy, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s ay hindi tumatanggap ng mga argumento"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr ""
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr ""
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr ""
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "hindi ma-execute ang %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, 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:334
+#: scripts/update-alternatives.pl:376
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "hindi ma-stat ang %s `%.250s'"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, 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:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "hindi ma-execute ang bagong %s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, 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:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5298,45 +5304,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "sira ang talaksang `%.250s' - may kulang na newline matapos ang %.250s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: bigo sa pag-exec ng gzip -dc"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: bigo sa pag-exec bzip2 -dc"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: bigo sa pag-exec bzip2 %s"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "hindi nakabuo %.250s"
 
diff --git a/po/vi.po b/po/vi.po
index 7bee966d..5ade25b3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4,10 +4,10 @@
 # Clytie Siddall <clytie@riverland.net.au>, 2006.
 # 
 msgid ""
-""
-msgstr "Project-Id-Version: dpkg\n"
+msgstr ""
+"Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-11-24 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -59,72 +59,57 @@ msgstr "Lỗi hệ thống số %d"
 msgid "Signal no.%d"
 msgstr "Tín hiệu số %d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s: việc thực hiện gzip bị lỗi %s"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s: lỗi nội bộ của gzip: « %s »"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s: việc thực hiện « gzip -dc » bị lỗi"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s: lỗi nội bộ của bzip2: « %s »"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s: việc thực hiện « bzip2 -dc » bị lỗi"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s: giải nén"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s: lỗi nội bộ của gzip: đọc: « %s »"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s: lỗi nội bộ của gzip: ghi: « %s »"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s: lỗi nội bộ của gzip: đọc(%i) != ghi(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s: việc thực hiện gzip bị lỗi %s"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s: lỗi nội bộ của bzip2: đọc: « %s »"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s: lỗi nội bộ của bzip2: ghi: « %s »"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s: lỗi nội bộ của bzip2: đọc(%i) != ghi(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s: việc thực hiện bzip2 bị lỗi %s"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s: nén"
@@ -148,13 +133,16 @@ msgstr "lỗi ghi trong khi hashreport (thông báo băm)"
 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)"
+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)"
 
 #: lib/dbmodify.c:63
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
-msgstr "thư mục cập nhật chứa các tập tin có tên có chiều dài khác nhau (cả hai %d "
+msgstr ""
+"thư mục cập nhật chứa các tập tin có tên có chiều dài khác nhau (cả hai %d "
 "và %d)"
 
 #: lib/dbmodify.c:77
@@ -167,9 +155,7 @@ msgstr "không thể quét thư mục cập nhật « %.255s »"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "lỗi gỡ bỏ tập tin cập nhật đã hợp nhất %.255s"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "không thể tạo « %.255s »"
@@ -224,7 +210,8 @@ msgstr "không thể cắt ngắn cho trạng thái đã cập nhật của « %
 #: lib/dbmodify.c:268
 #, 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:270
 #, c-format
@@ -294,7 +281,8 @@ msgstr "hết bộ nhớ khi đầy bộ quản lý lỗi:"
 msgid ""
 "%s: error while cleaning up:\n"
 " %s\n"
-msgstr "%s: lỗi khi dọn dẹp:\n"
+msgstr ""
+"%s: lỗi khi dọn dẹp:\n"
 " %s\n"
 
 #: lib/ehandle.c:111
@@ -353,13 +341,15 @@ msgstr "không cho phép trường chi tiết tập tin « %s » trong tập tin
 #: lib/fields.c:104
 #, 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 "
+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)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "quá ít giá trị trong trường chi tiết tập tin « %s » (so sánh với những cái "
+msgstr ""
+"quá ít 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:133
@@ -372,7 +362,8 @@ msgstr "gặp từ trong trường « priority » (ưu tiên)"
 
 #: lib/fields.c:166
 msgid "value for `status' field not allowed in this context"
-msgstr "không cho phép giá trị cho trường « status » (trạng thái) trong ngữ cảnh này"
+msgstr ""
+"không cho phép giá trị cho trường « status » (trạng thái) trong ngữ cảnh này"
 
 #: lib/fields.c:170
 msgid "first (want) word in `status' field"
@@ -393,28 +384,33 @@ msgstr "lỗi trong chuỗi Phiên bản « %.250s »: %.250s"
 
 #: lib/fields.c:201
 msgid "obsolete `Revision' or `Package-Revision' field used"
-msgstr "đã dùng trường « Revision » (bản sửa đổi) hoặc « Package-Revision » (bản sửa "
+msgstr ""
+"đã dùng trường « Revision » (bản sửa đổi) hoặc « Package-Revision » (bản sửa "
 "đổi gói) cũ"
 
 #: lib/fields.c:219
 msgid "value for `config-version' field not allowed in this context"
-msgstr "không cho phép giá trị cho trường « config-version » (phiên bản cấu hình) "
+msgstr ""
+"không cho phép giá trị cho trường « config-version » (phiên bản cấu hình) "
 "trong ngữ cảnh này"
 
 #: lib/fields.c:223
 #, c-format
 msgid "error in Config-Version string `%.250s': %.250s"
-msgstr "lỗi trong chuỗi « Config-Version » (phiên bản cấu hình) « %.250s »: %.250s"
+msgstr ""
+"lỗi trong chuỗi « Config-Version » (phiên bản cấu hình) « %.250s »: %.250s"
 
 #: lib/fields.c:247
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
-msgstr "giá trị cho « conffiles » (các tập tin cấu hình) có dòng dạng sai « %.*s »"
+msgstr ""
+"giá trị cho « conffiles » (các tập tin cấu hình) có dòng dạng sai « %.*s »"
 
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "giá trị cho « conffiles » (các tập tin cấu hình) có dòng với ký tự đầu không "
+msgstr ""
+"giá trị cho « conffiles » (các tập tin cấu hình) có dòng với ký tự đầu không "
 "phải khoảng trắng « %c »"
 
 #: lib/fields.c:281
@@ -437,7 +433,8 @@ msgstr "trường « %s », tên gói không hợp lệ « %.255s »: %s"
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
-msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
+msgstr ""
+"trường « %s », tham chiếu đến « %.255s »:\n"
 " quan hệ phiên bản sai %c%c"
 
 #: lib/fields.c:377
@@ -445,7 +442,8 @@ msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
-msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
+msgstr ""
+"trường « %s », tham chiếu đến « %.255s »:\n"
 " « %c » là cũ, dùng « %c= » hay « %c%c » thay thế"
 
 #: lib/fields.c:387
@@ -453,7 +451,8 @@ msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
-msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
+msgstr ""
+"trường « %s », tham chiếu đến « %.255s »:\n"
 " khớp chính xác ngầm số phiên bản, đề nghị dùng « = » thay thế"
 
 #: lib/fields.c:394
@@ -465,11 +464,11 @@ msgstr "Chỉ dùng được phiên bản chính xác cho Provides (miễn là)"
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
-msgstr "trường « %s », tham chiếu đến « %.255s »:\n"
+msgstr ""
+"trường « %s », tham chiếu đến « %.255s »:\n"
 " giá trị phiên bản bắt đầu với ký tự không phải chữ số, đề nghị thêm dấu cách"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "trường « %s », tham chiếu đến « %.255s »: phiên bản chứa « %c »"
@@ -519,8 +518,7 @@ msgstr "không thể khóa cơ sở dữ liệu trạng thái của dpkg"
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc (cấp phát bộ nhớ) bị lỗi (%ld byte)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc (cấp phát lại) bị lỗi (%ld byte)"
@@ -563,8 +561,7 @@ msgstr "tiến trình con %s trả lại lỗi, trạng thái thoát %d"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: cảnh báo : %s bị diệt bởi tín hiệu (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", lõi bị đổ"
 
@@ -596,12 +593,14 @@ msgstr "không thể đặt cờ close-on-exec (đóng khi thực hiện) cho %.
 #: lib/mlib.c:199
 #, c-format
 msgid "failed in buffer_write(fd) (%i, ret=%li): %s"
-msgstr "bị lỗi trong buffer_write(fd) [ghi bộ đệm(mô tả tập tin)] (%i, ret=%li): %s"
+msgstr ""
+"bị lỗi trong buffer_write(fd) [ghi bộ đệm(mô tả tập tin)] (%i, ret=%li): %s"
 
 #: lib/mlib.c:206
 #, c-format
 msgid "eof in buffer_write(stream): %s"
-msgstr "gặp kết thúc tập tin trong buffer_write(stream) [bộ đệm_ghi(luồng)]: %s"
+msgstr ""
+"gặp kết thúc tập tin trong buffer_write(stream) [bộ đệm_ghi(luồng)]: %s"
 
 #: lib/mlib.c:208
 #, c-format
@@ -673,8 +672,7 @@ msgstr "lỗi đọc trong tập tin cấu hình « %.255s »"
 msgid "error closing configuration file `%.255s'"
 msgstr "lỗi đóng tập tin cấu hình « %.255s »"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Gặp lỗi khi cấp phát bộ nhớ cho cfgfilename (tên tập tin cấu hình)"
 
@@ -756,19 +754,22 @@ msgstr "tên trường « %.*s » phải có dấu hai chấm theo sau"
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "gặp kết thúc tập tin nằm trước giá trị của trường « %.*s » (còn thiếu dòng "
+msgstr ""
+"gặp kết thúc tập tin nằm trước giá trị của trường « %.*s » (còn thiếu dòng "
 "mới cuối cùng)"
 
 #: lib/parse.c:174
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
-msgstr "ký tự kết thúc tập tin dạng MSDOS trong giá trị của trường « %.*s » (thiếu "
+msgstr ""
+"ký tự kết thúc tập tin dạng MSDOS trong giá trị của trường « %.*s » (thiếu "
 "dòng mới?)"
 
 #: lib/parse.c:188
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
-msgstr "gặp kết thúc tập tin trong giá trị của trường « %.*s » (còn thiếu dòng mới "
+msgstr ""
+"gặp kết thúc tập tin trong giá trị của trường « %.*s » (còn thiếu dòng mới "
 "cuối cùng)"
 
 #: lib/parse.c:211
@@ -792,12 +793,14 @@ msgstr "tìm thấy vài mục nhập thông tin gói, chỉ cho phép một m
 
 #: lib/parse.c:260
 msgid "Configured-Version for package with inappropriate Status"
-msgstr "Configured-Version (phiên bản đã cấu hình) cho gói với Status (trạng thái) "
+msgstr ""
+"Configured-Version (phiên bản đã cấu hình) cho gói với Status (trạng thái) "
 "không thích hợp"
 
 #: lib/parse.c:274
 msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Gói trong trạng thái not-installed (chưa cài đặt) có các tập tin cấu hình mà "
+msgstr ""
+"Gói trong trạng thái not-installed (chưa cài đặt) có các tập tin cấu hình mà "
 "quên chúng"
 
 #: lib/parse.c:331
@@ -848,7 +851,8 @@ msgstr "cần phải bắt đầu với một chữ số"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "không cho phép ký tự « %c » : chỉ cho phép chữ cái, chữ số và ký tự « %s »"
+msgstr ""
+"không cho phép ký tự « %c » : chỉ cho phép chữ cái, chữ số và ký tự « %s »"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -882,7 +886,8 @@ msgstr "giá trị rỗng cho %s"
 
 #: lib/showcright.c:34
 msgid "cannot open GPL file"
-msgstr "không thể mở tập tin GPL (Giấy Phép Công Cộng GNU, xem cũng « http://vi."
+msgstr ""
+"không thể mở tập tin GPL (Giấy Phép Công Cộng GNU, xem cũng « http://vi."
 "wikisource.org/wiki/GPL »)"
 
 #: lib/showpkg.c:70
@@ -899,310 +904,326 @@ msgstr "Thiếu dấu đóng ngoặc móc trong định dạng\n"
 msgid "failed to realloc for variable buffer"
 msgstr "lỗi realloc (cấp phát lại) cho bộ đệm biến đổi"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive (xử lý kho) ...  đã biến mất !"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "gặp lỗi khi đọc từ ống dẫn dpkg-deb"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "gặp lỗi khi đặt nhãn thời gian của « %.255s »"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "gặp lỗi khi đặt quyền sở hữu « %.255s »"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "gặp lỗi khi đặt quyền hạn của « %.255s »"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
 "%.100s%.10s"
-msgstr "đang cố ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s »%.10s"
+msgstr ""
+"đang cố ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s »%.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (gói: "
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "không thể lấy các thông tin về « %.255s » (mà tôi sắp cài đặt)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 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 "
+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"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "không thể lấy các thông tin về « %.255s » đã phục hồi trước khi cài đặt "
+msgstr ""
+"không thể lấy các thông tin về « %.255s » đã phục hồi trước khi cài đặt "
 "phiên bản khác"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "kho nén chứa đối tượng « %.255s » có kiểu không rõ 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "Đang thay thế các tập tin trong gói cũ %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Được thay thế bằng các tập tin trong gói đã cài đặt %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "đang cố ghi đè lên thư mục « %.255s » trong gói %.250s với điều khác thư mục"
+msgstr ""
+"đang cố ghi đè lên thư mục « %.255s » trong gói %.250s với điều khác thư mục"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "đang cố ghi đè lên « %.255s », mà cũng nằm trong gói %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "gobble tập tin đã thay thế « %.255s »"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "hậu phương dpkg-deb trong tiến trình « %.255s »"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "lỗi đóng/ghi « %.255s »"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "lỗi tạo ống dẫn « %.255s »"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "lỗi tạo thiết bị « %.255s »"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "lỗi tạo liên kết cứng « %.255s »"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "lỗi tạo liên kết tượng trưng « %.255s »"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "lỗi thiết lập quyền sở hữu liên kết tượng trưng « %.255s »"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "lỗi tạo thư mục « %.255s »"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "không thể di chuyển « %.255s » riêng ra để cài đặt phiên bản mới"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "không thể đọc liên kết « %.255s »"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "không thể tạo liên kết tượng trưng sao lưu cho « %.255s »"
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
-msgstr "không thể chown (chuyển đổi tính trạng sở hữu) liên kết tượng trưng sao lưu "
+msgstr ""
+"không thể chown (chuyển đổi tính trạng sở hữu) liên kết tượng trưng sao lưu "
 "cho « %.255s »"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "không thể tạo liên kết tượng trưng sao lưu của « %.255s » trước khi cài đặt "
+msgstr ""
+"không thể tạo liên kết tượng trưng sao lưu của « %.255s » trước khi cài đặt "
 "phiên bản mới"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "không thể cài đặt phiên bản mới của « %.255s »"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
-msgstr "dpkg: cảnh báo : lờ đi vấn đề phụ thuộc với việc gỡ bỏ %s:\n"
+msgstr ""
+"dpkg: cảnh báo : lờ đi vấn đề phụ thuộc với việc gỡ bỏ %s:\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
-msgstr "dpkg: cảnh báo : coi như hủy cấu hình của\n"
+msgstr ""
+"dpkg: cảnh báo : coi như hủy cấu hình của\n"
 "gói cốt yếu %s, để bật khả năng gỡ bỏ %s.\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
-msgstr "dpkg: không, %s là cốt yếu, sẽ không hủy\n"
+msgstr ""
+"dpkg: không, %s là cốt yếu, sẽ không hủy\n"
 "cấu hình nó để bật khả năng gỡ bỏ %s.\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
-msgstr "dpkg: không, không thể gỡ bỏ %s (« --auto-deconfigure » [tự động hủy cấu "
+msgstr ""
+"dpkg: không, không thể gỡ bỏ %s (« --auto-deconfigure » [tự động hủy cấu "
 "hình] sẽ giúp):\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: coi như gỡ bỏ %s để ủng hộ %s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s chưa cài đặt đúng : lờ đi điều nào phụ thuộc vào nó.\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: có thể gặp khó khăn trong việc gỡ bỏ %s, vì nó cung cấp %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
-msgstr "dpkg: gói %s yêu cầu cài đặt lại, nhưng sẽ vẫn gỡ bỏ theo yêu cầu bạn.\n"
+msgstr ""
+"dpkg: gói %s yêu cầu cài đặt lại, nhưng sẽ vẫn gỡ bỏ theo yêu cầu bạn.\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: gói %s yêu cầu cài đặt lại nên sẽ không gỡ bỏ.\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: có, sẽ gỡ bỏ %s để ủng hộ %s.\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
-msgstr "dpkg: về trường hợp %s chứa %s:\n"
+msgstr ""
+"dpkg: về trường hợp %s chứa %s:\n"
 "%s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "gói xung đột với nhau nên không cài đặt %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: cảnh báo : lờ đi trường hợp xung đột, vẫn có thể tiếp tục lại.\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive (đệ quy) cần ít nhất một tham số đường dẫn"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "lỗi thực hiện find (tìm) cho « --recursive » (đệ qui)"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "lỗi fdopen ống dẫn của find (tìm)"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "gặp lỗi khi đọc ống dẫn của find (tìm)"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "gặp lỗi khi đóng ống dẫn của find (tìm)"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, 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"
+msgstr ""
+"việc find (tìm) cho « --recursive » (đệ qui) trả lại lỗi không được quản lý %"
+"i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "đã tìm kiếm, nhưng không tìm thấy gói nào (tập tin khớp với *.deb)"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "« --%s » cần ít nhất một đối số kiểu tập tin kho lưu gói"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Đang chọn gói đã hủy chọn trước đây %s.\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Đang bỏ qua gói đã hủy chọn %s.\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Phiên bản %.250s của %.250s đã được cài đặt nên bỏ qua.\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
-msgstr "%s - cảnh báo : đang hạ thấp phiên bản của %.250s từ %.250s xuống %.250s.\n"
+msgstr ""
+"%s - cảnh báo : đang hạ thấp phiên bản của %.250s từ %.250s xuống %.250s.\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "Sẽ không hạ thấp phiên bản %.250s từ phiên bản %.250s xuống %.250s nên bỏ "
+msgstr ""
+"Sẽ không hạ thấp phiên bản %.250s từ phiên bản %.250s xuống %.250s nên bỏ "
 "qua.\n"
 
 #: src/cleanup.c:83
@@ -1210,7 +1231,8 @@ msgstr "Sẽ không hạ thấp phiên bản %.250s từ phiên bản %.250s xu
 msgid ""
 "unable to remove newly-installed version of `%.250s' to allow reinstallation "
 "of backup copy"
-msgstr "không thể gỡ bỏ phiên bản mới cài đặt của « %.250s » để cho phép cài đặt lại "
+msgstr ""
+"không thể gỡ bỏ phiên bản mới cài đặt của « %.250s » để cho phép cài đặt lại "
 "bản sao lưu"
 
 #: src/cleanup.c:90
@@ -1243,7 +1265,8 @@ msgstr "gói %.250s đã được cài đặt và cấu hình"
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
-msgstr "gói %.250s chưa sẵn sàng để cấu hình\n"
+msgstr ""
+"gói %.250s chưa sẵn sàng để cấu hình\n"
 " nên không thể cấu hình (trạng thái hiện thời « %.250s »)"
 
 #: src/configure.c:115
@@ -1251,7 +1274,8 @@ msgstr "gói %.250s chưa sẵn sàng để cấu hình\n"
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
-msgstr "dpkg: vấn đề quan hệ phụ thuộc ngăn cản việc cấu hình %s:\n"
+msgstr ""
+"dpkg: vấn đề quan hệ phụ thuộc ngăn cản việc cấu hình %s:\n"
 "%s"
 
 #: src/configure.c:118
@@ -1263,14 +1287,16 @@ msgstr "vấn đề quan hệ phụ thuộc - để nguyên chưa được cấu
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you request:\n"
 "%s"
-msgstr "dpkg: %s: vấn đề quan hệ phụ thuộc, nhưng vẫn cấu hình như bạn yêu cầu:\n"
+msgstr ""
+"dpkg: %s: vấn đề quan hệ phụ thuộc, nhưng vẫn cấu hình như bạn yêu cầu:\n"
 "%s"
 
 #: src/configure.c:130
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
-msgstr "Gói ở trong trạng thái hay thay đổi rất xấu - nên cài đặt\n"
+msgstr ""
+"Gói ở trong trạng thái hay thay đổi rất xấu - nên cài đặt\n"
 " lại trước khi thử cấu hình."
 
 #: src/configure.c:133
@@ -1281,13 +1307,14 @@ msgstr "Đang thiết lập %s (%s) ...\n"
 #: src/configure.c:180
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
-msgstr "không thể lấy các thông tin vê tập tin cấu hình bản phát hành mới « %.250s »"
+msgstr ""
+"không thể lấy các thông tin vê tập tin cấu hình bản phát hành mới « %.250s »"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
-msgstr "không thể lấy các thông tin vê tập tin cấu hình hiện thời được cài đặt « "
+msgstr ""
+"không thể lấy các thông tin vê tập tin cấu hình hiện thời được cài đặt « "
 "%.250s »"
 
 #: src/configure.c:199
@@ -1296,7 +1323,8 @@ msgid ""
 "\n"
 "Configuration file `%s', does not exist on system.\n"
 "Installing new config file as you request.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "Tập tin cấu hình « %s » không nằm trên hệ thống.\n"
 "Đang cài đặt tập tin cấu hình mới như bạn yêu cầu.\n"
 
@@ -1308,7 +1336,8 @@ 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
@@ -1345,7 +1374,8 @@ msgstr "không thể cài đặt « %.250s » như là « %.250s »"
 msgid ""
 "dpkg: %s: warning - unable to stat config file `%s'\n"
 " (= `%s'): %s\n"
-msgstr "dpkg: %s: cảnh báo — không thể lấy các thông tin về tập tin cấu hình « %s »\n"
+msgstr ""
+"dpkg: %s: cảnh báo — không thể lấy các thông tin về tập tin cấu hình « %s »\n"
 " (= `%s'): %s\n"
 
 #: src/configure.c:347
@@ -1353,7 +1383,8 @@ msgstr "dpkg: %s: cảnh báo — không thể lấy các thông tin về tập
 msgid ""
 "dpkg: %s: warning - config file `%s' is a circular link\n"
 " (= `%s')\n"
-msgstr "dpkg: %s: cảnh báo — tập tin cấu hình « %s » là một liên kết vòng tròn\n"
+msgstr ""
+"dpkg: %s: cảnh báo — tập tin cấu hình « %s » là một liên kết vòng tròn\n"
 " (= `%s')\n"
 
 #: src/configure.c:360
@@ -1361,7 +1392,8 @@ msgstr "dpkg: %s: cảnh báo — tập tin cấu hình « %s » là một liên
 msgid ""
 "dpkg: %s: warning - unable to readlink conffile `%s'\n"
 " (= `%s'): %s\n"
-msgstr "dpkg: %s: cảnh báo — không thể readlink (thêm liên kết lại) tập tin cấu hình "
+msgstr ""
+"dpkg: %s: cảnh báo — không thể readlink (thêm liên kết lại) tập tin cấu hình "
 "« %s »\n"
 " (= `%s'): %s\n"
 
@@ -1370,7 +1402,8 @@ msgstr "dpkg: %s: cảnh báo — không thể readlink (thêm liên kết lại
 msgid ""
 "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
 " (`%s' is a symlink to `%s')\n"
-msgstr "dpkg: %s: cảnh báo — tập tin cấu hình « %.250s » trở thành tên tập tin thoái "
+msgstr ""
+"dpkg: %s: cảnh báo — tập tin cấu hình « %.250s » trở thành tên tập tin thoái "
 "hoá\n"
 " (« %s » là liên kết tượng trưng tới « %s »)\n"
 
@@ -1379,7 +1412,8 @@ msgstr "dpkg: %s: cảnh báo — tập tin cấu hình « %.250s » trở thàn
 msgid ""
 "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
 "s')\n"
-msgstr "dpkg: %s: cảnh báo — tập tin cấu hình « %.250s » không phải là tập tin chuẩn "
+msgstr ""
+"dpkg: %s: cảnh báo — tập tin cấu hình « %.250s » không phải là tập tin chuẩn "
 "hay liên kết tượng trưng (= `%s')\n"
 
 # Name: don't translate/Tên: đừng dịch
@@ -1395,7 +1429,8 @@ msgstr "dpkg: %s: cảnh báo — không thể mở tập tin cấu hình %s cho
 #: src/configure.c:435
 #, c-format
 msgid "unable to change ownership of new dist conffile `%.250s'"
-msgstr "không thể thay đổi quyền sở hữu tập tin cấu hình phát hành mới « %.250s »"
+msgstr ""
+"không thể thay đổi quyền sở hữu tập tin cấu hình phát hành mới « %.250s »"
 
 #: src/configure.c:438
 #, c-format
@@ -1407,8 +1442,7 @@ msgstr "không thể đặt chế độ của tập tin cấu hình phát hành
 msgid "failed to run %s (%.250s)"
 msgstr "lỗi chạy %s (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "lỗi chờ trình bao"
 
@@ -1430,7 +1464,8 @@ msgstr "Đừng quên đưa tiến trình này lên trước (« fg ») khi hoà
 msgid ""
 "\n"
 "Configuration file `%s'"
-msgstr "\n"
+msgstr ""
+"\n"
 "Tập tin cấu hình « %s »"
 
 #: src/configure.c:563
@@ -1444,7 +1479,8 @@ msgid ""
 "\n"
 " ==> File on system created by you or by a script.\n"
 " ==> File also in package provided by package maintainer.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 " ==> Tập tin trên hệ thống tạo bởi người dùng hoặc bởi một văn lệnh.\n"
 " ==> Tập tin cũng nằm trong gói cung cấp bởi nhà duy trì gói.\n"
 
@@ -1453,7 +1489,8 @@ msgstr "\n"
 msgid ""
 "\n"
 "     Not modified since installation.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "     Chưa sửa đổi kể từ lúc cài đặt.\n"
 
 #: src/configure.c:574
@@ -1461,7 +1498,8 @@ msgstr "\n"
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 " ==> Đã sửa đổi (bởi người dùng hay văn lệnh) kể từ lúc cài đặt.\n"
 
 #: src/configure.c:575
@@ -1469,7 +1507,8 @@ msgstr "\n"
 msgid ""
 "\n"
 " ==> Deleted (by you or by a script) since installation.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 " ==> Đã xoá (bởi bạn hay văn lệnh) kể từ lúc cài đặt.\n"
 
 #: src/configure.c:578
@@ -1510,7 +1549,8 @@ msgid ""
 "    N or O  : keep your currently-installed version\n"
 "      D     : show the differences between the versions\n"
 "      Z     : background this process to examine the situation\n"
-msgstr "   Hãy chọn thao tác bạn muốn thực hiện. Tùy chọn là:\n"
+msgstr ""
+"   Hãy chọn thao tác bạn muốn thực hiện. Tùy chọn là:\n"
 "    Y hay I  : cài đặt phiên bản của nhà duy trì gói\n"
 "    N hay O  : giữ phiên bản hiện thời được cài đặt\n"
 "      D     : hiển thị sự khác nhau giữa hai phiên bản\n"
@@ -1540,7 +1580,8 @@ msgstr "[không có giá trị mặc định]"
 
 #: src/configure.c:631
 msgid "error writing to stderr, discovered before conffile prompt"
-msgstr "gặp lỗi khi ghi ra thiết bị lỗi chuẩn, phát hiện trước khi xem dấu nhắc tập "
+msgstr ""
+"gặp lỗi khi ghi ra thiết bị lỗi chuẩn, phát hiện trước khi xem dấu nhắc tập "
 "tin cấu hình"
 
 #: src/configure.c:638
@@ -1549,125 +1590,130 @@ msgstr "lỗi đọc trên thiết bị nhập chuẩn ở dấu nhắc tập ti
 
 #: src/configure.c:639
 msgid "EOF on stdin at conffile prompt"
-msgstr "gặp kết thúc tập tin trên thiết bị nhập chuẩn ở dấu nhắc tập tin cấu hình"
+msgstr ""
+"gặp kết thúc tập tin trên thiết bị nhập chuẩn ở dấu nhắc tập tin cấu hình"
 
 #: src/depcon.c:77
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "không thể kiểm tra sự tồn tại của « %.250s »"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " phụ thuộc vào "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " phụ thuộc sẵn vào "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " khuyên "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " đề nghị "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " ngắt "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " xung đột với "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " đề nghị "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " tăng cường "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s sẽ bị gỡ bỏ.\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s sẽ bị hủy cấu hình.\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s sẽ được cài đặt, nhưng là phiên bản %.250s.\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s hiện thời được cài đặt, nhưng là phiên bản %.250s.\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s đã được mở gói, nhưng chưa lần nào được cấu hình.\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s đã được mở gói, nhưng là phiên bản %.250s.\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s phiên bản được cấu hình mới nhất là %.250s.\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s là %s.\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s cung cấp %.250s nhưng sẽ bị gỡ bỏ.\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s cung cấp %.250s nhưng sẽ bị huỷ cấu hình.\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s cung cấp %.250s nhưng là %s.\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s không hiện thời được cài đặt.\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (phiên bản %.250s) sẽ được cài đặt.\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (phiên bản %.250s) là %s.\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s cung cấp %.250s và sẽ được cài đặt.\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s cung cấp %.250s và là %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(không có mô tả)"
 
@@ -1676,7 +1722,8 @@ msgid ""
 "The following packages are in a mess due to serious problems during\n"
 "installation.  They must be reinstalled for them (and any packages\n"
 "that depend on them) to function properly:\n"
-msgstr "Những gói sau ở trong tình trạng hỗn loạn do vấn đề nghiệm trọng\n"
+msgstr ""
+"Những gói sau ở trong tình trạng hỗn loạn do vấn đề nghiệm trọng\n"
 "trong tiến trình cài đặt. Các gói này phải được cài đặt lại để chúng\n"
 "(và tất cả những gói phụ thuộc vào chúng) hoạt động được:\n"
 
@@ -1685,7 +1732,8 @@ msgid ""
 "The following packages have been unpacked but not yet configured.\n"
 "They must be configured using dpkg --configure or the configure\n"
 "menu option in dselect for them to work:\n"
-msgstr "Những gói sau đã được mở gói nhưng chưa được cấu hình.\n"
+msgstr ""
+"Những gói sau đã được mở gói nhưng chưa được cấu hình.\n"
 "Các gói này phải được cấu hình bằng lệnh « dpkg --configure »\n"
 "hoặc tùy chọn trình đơn « cấu hình » trong dselect,\n"
 "để chúng hoạt động được:\n"
@@ -1695,7 +1743,8 @@ msgid ""
 "The following packages are only half configured, probably due to problems\n"
 "configuring them the first time.  The configuration should be retried using\n"
 "dpkg --configure <package> or the configure menu option in dselect:\n"
-msgstr "Những gói sau chỉ được cấu hình một nửa, có thể do vấn đề khi cấu hình\n"
+msgstr ""
+"Những gói sau chỉ được cấu hình một nửa, có thể do vấn đề khi cấu hình\n"
 "chúng lần thứ nhất. Việc cấu hình nên được thử lại bằng lệnh\n"
 "« dpkg --configure <tên_gói> »\n"
 "hoặc tùy chọn trình đơn « cấu hình » trong dselect:\n"
@@ -1705,7 +1754,8 @@ msgid ""
 "The following packages are only half installed, due to problems during\n"
 "installation.  The installation can probably be completed by retrying it;\n"
 "the packages can be removed using dselect or dpkg --remove:\n"
-msgstr "Những gói sau chỉ được cài đặt một nửa, do vấn đề trong tiến trình cài đặt.\n"
+msgstr ""
+"Những gói sau chỉ được cài đặt một nửa, do vấn đề trong tiến trình cài đặt.\n"
 "Rất có thể thử lại chạy xong tiến trình cài đặt; có thể gỡ bỏ các gói\n"
 "bằng dselect hay lệnh « dpkg --remove »:\n"
 
@@ -1740,14 +1790,16 @@ msgstr "« --assert-* » (khẳng định) không chấp nhận đối số"
 msgid ""
 "Version of dpkg with working epoch support not yet configured.\n"
 " Please use `dpkg --configure dpkg', and then try again.\n"
-msgstr "Chưa cấu hình phiên bản của dpkg hỗ trợ kỷ nguyên hoạt động.\n"
+msgstr ""
+"Chưa cấu hình phiên bản của dpkg hỗ trợ kỷ nguyên hoạt động.\n"
 " Xin hãy dùng lệnh cấu hình  « dpkg --configure dpkg »,\n"
 "và thử lại lần nữa.\n"
 
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg chưa được ghi nhận là đã cài đặt nên không thể kiểm tra hỗ trợ kỷ "
+msgstr ""
+"dpkg chưa được ghi nhận là đã cài đặt nên không thể kiểm tra hỗ trợ kỷ "
 "nguyên.\n"
 
 #: src/enquiry.c:307
@@ -1759,13 +1811,15 @@ msgstr "« --predep-package » (gói phụ thuộc sẵn) không chấp nhận 
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
-msgstr "dpkg: không biết cách thoả mãn quan hệ phụ thuộc sẵn:\n"
+msgstr ""
+"dpkg: không biết cách thoả mãn quan hệ phụ thuộc sẵn:\n"
 " %s\n"
 
 #: src/enquiry.c:360
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "không thể thoả mãn các quan hệ phụ thuộc sẵn cho %.250s (cần do %.250s)"
+msgstr ""
+"không thể thoả mãn các quan hệ phụ thuộc sẵn cho %.250s (cần do %.250s)"
 
 #: src/enquiry.c:377
 msgid "--print-architecture does not take any argument"
@@ -1774,15 +1828,15 @@ msgstr "« --print-architecture » (in ra kiến trúc) không chấp nhận đ
 #: src/enquiry.c:419
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "« --compare-versions » (so sánh phiên bản) chấp nhận ba đối số: <version> "
+msgstr ""
+"« --compare-versions » (so sánh phiên bản) chấp nhận ba đối số: <version> "
 "(phiên bản 1) <relation> (quan hệ) và <version> (phiên bản 2)"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "« --compare-versions » (so sánh phiên bản) có quan hệ sai"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: phiên bản « %s » có cú pháp sai: %s\n"
@@ -1792,13 +1846,15 @@ msgstr "dpkg: phiên bản « %s » có cú pháp sai: %s\n"
 msgid ""
 "%s: error processing %s (--%s):\n"
 " %s\n"
-msgstr "%s: lỗi xử lý %s (--%s):\n"
+msgstr ""
+"%s: lỗi xử lý %s (--%s):\n"
 " %s\n"
 
 #: src/errors.c:81
 msgid ""
 "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: lỗi cấp phát bộ nhớ cho mục nhập mới trong danh sách những gói không "
+msgstr ""
+"dpkg: lỗi cấp phát bộ nhớ cho mục nhập mới trong danh sách những gói không "
 "thành công."
 
 #: src/errors.c:91
@@ -1823,14 +1879,16 @@ msgstr "Gói %s bị giữ lại, vẫn xử lý nó như bạn yêu cầu.\n"
 #, c-format
 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ữ "
+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"
 
 #: src/errors.c:125
 msgid ""
 "dpkg - warning, overriding problem because --force enabled:\n"
 " "
-msgstr "dpkg — cảnh báo, có vấn đề đè vì « --force » (buộc) đã bật:\n"
+msgstr ""
+"dpkg — cảnh báo, có vấn đề đè vì « --force » (buộc) đã bật:\n"
 " "
 
 #: src/filesdb.c:123
@@ -1843,7 +1901,8 @@ msgstr "không thể mở tập tin liệt kê nội dung gói « %.250s »"
 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 », "
+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"
 
 #: src/filesdb.c:145
@@ -1940,7 +1999,8 @@ msgstr "fgets đưa ra một chuỗi rỗng từ diversions (sự trệch đi) [
 
 #: src/filesdb.c:475
 msgid "diversions file has too-long line or EOF [i]"
-msgstr "tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin [i]"
+msgstr ""
+"tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin [i]"
 
 #: src/filesdb.c:481
 msgid "read error in diversions [ii]"
@@ -1954,10 +2014,10 @@ msgstr "gặp kết thúc tập tin bất ngờ trong diversions (sự trệch 
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets đưa ra một chuỗi rỗng từ diversions (sự trệch đi) [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
-msgstr "tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin [ii]"
+msgstr ""
+"tập tin diversions (sự trệch đi) có dòng quá dài hoặc kết thúc tập tin [ii]"
 
 #: src/filesdb.c:492
 msgid "read error in diversions [iii]"
@@ -2018,7 +2078,8 @@ msgstr "dpkg: không tìm thấy « %s » trong PATH (đường dẫn).\n"
 msgid ""
 "%d expected program(s) not found on PATH.\n"
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
-msgstr "không tìm thấy %d chương trình mong đợi trong PATH (đường dẫn).\n"
+msgstr ""
+"không tìm thấy %d chương trình mong đợi trong PATH (đường dẫn).\n"
 "NB: PATH của người chủ thường chứa « /usr/local/sbin », « /usr/sbin » và « /"
 "sbin »."
 
@@ -2047,9 +2108,7 @@ msgstr "không thể đặt quyền thực hiện cho « %.250s »"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "không thể lấy các thông tin về văn lệnh %s đã cài đặt « %.250s »"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "không thể thực hiện %s"
@@ -2106,8 +2165,7 @@ msgstr "hủy liên kết"
 msgid "chmod"
 msgstr "chmod (chuyển đổi chế độ)"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "xoá"
 
@@ -2116,8 +2174,7 @@ msgstr "xoá"
 msgid "failed to %s `%%.255s'"
 msgstr "lỗi %s « %%.255s »"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "lỗi thực hiện rm (gỡ bỏ) để dọn dẹp"
 
@@ -2126,29 +2183,25 @@ msgstr "lỗi thực hiện rm (gỡ bỏ) để dọn dẹp"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Chương trình quản lý gói Debian « %s », phiên bản %s.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
 "See %s --license for copyright and license details.\n"
-msgstr "Đây là phần mềm tự do, xem Giấy Phép Công Cộng GNU (GPL)\n"
+msgstr ""
+"Đây là phần mềm tự do, xem Giấy Phép Công Cộng GNU (GPL)\n"
 "phiên bản 2 hoặc mới hơn để biết điều kiện sao chép.\n"
 "KHÔNG có bảo hành gì cả.\n"
 "Xem « %s --license » để biết chi tiết bản quyền và giấy phép.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "\n"
 
 #: src/main.c:61
@@ -2179,7 +2232,8 @@ msgid ""
 "  --force-help                     Show help on forcing.\n"
 "  -Dh|--debug=help                 Show help on debugging.\n"
 "\n"
-msgstr " Lệnh:\n"
+msgstr ""
+" Lệnh:\n"
 "   -i|--install       <tên tập tin .deb> ... | -R|--recursive <thư mục> ...\n"
 " \t(cài đặt) ... (đệ qui)\n"
 "   --unpack           <tên tập tin .deb> ... | -R|--recursive <thư mục> ...\n"
@@ -2239,17 +2293,15 @@ msgstr " Lệnh:\n"
 "\t(gỡ lỗi trợ giúp)\n"
 " \n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
 "  --version                        Show the version.\n"
 "  --license|--licence              Show the copyright licensing terms.\n"
 "\n"
-msgstr "  -h|--help\t\t\t\tHiện trợ giúp này\n"
+msgstr ""
+"  -h|--help\t\t\t\tHiện trợ giúp này\n"
 " \t(trợ giúp_\n"
 "   --version                        \tHiện số thứ tự phiên bản\n"
 " \t(phiên bản)\n"
@@ -2263,7 +2315,8 @@ msgid ""
 "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help).\n"
 "\n"
-msgstr " Để sử dụng với kho lưu (lệnh): dpkg\n"
+msgstr ""
+" Để sử dụng với kho lưu (lệnh): dpkg\n"
 "   -b|--build\t\txây dựng\n"
 "   -c|--contents\tnội dung\n"
 "   -e|--control\t\tđiều khiển\n"
@@ -2281,7 +2334,8 @@ msgid ""
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
 "  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep.\n"
 "\n"
-msgstr " Để sử dụng nội bộ (lệnh): dpkg\n"
+msgstr ""
+" Để sử dụng nội bộ (lệnh): dpkg\n"
 "   --assert-support-predepends\t\tkhẳng định hỗ trợ phụ thuộc sẵn\n"
 "   --predep-package\t\t\t\tphụ thuộc sẵn gói\n"
 "   --assert-working-epoch\t\t\tkhẳng định kỷ nguyên hoạt động\n"
@@ -2318,7 +2372,8 @@ msgid ""
 "                             Stop when problems encountered.\n"
 "  --abort-after <n>          Abort after encountering <n> errors.\n"
 "\n"
-msgstr " Tùy chọn:\n"
+msgstr ""
+" Tùy chọn:\n"
 "   --admindir=<thư_mục>     Đặt thư mục quản trị là <thư_mục> thay cho %s.\n"
 " \t(thư mục quản trị)\n"
 "   --root=<thư_mục>         \tCài đặt vào thư mục gốc khác.\n"
@@ -2373,7 +2428,8 @@ msgid ""
 "  < << <= = >= >> >       (only for compatibility with control file "
 "syntax).\n"
 "\n"
-msgstr " Toán tử so sánh cho tùy chọn « --compare-versions » (so sánh hai phiên "
+msgstr ""
+" Toán tử so sánh cho tùy chọn « --compare-versions » (so sánh hai phiên "
 "bản):\n"
 "   lt le eq ne ge gt       (xử lý phiên bản rỗng là cũ hơn bất kỳ phiên  "
 "bản);\n"
@@ -2386,7 +2442,8 @@ msgstr " Toán tử so sánh cho tùy chọn « --compare-versions » (so sánh
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Khuyên bạn sử dụng « dselect » hay « aptitude »\n"
+msgstr ""
+"Khuyên bạn sử dụng « dselect » hay « aptitude »\n"
 " \tđể quản lý gói một cách thân thiện với người dùng.\n"
 
 #: src/main.c:141
@@ -2401,7 +2458,8 @@ msgid ""
 "\n"
 "Options marked [*] produce a lot of output - pipe it through `less' or "
 "`more' !"
-msgstr "Khuyên bạn sử dụng « dselect » hay « aptitude »\n"
+msgstr ""
+"Khuyên bạn sử dụng « dselect » hay « aptitude »\n"
 " \tđể quản lý gói một cách thân thiện với người dùng.\n"
 "Gõ :\n"
 "dpkg --help \t\t\tđể xem _trợ giúp_ về việc cài đặt và gỡ bỏ gói [*];\n"
@@ -2413,10 +2471,7 @@ msgstr "Khuyên bạn sử dụng « dselect » hay « aptitude »\n"
 "Tùy chọn có dấu sao [*] cho ra kết xuất rất nhiều —\n"
 "hãy gởi hết qua ống dẫn tới chương trình « less » hoặc « more »."
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "hành động xung đột « -%c (--%s) » và « -%c  (--%s) »"
@@ -2445,7 +2500,8 @@ msgid ""
 "\n"
 "Debugging options are be mixed using bitwise-or.\n"
 "Note that the meanings and values are subject to change.\n"
-msgstr "Tùy chọn gỡ lỗi %s, « --debug=<bát_phân> » hay « -D<bát_phân> »:\n"
+msgstr ""
+"Tùy chọn gỡ lỗi %s, « --debug=<bát_phân> » hay « -D<bát_phân> »:\n"
 "\n"
 "   số    tham chiếu trong nguồn  \t\tmô tả\n"
 "      1   general           \t\t\tThông tin tiến hành hữu ích _chung_\n"
@@ -2474,7 +2530,8 @@ msgstr "« --debug » (gỡ lỗi) cần một đối số kiểu bát phân"
 #: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
-msgstr "gặp tên gói vô giá trị trong danh sách định giới bằng dấu phẩy « --ignore-"
+msgstr ""
+"gặp tên gói vô giá trị trong danh sách định giới bằng dấu phẩy « --ignore-"
 "depends » (lờ đi các quan hệ phụ thuộc) « %.250s »"
 
 #: src/main.c:271
@@ -2482,8 +2539,7 @@ msgstr "gặp tên gói vô giá trị trong danh sách định giới bằng d
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "« --ignore-depends » cần một tên gói hợp lệ. « %.250s » không phải; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "số nguyên không hợp lệ cho « --%s »: « %.250s »"
@@ -2526,7 +2582,8 @@ msgid ""
 "\n"
 "WARNING - use of options marked [!] can seriously damage your installation.\n"
 "Forcing options marked [*] are enabled by default.\n"
-msgstr "Tuỳ chọn ép buộc %s — điều khiển ứng xử khi gặp khó khăn:\n"
+msgstr ""
+"Tuỳ chọn ép buộc %s — điều khiển ứng xử khi gặp khó khăn:\n"
 "  --force-<điều>,<điều>,...\t\t\tcảnh báo nhưng vẫn tiếp tục\n"
 "\t\t(ép buộc)\n"
 "  --refuse-<điều>,<điều>,... | --no-force-<điều>,...     dừng với lỗi\n"
@@ -2600,16 +2657,15 @@ msgstr "tùy chọn ép buộc/từ chối không rõ « %.*s »"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Cảnh báo: tùy chọn ép buộc/từ chối cũ « %s »\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
-msgstr "không thể malloc (cấp phát bộ nhớ) trong execbackend (thực hiện hậu phương)"
+msgstr ""
+"không thể malloc (cấp phát bộ nhớ) trong execbackend (thực hiện hậu phương)"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
-msgstr "không thể strdup (sao lại chuỗi) trong execbackend (thực hiện hbậu phương)"
+msgstr ""
+"không thể strdup (sao lại chuỗi) trong execbackend (thực hiện hbậu phương)"
 
 #: src/main.c:523
 #, c-format
@@ -2618,7 +2674,8 @@ msgstr "lỗi thực hiện %s"
 
 #: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
-msgstr "« --command-fd » (lệnh mô tả tập tin) chấp nhận một đối số (không phải 0)"
+msgstr ""
+"« --command-fd » (lệnh mô tả tập tin) chấp nhận một đối số (không phải 0)"
 
 #: src/main.c:540
 msgid "--command-fd only takes one argument"
@@ -2638,10 +2695,7 @@ msgstr "không thể mở « %i » cho luồng"
 msgid "unexpected eof before end of line %d"
 msgstr "gặp kết thúc tập tin bất ngờ trước kết thúc dòng %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "cần một tùy chọn hành động"
@@ -2651,8 +2705,7 @@ msgstr "cần một tùy chọn hành động"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "« --%s --pending » (hoãn) không chấp nhận đối số khác tùy chọn"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "« --%s » cần ít nhất một đối số kiểu tên gói"
@@ -2661,7 +2714,8 @@ msgstr "« --%s » cần ít nhất một đối số kiểu tên gói"
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
-msgstr "bạn phải ghi rõ mỗi gói bằng tên riêng của nó, không phải bằng tên của tập "
+msgstr ""
+"bạn phải ghi rõ mỗi gói bằng tên riêng của nó, không phải bằng tên của tập "
 "tin .deb chứa nó"
 
 #: src/packages.c:150
@@ -2674,7 +2728,8 @@ msgstr "Gói %s được liệt kê nhiều lần nên chỉ xử lý một lầ
 msgid ""
 "More than one copy of package %s has been unpacked\n"
 " in this run !  Only configuring it once.\n"
-msgstr "Nhiều bản sao của gói %s đã được mở gói\n"
+msgstr ""
+"Nhiều bản sao của gói %s đã được mở gói\n"
 "trong lần chạy này. Chỉ cấu hình nó một lần.\n"
 
 #: src/packages.c:269
@@ -2717,6 +2772,10 @@ msgstr "  Chưa cài đặt gói %s mà cung cấp %s.\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  Chưa cài đặt gói %s.\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " phụ thuộc vào "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "; tuy nhiên:\n"
@@ -2732,7 +2791,8 @@ msgstr "gặp lỗi khi bảo đảm « %.250s » không tồn tại"
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "lỗi thực hiện « dpkg-split » (chia tách) để xem nếu nó là một phần của điều "
+msgstr ""
+"lỗi thực hiện « dpkg-split » (chia tách) để xem nếu nó là một phần của điều "
 "đa phần"
 
 #: src/processarc.c:120
@@ -2750,7 +2810,8 @@ msgstr "Đang xác thực %s ...\n"
 
 #: src/processarc.c:146
 msgid "failed to execl debsig-verify"
-msgstr "lỗi execl (thực hiện rồi chấm dứt) « debsig-verify » (thẩm tra chữ ký Debian)"
+msgstr ""
+"lỗi execl (thực hiện rồi chấm dứt) « debsig-verify » (thẩm tra chữ ký Debian)"
 
 #: src/processarc.c:152
 #, c-format
@@ -2762,7 +2823,8 @@ msgstr "Lỗi thẩm tra gói %s."
 msgid ""
 "Verification on package %s failed,\n"
 "but installing anyway as you request.\n"
-msgstr "Lỗi thẩm tra gói %s,\n"
+msgstr ""
+"Lỗi thẩm tra gói %s,\n"
 "nhưng vẫn đang cài đặt như bạn yêu cầu.\n"
 
 #: src/processarc.c:157
@@ -2793,7 +2855,8 @@ msgstr "kiến trúc gói (%s) không khớp với hệ thống (%s)"
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 " package uses Breaks; not supported in this dpkg\n"
-msgstr "dpkg: về %s chứa %s:\n"
+msgstr ""
+"dpkg: về %s chứa %s:\n"
 " gói sử dụng Ngắt; không được hỗ trơ trong dpkg này\n"
 
 #: src/processarc.c:260
@@ -2811,7 +2874,8 @@ msgstr "dpkg: cảnh báo — đang lờ đi Ngắt.\n"
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
-msgstr "dpkg: về %s chứa %s, vấn đề quan hệ phụ thuộc sẵn:\n"
+msgstr ""
+"dpkg: về %s chứa %s, vấn đề quan hệ phụ thuộc sẵn:\n"
 "%s"
 
 #: src/processarc.c:278
@@ -2883,7 +2947,8 @@ msgstr "dpkg-deb: sửa các số không đi sau có thể"
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: cảnh báo — không thể lấy các thông tin về tập tin cũ « %.250s » nên "
+msgstr ""
+"dpkg: cảnh báo — không thể lấy các thông tin về tập tin cũ « %.250s » nên "
 "không xoá nó : %s"
 
 #: src/processarc.c:629
@@ -2896,7 +2961,8 @@ msgstr "dpkg: cảnh báo — không thể xóa thư mục cũ « %.250s »: %s\
 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ì đã "
+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"
 
 #: src/processarc.c:663
@@ -2905,11 +2971,12 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "không thể lấy các thông tin về tập tin mới khác « %.250s »"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
-msgstr "dpkg: cảnh báo — tập tin cũ « %.250s » là cùng một tập tin với vài tập tin "
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: cảnh báo — tập tin cũ « %.250s » là cùng một tập tin với vài tập tin "
 "mới (cả « %.250s » lẫn « %.250s » đều)."
 
 #: src/processarc.c:715
@@ -2917,16 +2984,15 @@ msgstr "dpkg: cảnh báo — tập tin cũ « %.250s » là cùng một tập t
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: cảnh báo — không thể %s tập tin cũ « %%.250s »: %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "không thể đọc thư mục thông tin"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "phiên bản cũ của gói có tên tập tin thông tin quá dài bắt đầu « %.250s »"
+msgstr ""
+"phiên bản cũ của gói có tên tập tin thông tin quá dài bắt đầu « %.250s »"
 
 #: src/processarc.c:766
 #, c-format
@@ -2955,7 +3021,8 @@ msgstr "thông tin điều khiển gói chứa thư mục « %.250s »"
 #: src/processarc.c:792
 #, 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 » "
+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 »"
 
 #: src/processarc.c:798
@@ -2984,7 +3051,8 @@ msgid ""
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
 "|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
 "uppercase=bad)\n"
-msgstr "Đã muốn=Không rõ/Cài đặt/Gỡ bỏ/Tẩy/Giữ lại\n"
+msgstr ""
+"Đã muốn=Không rõ/Cài đặt/Gỡ bỏ/Tẩy/Giữ lại\n"
 "| Trạng thái=Không/Đã cài đặt/Tập tin cấu hình/Đã mở gói/Lỗi cấu hình/Nửa "
 "cài đăt\n"
 "|/ Lỗi?=(không có)/Giữ lại/Cần cài đặt lại/X=cả hai vấn đề (Trạng thái,Lỗi: "
@@ -3002,9 +3070,7 @@ msgstr "Phiên bản"
 msgid "Description"
 msgstr "Mô tả"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Không tìm thấy gói khớp vơi %s.\n"
@@ -3075,7 +3141,8 @@ msgstr "bị trệch bởi %s tới : %s\n"
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
-msgstr "Dùng lệnh:\n"
+msgstr ""
+"Dùng lệnh:\n"
 "« dpkg --info » (= « dpkg-deb --info »)\n"
 "\t\tđể kiểm tra xem các tập tin kho lưu,\n"
 "và\n"
@@ -3098,7 +3165,8 @@ msgid ""
 "  -W|--show <pattern> ...          Show information on package(s).\n"
 "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
 "\n"
-msgstr "Lệnh:\n"
+msgstr ""
+"Lệnh:\n"
 "  -s|--status <tên_gói> ...      \t\tHiện chi tiết về trạng thái gói\n"
 "\t(trạng thái)\n"
 "  -p|--print-avail <tên_gói> ...\t    Hiện chi tiết về phiên bản sẵn sàng\n"
@@ -3121,15 +3189,15 @@ msgid ""
 "  --admindir=<directory>           Use <directory> instead of %s.\n"
 "  -f|--showformat=<format>         Use alternative format for --show.\n"
 "\n"
-msgstr "Tùy chọn:\n"
+msgstr ""
+"Tùy chọn:\n"
 "  --admindir=<thư_mục>     Dùng <thư_mục> thay cho %s\n"
 "\t(thư mục quản trị)\n"
 "  --showformat=<định_dạng>      Dùng định dạng xen kẽ cho « --show »\n"
 "\t\t(hiện định dạng)\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3141,7 +3209,8 @@ msgid ""
 "  syntax. Fields will be right-aligned unless the width is negative in "
 "which\n"
 "  case left alignment will be used.\n"
-msgstr "Cú pháp định dạng:\n"
+msgstr ""
+"Cú pháp định dạng:\n"
 "  Định dạng là chuỗi sẽ được xuất cho mỗi gói.\n"
 "  Định dạng có thể gồm các dãy thoát chuẩn:\n"
 "\t\\n\t\tdòng mới\n"
@@ -3157,7 +3226,8 @@ msgid ""
 "Use --help for help about querying packages;\n"
 "Use --license for copyright license and lack of warranty (GNU GPL).\n"
 "\n"
-msgstr "Dùng:\n"
+msgstr ""
+"Dùng:\n"
 "\t\t--help \t\t\tđể xem trợ giúp về việc truy vấn các gói;\n"
 "\t(trợ giúp)\n"
 "\t\t--license \t\tđể xem thông tin về giấy phép (GNU GPL).\n"
@@ -3177,7 +3247,8 @@ msgstr "dpkg — cảnh báo : đang lờ đi yêu cầu gỡ bỏ gói chưa c
 msgid ""
 "dpkg - warning: ignoring request to remove %.250s, only the config\n"
 " files of which are on the system.  Use --purge to remove them too.\n"
-msgstr "dpkg — cảnh báo : đang lờ đi yêu cầu gỡ bỏ gói %.250s,\n"
+msgstr ""
+"dpkg — cảnh báo : đang lờ đi yêu cầu gỡ bỏ gói %.250s,\n"
 "chỉ có những tập tin cấu hình trên hệ thống.\n"
 "Dùng « --purge » (tẩy) cũng để gỡ bỏ chúng.\n"
 
@@ -3190,7 +3261,8 @@ msgstr "Đây là một gói cốt yếu — đừng gỡ bỏ nó."
 msgid ""
 "dpkg: dependency problems prevent removal of %s:\n"
 "%s"
-msgstr "dpkg: vấn đề quan hệ phụ thuộc ngăn cản việc gỡ bỏ %s:\n"
+msgstr ""
+"dpkg: vấn đề quan hệ phụ thuộc ngăn cản việc gỡ bỏ %s:\n"
 "%s"
 
 #: src/remove.c:137
@@ -3202,14 +3274,16 @@ msgstr "gặp vấn đề quan hệ phụ thuộc nên không gỡ bỏ"
 msgid ""
 "dpkg: %s: dependency problems, but removing anyway as you request:\n"
 "%s"
-msgstr "dpkg: %s: vấn đề quan hệ phụ thuộc, nhưng vẫn gỡ bỏ như bạn yêu cầu :\n"
+msgstr ""
+"dpkg: %s: vấn đề quan hệ phụ thuộc, nhưng vẫn gỡ bỏ như bạn yêu cầu :\n"
 "%s"
 
 #: src/remove.c:149
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting a removal."
-msgstr "Gói ở trong tình trạng rất không ổn định.\n"
+msgstr ""
+"Gói ở trong tình trạng rất không ổn định.\n"
 "Khuyên bạn cài đặt lại nó trước khi thử gỡ bỏ nó."
 
 #: src/remove.c:156
@@ -3222,17 +3296,16 @@ msgstr "Nên gỡ bỏ hoặc tẩy %s ...\n"
 msgid "Removing %s ...\n"
 msgstr "Đang gỡ bỏ %s ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
 msgid ""
 "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
 "s - directory may be a mount point ?\n"
-msgstr "dpkg — cảnh báo : trong khi gỡ bỏ %.250s, không thể gỡ bỏ thư mục « %.250s "
+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"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "không thể gỡ bỏ « %.250s »"
@@ -3252,7 +3325,8 @@ msgstr "không thể xóa tập tin thông tin điều khiển « %.250s »"
 msgid ""
 "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
 "removed.\n"
-msgstr "dpkg — cảnh báo : trong khi gỡ bỏ %.250s, thư mục « %.250s » không rỗng nên "
+msgstr ""
+"dpkg — cảnh báo : trong khi gỡ bỏ %.250s, thư mục « %.250s » không rỗng nên "
 "không được gỡ bỏ.\n"
 
 #: src/remove.c:404
@@ -3273,7 +3347,8 @@ msgstr "không thể đọc thư mục tập tin cấu hình « %.250s » (từ
 #: src/remove.c:504
 #, 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:540
 #, c-format
@@ -3347,11 +3422,13 @@ msgstr "« --%s » cần chính xác một đối số kiểu tập tin Packages
 
 #: src/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
-msgstr "không thể truy cập vùng trạng thái dpkg cho việc cập nhật sẵn sàng hàng loạt"
+msgstr ""
+"không thể truy cập vùng trạng thái dpkg cho việc cập nhật sẵn sàng hàng loạt"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "việc cập nhật sẵn sàng hàng loạt cần thiết quyền ghi vào vùng trạng thái dpkg"
+msgstr ""
+"việc cập nhật sẵn sàng hàng loạt cần thiết quyền ghi vào vùng trạng thái dpkg"
 
 #: src/update.c:66
 #, c-format
@@ -3370,217 +3447,224 @@ msgstr "Thông tin về %d gói đã được cập nhật.\n"
 
 #: src/update.c:101
 msgid "--forget-old-unavail takes no arguments"
-msgstr "« --forget-old-unavail » (quên cũ không sẵn sàng) không chấp nhận đối số"
+msgstr ""
+"« --forget-old-unavail » (quên cũ không sẵn sàng) không chấp nhận đối số"
 
 #: dpkg-deb/build.c:67
 #, c-format
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - lỗi: %s (« %s ») không chứa chữ số nào\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "« --build » (xây dựng) cần đối số kiểu thư mục"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "« --build » (xây dựng) chấp nhận nhiều nhất hai đối số"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "không thể kiểm tra sự tồn tại của kho lưu « %.250s »"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "đích là thư mục — không thể bỏ qua việc kiểm tra tập tin điều khiển"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
-msgstr "dpkg-deb: cảnh báo, không kiểm tra nội dung của vùng điều khiển.\n"
+msgstr ""
+"dpkg-deb: cảnh báo, không kiểm tra nội dung của vùng điều khiển.\n"
 "dpkg-deb: đang xây dựng một gói không rõ trong « %s ».\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "tên gói chứa ký tự không phải chữ cái, chữ số viết thường hoặc dấu cộng, dấu "
+msgstr ""
+"tên gói chứa ký tự không phải chữ cái, chữ số viết thường hoặc dấu cộng, dấu "
 "trừ « -+ »."
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, 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:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "cảnh báo, « %s » chứa vùng « %s » được người dùng xác định\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "%d lỗi trong tập tin điều khiển"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb: đang xây dựng gói « %s » trong « %s ».\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "thư mục điều khiển có quyền hạn sai %03lo (phải là ≥0755 và ≤0775)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, 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 "
+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"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 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à "
+msgstr ""
+"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:266
+#: dpkg-deb/build.c:268
 #, 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:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "chuỗi rỗng từ fgets đọc các tập tin cấu hình"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 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 "
+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"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "cảnh báo, tên tập tin cấu hình « %s » chứa dấu cách theo sau\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "tập tin cấu hình « %.250s » không nằm trong gói"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "tập tin cấu hình « %.250s » không có khả năng cung cấp các thông tin"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "cảnh báo, tập tin cấu hình « %s » không phải là tập tin chuẩn\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "gặp lỗi khi đọc tập tin cấu hình"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "gặp lỗi khi mở tập tin cấu hình"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb: đang lờ đi %d cảnh báo về (các) tập tin điều khiển\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "không thể hủy đệm « %.250s »"
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang « %.250s »"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang « .../DEBIAN »"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "lỗi thực hiện « tar -cf »"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "lỗi tạo tập tin tạm thời (điều khiển)"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "lỗi mở tập tin tạm thời (điều khiển), %s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "lỗi hủy liên kết tập tin tạm thời (điều khiển), %s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "điều khiển"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "lỗi fstat tập tin tạm thời (điều khiển)"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "lỗi tua lại tập tin tạm thời (điều khiển)"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "lỗi tạo tập tin tạm thời (dữ liệu)"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "lỗi mở tập tin tạm thời (dữ liệu), %s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "lỗi hủy liên kết tập tin tạm thời (dữ liệu), %s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "dữ liệu"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "lỗi thực hiện tiến trình find (tìm)"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "lỗi ghi tên tập tin tới đường ống dẫn tar (dữ liệu)"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "Lỗi nội bộ, « compress_type » (kiểu nén) « %i » không rõ."
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "lỗi tua lại tập tin tạm thời (dữ liệu)"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (dữ liệu)"
 
@@ -3598,14 +3682,12 @@ msgstr "gặp lỗi khi đọc %s từ tập tin %.255s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "gặp kết thúc tập tin bất ngờ trong %s trong %.255s"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "tập tin « %.250s » bị hỏng — chiều dài %.250s chứa những số không"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "tập tin « %.250s » bị hỏng — chữ số sai (mã %d) trong %s"
@@ -3627,11 +3709,11 @@ msgstr "số phiên bản"
 msgid "between members"
 msgstr "giữa các bộ phạn"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "tập tin « %.250s » bị hỏng — ma thuật sai ở kết thúc của phần đầu thứ nhất"
+msgstr ""
+"tập tin « %.250s » bị hỏng — ma thuật sai ở kết thúc của phần đầu thứ nhất"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3641,7 +3723,8 @@ msgstr "tập tin « %.250s » bị hỏng — chiều dài bộ phạn âm %zi"
 #: dpkg-deb/extract.c:125
 #, 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-"
+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)?)"
 
 #: dpkg-deb/extract.c:128
@@ -3661,137 +3744,139 @@ msgstr "kho lưu không có dấu chấm trong số thứ tự phiên bản"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "không hiểu phiên bản kho lưu %.250s, hãy lấy « dpkg-deb » mới hơn"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "đã bỏ qua dữ liệu bộ phạn từ %s"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
-msgstr "tập tin « %.250s » chứa bộ phạn dữ liệu không được hiểu %.*s nên chịu thua"
+msgstr ""
+"tập tin « %.250s » chứa bộ phạn dữ liệu không được hiểu %.*s nên chịu thua"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "tập tin « %.250s » chứa hai bộ phạn điều khiển nên chịu thua"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %ld bytes: control archive= %zi bytes.\n"
-msgstr " gói Debian mới, phiên bản %s.\n"
+msgstr ""
+" gói Debian mới, phiên bản %s.\n"
 " kích cỡ %ld byte: kho lưu điều khiển= %zi byte.\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "độ dài thông tin điều khiển"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "kho lưu có độ dài điều khiển dạng sai « %s »"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %zi, main archive= %ld.\n"
-msgstr " gói Debian cũ, phiên bản %s.\n"
+msgstr ""
+" gói Debian cũ, phiên bản %s.\n"
 " kích cỡ %ld byte: kho lưu điều khiển= %zi byte, kho lưu chính= %ld.\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "lỗi cấp phát bộ nhớ cho biến « ctrlarea » (vùng điều khiển)"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "vùng điều khiển"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
-msgstr "dpkg-deb: \ttập tin có vẻ là một kho nén đã bị hỏng\n"
+msgstr ""
+"dpkg-deb: \ttập tin có vẻ là một kho nén đã bị hỏng\n"
 "dpkg-deb: \tdo việc tải xuống trong chế độ ASCII\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "« %.250s » không phải là kho nén định dạng Debian"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "lỗi lấy vị trí tập tin hiện thời"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "lỗi đặt vị trí tập tin hiện thời"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "lỗi mở mô tả ống dẫn « 1 »  trong việc dán"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "lỗi ghi vào « gzip -dc »"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "lỗi đóng « gzip -dc »"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "lỗi « syscall lseek » (gọi hệ thống |tìm) tới phần tập tin của kho lưu"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "lỗi ghi tới ống dẫn trong copy (sao chép)"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "lỗi đóng ống dẫn trong copy (sao chép)"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "lỗi tạo thư mục"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang thư mục sau khi tạo nó"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "lỗi chdir (chuyển đổi thư mục) sang thư mục"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "lỗi thực hiện tar"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "« --%s » cần một đỗi số kiểu tên tập tin .deb"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
-msgstr "« --%s » cần một thư mục đích.\n"
+msgstr ""
+"« --%s » cần một thư mục đích.\n"
 "Có thể cần sử dụng « dpkg --install » ?"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "« --%s » chấp nhận nhiều nhất hai đối số (.deb và thư mục)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "« --%s » chỉ chấp nhận một đối số (tên tập tin .deb)"
@@ -3881,7 +3966,8 @@ msgstr "lỗi đọc « control » (điều khiển) (trong « %.250s »)"
 
 #: dpkg-deb/info.c:171
 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:191
 msgid "could not open the `control' component"
@@ -3918,7 +4004,8 @@ msgid ""
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
-msgstr " Lệnh:\n"
+msgstr ""
+" Lệnh:\n"
 "   -b|--build <thư_mục> [<deb>]    \tTạo một kho lưu.\n"
 "\t(xây dựng)\n"
 "   -c|--contents <deb>               \t\tLiệt kê nội dung.\n"
@@ -3948,13 +4035,14 @@ msgid ""
 "<cfile> is the name of an administrative file component.\n"
 "<cfield> is the name of a field in the main `control' file.\n"
 "\n"
-msgstr "<deb> là tên tập tin của kho nén định dạng Debian.\n"
+msgstr ""
+"<deb> là tên tập tin của kho nén định dạng Debian.\n"
 "<tập_tin_q> là tên của thành phần tập tin kiểu quản trị.\n"
 "<trường_dk> là tên của trường trong tập tin « điều khiển » chính.\n"
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3965,9 +4053,11 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
-msgstr "Tùy chọn:\n"
+msgstr ""
+"Tùy chọn:\n"
 "   --showformat=<định_dạng>\n"
 "\t\tDùng một định dạng xen kẽ cho « --show »\n"
 "\t(hiện định dạng)\n"
@@ -3990,7 +4080,8 @@ msgid ""
 "Use `dpkg' to install and remove packages from your system, or\n"
 "`dselect' or `aptitude' for user-friendly package management.  Packages\n"
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "Hãy sử dụng ứng dụng « dpkg » để cài đặt gói vào và gỡ bỏ gói ra\n"
 "hệ thống của bạn, hoặc dùng « dselect » hay « aptitude » để quản lý gói\n"
 "một cách thân thiện với người dùng. Ghi chú : gói được giải nén\n"
@@ -4000,11 +4091,12 @@ msgstr "\n"
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
-msgstr "Gõ :\n"
+msgstr ""
+"Gõ :\n"
 "dpkg-deb --help\t\tđể xem trợ giúp về thao tác tập tin *.deb;\n"
 "dpkg --help\t\t\tđể xem trợ giúp về việc cài đặt và gỡ bỏ gói."
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "kiểu nén không rõ « %s »."
@@ -4036,7 +4128,8 @@ msgstr "tập tin « %.250s » bị hỏng — các số không ở trong phần
 #: dpkg-split/info.c:116
 #, 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 » "
+msgstr ""
+"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
@@ -4062,7 +4155,8 @@ msgstr "tập tin « %.250s » bị hỏng — ma thuật sai ở cuối phần
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
-msgstr "tập tin « %.250s » bị hỏng — bộ phạn thứ hai không phải là bộ phạn dữ liệu"
+msgstr ""
+"tập tin « %.250s » bị hỏng — bộ phạn thứ hai không phải là bộ phạn dữ liệu"
 
 #: dpkg-split/info.c:153
 #, c-format
@@ -4084,8 +4178,7 @@ msgstr "không thể fstat tập tin phần « %.250s »"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "tập tin « %.250s » bị hỏng — quá ngắn"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "không thể mở tập tin phần của kho nén « %.250s »"
@@ -4110,7 +4203,8 @@ msgid ""
 "    Part offset:                    %lu bytes\n"
 "    Part file size (used portion):  %lu bytes\n"
 "\n"
-msgstr "%s:\n"
+msgstr ""
+"%s:\n"
 "    Phiên bản định dạng phần:            %s\n"
 "    Phần của gói:                \t\t  %s\n"
 "        ... phiên bản:                    %s\n"
@@ -4150,12 +4244,14 @@ msgstr "hoàn tất\n"
 #: dpkg-split/join.c:84
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
-msgstr "tập tin « %.250s » và « %.250s » không phải là hai phần của cùng một tập tin"
+msgstr ""
+"tập tin « %.250s » và « %.250s » không phải là hai phần của cùng một tập tin"
 
 #: dpkg-split/join.c:89
 #, c-format
 msgid "there are several versions of part %d - at least `%.250s' and `%.250s'"
-msgstr "có vài phiên bản khác nhau của phần %d — ít nhất « %.250s » và « %.250s »"
+msgstr ""
+"có vài phiên bản khác nhau của phần %d — ít nhất « %.250s » và « %.250s »"
 
 #: dpkg-split/join.c:102
 msgid "--join requires one or more part file arguments"
@@ -4187,7 +4283,8 @@ msgid ""
 "  -l|--listq                       List unmatched pieces.\n"
 "  -d|--discard [<filename> ...]    Discard unmatched pieces.\n"
 "\n"
-msgstr "Lệnh:\n"
+msgstr ""
+"Lệnh:\n"
 "   -s|--split <tập_tin> [<tiền_tố>]\tChia tách một kho nén.\n"
 "\t(chia tách)\n"
 "   -j|--join <phần1> <phần2> ...     \tNối lại nhiều phần riêng.\n"
@@ -4214,7 +4311,8 @@ msgid ""
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"
-msgstr "Tùy chọn:\n"
+msgstr ""
+"Tùy chọn:\n"
 "   --depotdir <thư_mục>        \tDùng <thư_mục> thay cho %s/%s.\n"
 " \t(thư mục tích lũy phần)\n"
 "   -S|--partsize <cỡ>            \tTheo KiB, cho -s (mặc định là 450).\n"
@@ -4300,7 +4398,8 @@ msgstr "không thể mở tập tin kho chứa (depot) mới « %.250s »"
 #: dpkg-split/queue.c:160
 #, 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 « "
+msgstr ""
+"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
@@ -4325,8 +4424,7 @@ msgstr "« --listq » (liệt kê q) không chấp nhận đối số"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Tập tin rác vẫn còn nằm trong thư mục kho chứa (depot):\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "không thể lấy các thông tin về « %.250s »"
@@ -4371,7 +4469,8 @@ msgstr "« --split » (chia tách) cần một đối số kiểu tên tập tin
 
 #: dpkg-split/split.c:48
 msgid "--split takes at most a source filename and destination prefix"
-msgstr "« --split » (chia tách) chấp nhận nhiều nhất một tên tập tin nguồn và một "
+msgstr ""
+"« --split » (chia tách) chấp nhận nhiều nhất một tên tập tin nguồn và một "
 "tiền tố đích"
 
 #: dpkg-split/split.c:62
@@ -4392,11 +4491,9 @@ msgstr "tập tin nguồn « %.250s » không phải là tập tin chuẩn"
 msgid "unable to exec mksplit"
 msgstr "không thể thực hiện mksplit (tạo chia tách)"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s phiên bản %s.\n"
@@ -4405,19 +4502,19 @@ msgstr "Debian %s phiên bản %s.\n"
 msgid ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
-msgstr "\n"
+msgstr ""
+"\n"
 "Tác quyền © năm 1996 của Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "Đây là phần mềm tự do, xem Giấy Phép Công Cộng GNU (GPL)\n"
 "phiên bản 2 hoặc mới hơn để biết điều kiện sao chép.\n"
 "KHÔNG có bảo hành gì cả.\n"
@@ -4432,7 +4529,8 @@ msgid ""
 "               warning: this option may garble an otherwise correct file.\n"
 "  --help       show this help message.\n"
 "  --version    show the version.\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] [--] [<thư_mục>]\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] [--] [<thư_mục>]\n"
 "\n"
 "Tùy chọn:\n"
 "  --unsafe\tđặt một số tùy chọn thêm có thể hữu ích\n"
@@ -4444,26 +4542,22 @@ msgstr "Cách sử dụng: %s [<tùy_chọn> ...] [--] [<thư_mục>]\n"
 "  --version   \thiện phiên bản.\n"
 "\t(phiên bản)\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: cảnh báo — không thể mở khoá %s: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: không biết tùy chọn « %s »"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: quá nhiều đối số"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: lỗi khoá thư mục để chỉnh sửa. %s"
@@ -4473,48 +4567,40 @@ msgstr "%s: lỗi khoá thư mục để chỉnh sửa. %s"
 msgid "try deleting %s"
 msgstr "thử xoá %s"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "không thể mở %s: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "không thể tạo %s: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "không thể ghi %s: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "không thể đọc %s: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "không thể đóng %s sau khi đọc: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "không thể đóng %s: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "không thể sao lưu %s cũ nên chịu thua: %s"
@@ -4529,22 +4615,22 @@ msgstr "lỗi cài đặt %s: nó sẽ còn lại là %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: không thể mở khoá %s: %s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Không thể lấy giá trị ENOENT từ %s: %s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
-msgstr "\n"
+msgstr ""
+"\n"
 "Tác quyền © năm 1995 của Ian Jackson.\n"
 "Tác quyền © năm 2000,2001 của Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4572,7 +4658,8 @@ msgid ""
 "When removing, --package or --local and --divert must match if specified.\n"
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "\n"
 "Lệnh:\n"
 "  [--add] <tập_tin>           \tthêm việc chuyển hướng.\n"
@@ -4613,208 +4700,203 @@ msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "Văn lệnh cài đặt sẵn/sau khi gỡ bỏ luôn luôn nên xác định hai tùy chọn\n"
 "« --package » và « --divert ».\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "hai chế độ đã xác định: %s và « --%s »"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "« --%s » cần một đối số kiểu « divert-to » (chuyển hướng tới)"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "« divert-to » (chuyển hướng tới) không thể chứa ký tự dòng mới"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "« --%s » cần một đối số kiểu <gói>"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 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:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, 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:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "không biết tùy chọn « %s »"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "không thể mở việc chuyển hướng: %s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "thiếu « altname » (tên xen kẽ)"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "thiếu « package » (gói)"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "« --%s » cần một đối số rlêng lẻ"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "tên tập tin « %s » không phải là tuyệt đối"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "tập tin không thể chứa ký tự dòng mới"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "Không thể chuyển hướng thư mục"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Đang để lại « %s »"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "« %s » xung đột với « %s »"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "Đang thêm « %s »"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
 "  when removing `%s'\n"
 "  found `%s'"
-msgstr "không khớp được đối với « divert-to »\n"
+msgstr ""
+"không khớp được đối với « divert-to »\n"
 "  khi gỡ bỏ « %s »\n"
 "  tìm thấy « %s »"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
 "  when removing `%s'\n"
 "  found `%s'"
-msgstr "không khớp được đối với « package »\n"
+msgstr ""
+"không khớp được đối với « package »\n"
 "  khi gỡ bỏ « %s »\n"
 "  tìm thấy « %s »"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "Đang gỡ bỏ « %s »"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "Không có việc chuyển hướng « %s » nên không gỡ bỏ gì"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "lỗi nội bộ : chế độ sai « %s »"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "không thể lấy các thông tin về tên cũ « %s »: %s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 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:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "gặp lỗi khi kiểm tra « %s »: %s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
-msgstr "« rename » cần thiết việc ghi đè « %s »\n"
+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:251
+#: scripts/dpkg-divert.pl:266
 #, 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:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: thay tên « %s » thành « %s »: %s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "tạo « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "ghi « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "đóng « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "gỡ bỏ « diversions-old » cũ: %s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "tạo « diversions-old » mới: %s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "cài đặt sự chuyển hướng mới: %s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "lỗi nội bộ : %s bị hỏng: %s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
-msgstr "\n"
+msgstr ""
+"\n"
 "Tác quyền © năm 2000 của Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4832,7 +4914,8 @@ msgid ""
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "\n"
 "Lệnh:\n"
 "  --add <người_sở_hữu> <nhóm> <chế_độ> <tập_tin>\n"
@@ -4858,107 +4941,108 @@ msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "  --version               \t\thiện phiên bản.\n"
 "\t(phiên bản)\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "chưa xác định chế độ"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "« --add » cần bốn đối số"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "không cho phép người dùng %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "người dùng %s không tồn tại"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "không cho phép nhóm %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "nhóm %s không tồn tại"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "không cho phép chế độ %s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "đang tước các dấu xuyệc / theo sau"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "Một việc đè cho « %s » đã có, "
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "nhưng « --force » (ép buộc) đã xác định nên việc đó bị bỏ qua."
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "đang hủy bỏ"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
-msgstr "cảnh báo : tùy chọn « --update » (cập nhật) đưa ra nhưng %s không tồn tại"
+msgstr ""
+"cảnh báo : tùy chọn « --update » (cập nhật) đưa ra nhưng %s không tồn tại"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "lỗi chown (thay đổi quyền sở hửu) %s: %s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "lỗi chmod (thay đổi chế độ) %s: %s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "Không có sự đè."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
-msgstr "cảnh báo : tùy chọn « --update » (cập nhật) vô ích cho « --remove » (gỡ bỏ)"
+msgstr ""
+"cảnh báo : tùy chọn « --update » (cập nhật) vô ích cho « --remove » (gỡ bỏ)"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "không thể mở statoverride: %s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "Có nhiều sự đè cho « %s » nên hủy bỏ"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "không thể mở tập tin statoverride mới: %s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "gặp lỗi khi gỡ bỏ « statoverride-old »: %s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "gặp lỗi khi tạo « statoverride-old » mới: %s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "gặp lỗi khi cài đặt « statoverride » mới: %s"
@@ -4967,7 +5051,8 @@ msgstr "gặp lỗi khi cài đặt « statoverride » mới: %s"
 msgid ""
 "\n"
 "Copyright (C) 1994,1995 Ian Jackson."
-msgstr "\n"
+msgstr ""
+"\n"
 "Tác quyền © năm 1994,1995 của Ian Jackson."
 
 #: scripts/install-info.pl:31
@@ -4996,7 +5081,8 @@ msgid ""
 "  --quiet                  do not show output messages.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
-msgstr "Cách sử dụng: %s [<các_tùy_chọn> ...] [--] <tên_tập_tin>\n"
+msgstr ""
+"Cách sử dụng: %s [<các_tùy_chọn> ...] [--] <tên_tập_tin>\n"
 "\n"
 "Tùy chọn:\n"
 "  --section <btcq> <tá»±a>\n"
@@ -5054,7 +5140,8 @@ msgstr "%s: « --section » (phần) bị lờ đi khi cùng với « --remove 
 #: scripts/install-info.pl:134
 #, 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:137
 #, perl-format
@@ -5064,7 +5151,8 @@ msgstr "%s: chế độ thử ra — tập tin thư mục sẽ không được c
 #: scripts/install-info.pl:191
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
-msgstr "%s: cảnh báo :đang lờ đi INFO-DIR-ENTRY (mục nhập thư mục thông tin) lạ "
+msgstr ""
+"%s: cảnh báo :đang lờ đi INFO-DIR-ENTRY (mục nhập thư mục thông tin) lạ "
 "trong tập tin."
 
 #: scripts/install-info.pl:200
@@ -5077,7 +5165,8 @@ msgid ""
 "\n"
 "No `START-INFO-DIR-ENTRY' and no `This file documents'.\n"
 "%s: unable to determine description for `dir' entry - giving up\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "Không có « START-INFO-DIR-ENTRY » (bắt đầu mục nhập thư mục thông tin),\n"
 "cũng không có « This file documents » (tập tin này diễn tả trong tài liệu).\n"
 "%s: không thể quyết định mô tả cho mục nhập « dir » (thư mục) — nên chịu "
@@ -5088,8 +5177,7 @@ msgstr "\n"
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: không có tập tin %s, nên đang lấy các tập tin sao lưu %s."
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: lỗi sao chép %s sang %s nên chịu thua: %s"
@@ -5097,7 +5185,8 @@ msgstr "%s: lỗi sao chép %s sang %s nên chịu thua: %s"
 #: scripts/install-info.pl:288
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
-msgstr "%s: không có tập tin sao lưu %s sẵn sảng nên đang lấy tập tin mặc định."
+msgstr ""
+"%s: không có tập tin sao lưu %s sẵn sảng nên đang lấy tập tin mặc định."
 
 #: scripts/install-info.pl:297
 #, perl-format
@@ -5189,17 +5278,18 @@ msgstr "không thể đọc %s: %d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
-msgstr "\n"
+msgstr ""
+"\n"
 "Tác quyền © năm 1995 của Ian Jackson.\n"
 "Tác quyền © năm 2000-2002 của Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -5219,7 +5309,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5237,7 +5327,8 @@ msgid ""
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
-msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
+msgstr ""
+"Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "\n"
 "Lệnh:\n"
 "  --install <liên_kết> <tên> <đường_dẫn> <ưu_tiên>\n"
@@ -5289,377 +5380,375 @@ msgstr "Cách sử dụng: %s [<tùy_chọn> ...] <lệnh>\n"
 "  --version                \t\thiện phiên bản.\n"
 "\t(phiên bản)\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "không biết đối số « %s »"
-
-#: scripts/update-alternatives.pl:130
-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:132
-msgid "priority must be an integer"
-msgstr "« ưu tiên » phải là số nguyên"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "« --%s » cần hai giá trị <tên> <đường_dẫn>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "« --%s » cần giá trị <tên>"
-
-#: scripts/update-alternatives.pl:145
-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:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "tên phụ %s bị nhân đôi"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "liên kết phụ %s bị nhân đôi"
-
-#: scripts/update-alternatives.pl:164
-#, 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:165
-#, 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:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr "cần một của:\n"
-" • --display\t\thiển thị\n"
-" • --config\t\tcấu hình\n"
-" • --set\t\t\tđặt\n"
-" •--install\t\tcài đặt\n"
-" •--remove \t\tgỡ bỏ\n"
-" •--all\t\t\ttất cả\n"
-" •--remove-all \tgỡ bỏ tất cả\n"
-" •--auto\t\t\ttự động"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "cho phép « --slave » (phụ) chỉ với « --install » (cài đặt)"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag (cờ trang hướng dẫn)"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "điều phụ trùng %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "liên kết phụ là trùng với liên kết chính %s"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "liên kết phụ trùng %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "đường dẫn trùng %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "ưu tiên %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
-msgstr "Điều xen kẽ cho %s chỉ tới %s — mà không được tìm, nên gỡ bỏ ra danh sách "
+msgstr ""
+"Điều xen kẽ cho %s chỉ tới %s — mà không được tìm, nên gỡ bỏ ra danh sách "
 "các điều xen kẽ."
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Không có điều xen kẽ cho %s."
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s — trạng thái là %s."
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " liên kết hiện thời chỉ tới %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " hiện thời không có liên kết"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " không thể đọc liên kết — %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s — ưu tiên %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " phụ %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "Không có phiên bản sẵn sàng."
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Phiên bản « tốt nhất » hiện thời là %s."
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "không biết đối số « %s »"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr ""
+"« --install » (cài đặt) cần thiết bốn giá trị <liên_kết> <tên> <đường_dẫn> "
+"<ưu_tiên>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "« ưu tiên » phải là số nguyên"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "« --%s » cần hai giá trị <tên> <đường_dẫn>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "« --%s » cần giá trị <tên>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "« --slave » (phụ) cần thiết ba giá trị <liên_kết> <tên> <đường_dẫn>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "tên phụ %s bị nhân đôi"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "liên kết phụ %s bị nhân đôi"
+
+#: scripts/update-alternatives.pl:284
+#, 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:286
+#, 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:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"cần một của:\n"
+" • --display\t\thiển thị\n"
+" • --config\t\tcấu hình\n"
+" • --set\t\t\tđặt\n"
+" •--install\t\tcài đặt\n"
+" •--remove \t\tgỡ bỏ\n"
+" •--all\t\t\ttất cả\n"
+" •--remove-all \tgỡ bỏ tất cả\n"
+" •--auto\t\t\ttự động"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "cho phép « --slave » (phụ) chỉ với « --install » (cài đặt)"
+
+#: scripts/update-alternatives.pl:342
 #, 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:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "không thể gỡ bỏ %s: %s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
-msgstr "%s đã bị thay đổi (bằng tay hoặc bằng văn lệnh).\n"
+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:328
+#: scripts/update-alternatives.pl:370
 #, 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 "Đang kiểm tra các phiên bản %s sẵn sàng,\n"
+msgstr ""
+"Đang kiểm tra các phiên bản %s sẵn sàng,\n"
 "\tđang cập nhật các liên kết trong %s ...\n"
 "(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:334
+#: scripts/update-alternatives.pl:376
 #, 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:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, 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:354
+#: scripts/update-alternatives.pl:398
 #, 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:356
+#: scripts/update-alternatives.pl:400
 #, 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:370
+#: scripts/update-alternatives.pl:415
 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"
+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:384
+#: scripts/update-alternatives.pl:429
 #, 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:410
+#: scripts/update-alternatives.pl:456
 #, 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:431
+#: scripts/update-alternatives.pl:477
 #, 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:433
+#: scripts/update-alternatives.pl:479
 #, 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 --"
+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:437
+#: scripts/update-alternatives.pl:483
 #, 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:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "không thể mở %s để ghi: %s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, 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:489
+#: scripts/update-alternatives.pl:534
 #, 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"
+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:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, 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:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, 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:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, 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:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Đang để lại %s (%s) chỉ tới %s."
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, 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:523
+#: scripts/update-alternatives.pl:568
 #, 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"
+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:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, 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:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
-msgstr "Có chỉ 1 chương trình cung cấp %s (%s)\n"
+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:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
 "\n"
 "  Selection    Alternative\n"
 "-----------------------------------------------\n"
-msgstr "Có %s điều xen kẽ cung cấp « %s ».\n"
+msgstr ""
+"Có %s điều xen kẽ cung cấp « %s ».\n"
 "\n"
 "  Lựa chọn    Sự xen kẽ\n"
 "━━━━━━━━━━━━━━━━━━━━━\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 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:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Đang dùng « %s » để cung cấp « %s »."
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Không tìm thấy điều xen kẽ « %s »."
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "gặp lỗi khi ghi thiết bị xuất: %s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, 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)"
+msgstr ""
+"không cho phép ký tự dòng mới trong tập tin « update-alternatives » (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, 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:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "thiếu ký tự dòng mới sau %s"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Gặp lỗi nghiêm trọng: %s"
+
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s: việc thực hiện « gzip -dc » bị lỗi"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s: việc thực hiện « bzip2 -dc » bị lỗi"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s: việc thực hiện bzip2 bị lỗi %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e138d7db..c4856c31 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: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -62,72 +62,57 @@ msgstr "系统错误，错误代号：%d"
 msgid "Signal no.%d"
 msgstr "信号 no.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s：exec gzip %s 失败"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s：内部 gzip 错误：“%s”"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s：exec gzip -dc 失败"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s：内部 bzip2 错误：“%s”"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s：exec bzip2 -dc 失败"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s：解除压缩"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s：内部 gzip 错误：读取：“%s”"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s：内部 gzip 错误：写入：“%s”"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s：内部 gzip 错误：读出(%i) != 写入(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s：exec gzip %s 失败"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s：内部 bzip2 错误：读取：“%s”"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s：内部 bzip2 错误：写入：“%s”"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s：内部 bzip2 错误：读出(%i) != 写入(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s：exec bzip2 %s 失败"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s：压缩"
@@ -169,7 +154,7 @@ msgstr "无法扫描更新目录“%.255s”"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "删除合并的更新文件“%.255s”失败"
 
-#: lib/dbmodify.c:111 src/archives.c:600 dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "无法创建“%.255s”"
@@ -893,30 +878,30 @@ msgstr "没有发现格式字串中配对的右括弧\n"
 msgid "failed to realloc for variable buffer"
 msgstr "为变量缓冲区 realloc 时失败"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  已经消失了！"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "从 dpkg-deb 的管道读取数据时出错"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "为“%.255s”设置时间戳时出错"
 
-#: src/archives.c:272 src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "为“%.255s”设置属主时出错"
 
-#: src/archives.c:274 src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "为“%.255s”设置权限位时出错"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
@@ -925,129 +910,129 @@ msgstr ""
 "正在尝试覆盖“%.250s”，该文件是文件“%.250s”的转移版本(diverted version) %.10s"
 "%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (软件包："
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "无法 stat “%.255s” (而我正打算安装这个文件)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr "在安装另一版本前，无法清理“%.255s”的临时文件"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "在安装另一版本前，无法 stat 恢复后的“%.255s”"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "包文件中含有一个对象“%.255s”，我不能识别它的类型 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "正在替换原软件包中的文件 %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "被已安装的软件包 %s 中的文件替换了...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "正试图用一个非目录的文件替换目录“%.250s”，该目录属于软件包 %.250s"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "正试图覆盖“%.250s”，它属于软件包 %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "大批量读取替换文件“%.255s”"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "“%.255s” 时，dpkg-deb 被作为后端"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "关闭/写入“%.255s”出错"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "新建管道“%.255s”时出错"
 
-#: src/archives.c:634 src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "新建设备文件“%.255s”时出错"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "新建硬链接“%.255s”时出错"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "新建符号链接“%.255s”时出错"
 
-#: src/archives.c:662 src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "为符号链接“%.255s”设置属主时出错"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "新建目录“%.255s”时出错"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "无法将“%.255s”改名，以安装新的版本"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "无法读取符号链接“%.255s”"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "无法为“%.255s”做一个符号链接备份"
 
-#: src/archives.c:724 src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "无法 chown “%.255s”的符号链接备份"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "无法在安装新的版本前，为“%.255s”做一个符号链接备份"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "无法安装“%.255s”的新版本"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1056,14 +1041,14 @@ msgstr ""
 "dpkg: 警告 - 忽视依赖关系的问题将会把 %s 删除：\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr "dpkg: 警告 - 为了能删除 %2$s，正准备抹去重要软件包 %1$s 的设置。\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1072,7 +1057,7 @@ msgstr ""
 "dpkg：不行，%s 是重要的软件包，它的配置信息\n"
 "将不会被抹去，只因要让 %s 得以删除。\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1081,22 +1066,22 @@ msgstr ""
 "dpkg：不行，不能删除 %s (不妨试一下 --auto-deconfigure)：\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg：为了 %2$s，正准备删除%1$s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s 没有被正常安装 - 将忽略所有对它的依赖关系。\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg：也许删除 %s 会有问题，因为它提供了 %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1105,17 +1090,22 @@ msgstr ""
 "dpkg：尽管软件包 %s 需要重新安装，但还是将遵照您的要求，\n"
 "把它删除。\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg：软件包 %s 需要重新安装，它将不会被删除。\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg：好的，为了 %2$s 我将删除 %1$s。\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1124,72 +1114,72 @@ msgstr ""
 "dpkg：关于含有 %2$s 的 %1$s：\n"
 "%3$s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "软件包相互冲突 - 将不安装 %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg：警告 - 忽视了软件包间的冲突，无论怎样，继续安装！\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --递归执行的话需要至少一个路径作为参数"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "无法为 --recursive 选项 exec find"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "无法 fdopen find 的管道"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "读取 find 的管道时出错"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "关闭 find 的管道时出错"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 选项所调用的 find 返回了一个没有被处理的错误 %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已搜索包文件，但是没有发现任何软件包（即与 *.deb 匹配的文件）"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "-- %s 需要至少一个软件包文件作为参数"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "选中了曾被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "忽略了被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%1$.250s 的 %2$.250s 版本已经安装，因而将不再安装它。\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - 警告：即将把 %.250s 从 %.250s 降级到 %.250s。\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "由于不希望把 %.250s 从 %.250s 降级到 %.250s，因而将不再安装它。\n"
@@ -1552,110 +1542,117 @@ msgstr "在 conffile 提示输入时，在标准输入中读到了 EOF "
 msgid "unable to check for existence of `%.250s'"
 msgstr "无法检查“%.250s”是否存在"
 
-#: src/depcon.c:153 src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " 依赖于 "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " 预依赖于 "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " 推荐 "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " 建议 "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr " 破坏了 "
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " 冲突于 "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " 建议 "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " 强化 "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即将删除 %.250s。\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即将抹除 %.250s 的配置信息。\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即将安装 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安装了 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已经解开了 %.250s 的软件包，但是它还没有被配置过。\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已经解开了 %.250s 的软件包，不过它的版本是 %.250s。\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次配置 %.250s 时，它的版本是 %.250s。\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 现在 %s。\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但是它即将被删除。\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但是它的配置信息将被抹去。\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它现在 %s。\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 没有被安装。\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即将安装 %.250s (版本为 %.250s)。\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (版本为 %.250s)现在 %s。\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，它将被安装。\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s 提供了 %.250s，它现在 %s。\n"
@@ -2511,7 +2508,7 @@ msgstr "无法打开“%i”，并把它作为字符流操作"
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现了预料之外的 eof"
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"
@@ -2587,6 +2584,10 @@ msgstr "  提供 %2$s 的软件包 %1$s 未曾安装。\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  未曾安装软件包“%s”。\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " 依赖于 "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "；然而：\n"
@@ -2777,10 +2778,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "无法 stat 其它新文件“%.250s”"
 
 #: src/processarc.c:674
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
-"%.250s' and `%.250s')"
+"%.250s' and `%.250s')\n"
 msgstr ""
 "dpkg：警告 - 原有文件“%.250s”与多个新文件相同！(都是“%.250s”和“%.250s”)"
 
@@ -3229,24 +3230,29 @@ msgstr "--forget-old-unavail 不需带任何参数"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - 错误：%s (“%s”) 未含有任何数字\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build 需要一个目录名作为参数"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build 至多可有两个参数"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "无法判断包文件“%.250s”存在与否"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "目标是一个目录 - 无法忽略主控文件的检查步骤"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3255,175 +3261,175 @@ msgstr ""
 "dpkg-deb：警告，没有检查控制区的内容。\n"
 "dpkg-deb：正在在“%s“内新建一个未知的包文件。\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "软件包的名字含有不是小写字母或“-+”的字符"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "警告，“%s”含有用户自定义的优先级别(Priority value) “%s”\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "警告，“%s”含有用户自定义的字段“%s”\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "主控文件中共有 %d 个错误"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb：正在新建软件包“%s”，包文件为“%s”。\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "控制目录的的权限位是 %03lo (必须 >=0755 且 <=0755)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "维护者的脚本“%.50s”不是普通文件或符号链接"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr "维护者的脚本“%.50s”的权限位是 %03lo (必须 >=0555 且 <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "无法获取维护者的脚本文件“%.50s”的状态"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "通过 fgets 读取 conffile 时，返回了空字符串"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "警告，conffile 的文件名“%.50s”超长，或是缺少最后结尾的换行符\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "警告，conffile “%s” 的文件名后面含有空格\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "软件包内没有发现 conffile “%.250s”"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "无法 conffile “%.50s”的状态"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "警告，conffile “%s”不是普通文件\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "读取 conffile 文件时出错"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "打开 conffile 文件时出错"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb：共忽视了有关主控文件的 %d 个警告\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "无法关闭文件缓冲“%.255s”"
 
-#: dpkg-deb/build.c:323 dpkg-deb/build.c:396 dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir 到“%.255s”失败"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "chdir 到 .../DEBIAN 失败"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "exec tar -cf 失败"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "新建临时文件(控制信息)失败"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "打开临时文件(控制信息)失败，%s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "unlink 临时文件(控制信息)失败，%s"
 
-#: dpkg-deb/build.c:343 dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "控制信息"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "fstat 临时文件(控制信息)失败"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "跳到临时文件(控制信息)的起始位置(rewind)失败"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "新建临时文件(数据)失败"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "新建临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "unlink 临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:407 dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "数据"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "exec find 失败"
 
-#: dpkg-deb/build.c:430 dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "写入文件名到 tar 的管道(数据)失败"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "内部错误，未知的压缩类型“%i”！"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "跳到临时文件(数据)的起始位置(rewind)失败"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (数据)"
 
@@ -3500,22 +3506,22 @@ msgstr "包文件的版本号中没有点"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "不能识别包文件的版本 %.250s，请升级 dpkg-deb"
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "忽略了 %s 中的成员数据"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "文件“%.250s”含有未知的数据成员 %.*s，取消操作"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "文件“%.250s”含有两个控制成员，取消操作"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3524,16 +3530,16 @@ msgstr ""
 " 新格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包=%zi 字节。\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "控制信息的长度"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "压缩文件中的控制信息长度 “%s” 格式有误"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3542,15 +3548,15 @@ msgstr ""
 " 旧格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包= %zi 字节，数据及程序包= %ld。\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "为变量“ctrlarea”申请内存时出错"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "控制区"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3559,65 +3565,65 @@ msgstr ""
 "dpkg-deb：该文件看上去似乎原本是一个包文件，但是由于下载它时\n"
 "dpkg-deb：使用的是 ASCII 模式，从而导致了包文件被损坏\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "“%.255s”并非 debian 格式的包文件"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "无法得到当前文件的位置"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "无法设置当前文件的位置"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "在粘贴时，无法打开管道描述符“1”"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "在写入 gzip -dc 时，操作失败"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "在关闭 gzip -dc 时，操作失败"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "当通过使用系统调用 lseek，以跳到文件档开始处时失败"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "写入通向拷贝的管道时出错"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "关闭通向拷贝的管道时出错"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "新建目录失败"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "新建目录后，chdir 到该目录失败"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "chdir 到目录失败"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "exec tar 失败"
 
-#: dpkg-deb/extract.c:322 dpkg-deb/extract.c:337 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 需要一个 .deb 文件的文件名作为参数"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3626,12 +3632,12 @@ msgstr ""
 "--%s 需要一个目录作为目标目录。\n"
 "或许您应该使用 dpkg --install？"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 至多能有两个参数(分别是 .deb 文件和目录)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 只带一个参数(即 .deb 文件的文件名)"
@@ -3784,7 +3790,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3795,7 +3801,8 @@ msgid ""
 "  -z#                              Set the compression level when building.\n"
 "  -Z<type>                         Set the compression type used when "
 "building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "选项：\n"
@@ -3831,7 +3838,7 @@ msgstr ""
 "输入 dpkg-deb --help 可获得有关操作 *.deb 文件的帮助；\n"
 "输入 dpkg --help 可获得有关安装和卸载软件包的帮助。"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "无法识别的压缩类型“%s”！"
@@ -4205,9 +4212,9 @@ msgstr "原始文件“%.250s”不是普通文件"
 msgid "unable to exec mksplit"
 msgstr "无法 exec mksplit"
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s 版本 %s。\n"
@@ -4220,9 +4227,9 @@ msgstr ""
 "\n"
 "版权所有 (C) 1996 Kim-Minh Kaplan。"
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4277,7 +4284,7 @@ msgid "try deleting %s"
 msgstr "尝试删除 %s"
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "无法打开 %s：%s"
@@ -4304,7 +4311,7 @@ msgid "unable to close %s after read: %s"
 msgstr "读取完之后无法关闭 %s：%s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "无法关闭 %s：%s"
@@ -4324,12 +4331,12 @@ msgstr "安裝 %s 失败，它会被放在 %s：%s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s：无法解锁 %s；%s"
 
-#: scripts/dpkg-divert.pl:12 scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "无法从 %s 取得 ENOENT 值：%s"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4339,7 +4346,7 @@ msgstr ""
 "版权所有 (C) 1995 Ian Jackson。\n"
 "版权所有 (C) 2000,2001 Wichert Akkerman。"
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4391,89 +4398,89 @@ msgstr ""
 "在删除转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
-#: scripts/dpkg-divert.pl:64 scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "指定了两种模式：%s 以及 --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s 需要一个 divert-to 参数"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to 不可以含有换行符"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s 需要一个 <package> 参数"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "软件包不可以含有换行符"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152 scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一个 <directory> 参数"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "无法识别的选项 “%s”"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "无法打开转移项(diversions)：%s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "找不到 altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "找不到软件包"
 
-#: scripts/dpkg-divert.pl:125 scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195 scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s 需要一个参数"
 
-#: scripts/dpkg-divert.pl:127 scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "文件名 “%s” 并不是绝对的"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "文件不可以含有换行符"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "不能转移目录"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "正在离开 “%s”"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "“%s” 与 “%s” 冲突"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "正在添加 “%s”"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4484,7 +4491,7 @@ msgstr ""
 "  转移目标名(divert-to)不匹配\n"
 "  发现了“%s”"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4495,37 +4502,37 @@ msgstr ""
 "  软件包名不匹配\n"
 "  发现了“%s”"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "正在删除 “%s”"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "没有 “%s” 转移项，因此没有作出删除"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "内部错误 - 不正常的模式 “%s”"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "无法取得旧名称 “%s” 的信息：%s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "无法取得新名称 “%s” 的信息：%s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "处理 “%s” 时发生错误：%s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4534,52 +4541,52 @@ msgstr ""
 "更改 “%2$s” 文件名会复盖 “%1$s”，\n"
 "  不允許此操作"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "改名：移除重复的旧连接 “%s”：%s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "改名：更改 “%s” 的名称为 “%s”：%s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "创建 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "写入 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "关闭 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "移除旧有的转移项(diversions-old)：%s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "创建新的 diversions-old：%s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "安装新的转移项：%s"
 
-#: scripts/dpkg-divert.pl:291 scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部错误：%s 损坏：%s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4587,7 +4594,7 @@ msgstr ""
 "\n"
 "版权所有 (C) 2000 Wichert Akkerman。"
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4622,106 +4629,106 @@ msgstr ""
 "  --help                    显示本帮助信息。\n"
 "  --version                 显示版本信息。\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "没有指定模式"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add 需要四个参数"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "不合法的使用者 %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "不存在的使用者 %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "不合法的群组 %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "不存在的群组 %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "不合法的模式 %s"
 
-#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "移除后面的 /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "“%s” 的 override 已存在，"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "--force 已指定，所以先前的设置会忽略。"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "放弃"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "警告：--update 已指定但 %s 不存在"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "chown %s 时失败：%s"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod %s 时失败：%s"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "override 不存在。"
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "警告：对于 --remove，--update 是无效的"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "无法打开 statoverride：%s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "“%s”出现多个强制选项(overrides)，放弃中"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "无法打开新的 statoverride 文件：%s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "移除 statoverride-old 时出错：%s"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "建立新的 statoverride-old 时出错：%s"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "安装新的 statoverride 时出错：%s"
@@ -4936,7 +4943,7 @@ msgstr "无法读取 %s：%d"
 msgid "dbg: %s"
 msgstr "dbg：%s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4946,8 +4953,8 @@ msgstr ""
 "版权所有 (C) 1995 Ian Jackson。\n"
 "版权所有 (C) 2000-2002 Wichert Akkerman。"
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4967,7 +4974,7 @@ msgid ""
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
@@ -5022,161 +5029,160 @@ msgstr ""
 "   --help                        显示本帮助信息。\n"
 "   --version                     显示版本信息。\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "无法识别的参数 “%s”"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install 需要 <link> <name> <path> <priority>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "优先级必须为整数"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s 需要 <name> <path>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s 需要 <name>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave 需要 <link> <name> <path>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "次要名称(slave name) %s 有重复"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "次要链接(slave link) %s 有重复"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "文件名 %s 同時是主要(primary)和次要(slave)"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "链接 %s 同時是主要(primary)和次要(slave)"
-
-#: scripts/update-alternatives.pl:167
-msgid ""
-"need --display, --config, --set, --install, --remove, --all, --remove-all or "
-"--auto"
-msgstr ""
-"需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
-"--auto 选项"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave 只能搭配 --install 使用"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "重复的次要(slave) %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "次要(slave)的链接与主要链接 %s 相同"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "重复的次要(slave)链接 %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "重复路径 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "优先级 %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr "找不到指向 %2$s 的替换项 %1$s。正从替换项列表中移除。"
 
-#: scripts/update-alternatives.pl:216 scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "无 %s 的替换项。"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 状态为 %s"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 链接目前指向 %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr " 链接目前不存在"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " 链接无法读取 - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 优先级 %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s：%s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "无适用版本。"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "无法识别的参数 “%s”"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install 需要 <link> <name> <path> <priority>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "优先级必须为整数"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s 需要 <name> <path>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s 需要 <name>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave 需要 <link> <name> <path>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "次要名称(slave name) %s 有重复"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "次要链接(slave link) %s 有重复"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "文件名 %s 同時是主要(primary)和次要(slave)"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "链接 %s 同時是主要(primary)和次要(slave)"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
+"--auto 选项"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave 只能搭配 --install 使用"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在设置 %s 的自動选择"
 
-#: scripts/update-alternatives.pl:303 scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413 scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479 scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483 scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609 scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "无法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5185,7 +5191,7 @@ msgstr ""
 "%s 已更改（由于手动更改或通过脚本）。\n"
 "切换成只允许手动更新。"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5194,67 +5200,67 @@ msgstr ""
 "检查 %s 的可用版本，正在更新 %s 中的链接…\n"
 "（如果愿意，你也可以自行修改符号链接 (symlink) - 请参阅 “man ln”。）"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更改链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:337 scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439 scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "无法把 %s 改名为 %s：%s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要链接名称 %s 已重复"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "正在更改次要链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换为自动模式"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替换项 %1$s 没有注册，无法移除。"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "舍弃已废弃的次要链接 %s（%s）。"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 的自动更新功能。"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回复成自动更新，请执行 “update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "正在从上一次更新 %s 的失败中恢复…"
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "无法打开文件 “%s” 以写入：%s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最后一个提供 %s（%s）的软件包已移除，删除中。"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5263,38 +5269,38 @@ msgstr ""
 "警告：%s 应该是指向 %s 的符号链接(symlink)\n"
 " （或者不存在），但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:494 scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "无法确认 %s 不存在：%s"
 
-#: scripts/update-alternatives.pl:496 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631 scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
 
-#: scripts/update-alternatives.pl:498 scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597 scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "无法把 %s 安装为 %s：%s"
 
-#: scripts/update-alternatives.pl:501 scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "维持 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:504 scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5303,13 +5309,13 @@ msgstr ""
 "警告：%s 本该是指向 %s 的次要链接，\n"
 "或者不存在；但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:538 scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s（%s），不适用于 %s。"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5318,7 +5324,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5331,45 +5337,54 @@ msgstr ""
 "    选择        可选项\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "要维持缺省值[*]，按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:592 scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "使用 “%s” 来提供 “%s”。"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替换项 “%s”。"
 
-#: scripts/update-alternatives.pl:650 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "写入标准输出(stdout)时出错：%s"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：读取 %1$s 时发生错误或是 eof （%3$s）"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在 %s 后缺少换行符"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "严重问题：%s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s：exec gzip -dc 失败"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s：exec bzip2 -dc 失败"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s：exec bzip2 %s 失败"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "无法创建 %.250s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 54916173..3fc3a665 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-17 16:02+0200\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -59,72 +59,57 @@ msgstr "系統錯誤，錯誤代號：%d"
 msgid "Signal no.%d"
 msgstr "信號 no.%d"
 
-#: lib/compression.c:45
+#: lib/compression.c:34
+#, fuzzy, c-format
+msgid "%s: failed to exec '%s %s'"
+msgstr "%s：執行 gzip %s 失敗"
+
+#: lib/compression.c:62
 #, c-format
 msgid "%s: internal gzip error: `%s'"
 msgstr "%s：內部 gzip 錯誤：“%s”"
 
-#: lib/compression.c:60
-#, c-format
-msgid "%s: failed to exec gzip -dc"
-msgstr "%s：執行 gzip -dc 失敗"
-
-#: lib/compression.c:76
+#: lib/compression.c:85
 #, c-format
 msgid "%s: internal bzip2 error: `%s'"
 msgstr "%s：內部 bzip2 錯誤：“%s”"
 
-#: lib/compression.c:91
-#, c-format
-msgid "%s: failed to exec bzip2 -dc"
-msgstr "%s：執行 bzip2 -dc 失敗"
-
-#: lib/compression.c:94
+#: lib/compression.c:97
 #, c-format
 msgid "%s: decompression"
 msgstr "%s：解壓縮"
 
-#: lib/compression.c:128
+#: lib/compression.c:132
 #, c-format
 msgid "%s: internal gzip error: read: `%s'"
 msgstr "%s：內部 gzip 錯誤：讀取：“%s”"
 
-#: lib/compression.c:138
+#: lib/compression.c:142
 #, c-format
 msgid "%s: internal gzip error: write: `%s'"
 msgstr "%s：內部 gzip 錯誤：寫入：“%s”"
 
-#: lib/compression.c:141
+#: lib/compression.c:145
 #, c-format
 msgid "%s: internal gzip error: read(%i) != write(%i)"
 msgstr "%s：內部 gzip 錯誤：讀出(%i) != 寫入(%i)"
 
-#: lib/compression.c:157
-#, c-format
-msgid "%s: failed to exec gzip %s"
-msgstr "%s：執行 gzip %s 失敗"
-
-#: lib/compression.c:171
+#: lib/compression.c:167
 #, c-format
 msgid "%s: internal bzip2 error: read: `%s'"
 msgstr "%s：內部 bzip2 錯誤：讀取：“%s”"
 
-#: lib/compression.c:181
+#: lib/compression.c:177
 #, c-format
 msgid "%s: internal bzip2 error: write: `%s'"
 msgstr "%s：內部 bzip2 錯誤：寫入：“%s”"
 
-#: lib/compression.c:184
+#: lib/compression.c:180
 #, c-format
 msgid "%s: internal bzip2 error: read(%i) != write(%i)"
 msgstr "%s：內部 bzip2 錯誤：讀出(%i) != 寫入(%i)"
 
-#: lib/compression.c:200
-#, c-format
-msgid "%s: failed to exec bzip2 %s"
-msgstr "%s：執行 bzip2 %s 失敗"
-
-#: lib/compression.c:203
+#: lib/compression.c:195
 #, c-format
 msgid "%s: compression"
 msgstr "%s：壓縮"
@@ -145,12 +130,15 @@ msgstr "在寫入 hashreport 時寫入失敗"
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
 msgstr "更新目錄中包含檔案“%.250s”，其檔案名太長(長度為 %d，最大為 %d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
 msgstr "更新目錄中含有不同長度名稱的檔案(分別為 %d 和 %d)"
 
 #: lib/dbmodify.c:77
@@ -163,9 +151,7 @@ msgstr "無法掃描更新目錄“%.255s”"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "刪除合併的更新檔案“%.255s”失敗"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:600
-#: dpkg-deb/build.c:317
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "無法建立“%.255s”"
@@ -415,8 +401,10 @@ msgstr "根目錄或是空目錄也被列為了 conffile"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "“%s\" 欄位，找不到套件名稱，也可能是在填寫套件名的地方發現了無意義的數據"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"“%s\" 欄位，找不到套件名稱，也可能是在填寫套件名的地方發現了無意義的數據"
 
 #: lib/fields.c:340
 #, c-format
@@ -463,8 +451,7 @@ msgstr ""
 "“%s”欄位，於“%.255s”:\n"
 " 版本號不是以字母開頭，建議加一個空格"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "“%s”欄位，於“%.255s”：版本號含有“%c”"
@@ -514,8 +501,7 @@ msgstr "無法鎖定 dpkg 的狀態數據庫"
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc 失敗 (%ld 位元組)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc 失敗(%ld 位元組)"
@@ -558,8 +544,7 @@ msgstr "子程序·%s·返回了錯誤號·%d"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg：警告 - %s 被信號(%s)終止了%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", core dumped"
 
@@ -668,8 +653,7 @@ msgstr "讀取設定檔案“%.255s”時出錯"
 msgid "error closing configuration file `%.255s'"
 msgstr "關閉設定檔案“%.255s”時出錯"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "為 cfgfilename 分派記憶體時出錯"
 
@@ -888,159 +872,160 @@ msgstr "沒有發現格式字串中配對的括弧\n"
 msgid "failed to realloc for variable buffer"
 msgstr "重新配置變量緩衝區時失敗"
 
-#: src/archives.c:208
+#: src/archives.c:209
 msgid "process_archive ...  already disappeared !"
 msgstr "process_archive ...  已經消失了！"
 
-#: src/archives.c:228
+#: src/archives.c:229
 msgid "error reading from dpkg-deb pipe"
 msgstr "從 dpkg-deb 的管線讀取資料時出錯"
 
-#: src/archives.c:265
+#: src/archives.c:266
 #, c-format
 msgid "error setting timestamps of `%.255s'"
 msgstr "為“%.255s”設定時間戳記出錯"
 
-#: src/archives.c:272
-#: src/archives.c:617
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "為“%.255s”設定所有權時出錯"
 
-#: src/archives.c:274
-#: src/archives.c:620
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "為“%.255s”設定權限時出錯"
 
-#: src/archives.c:367
+#: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "正在覆蓋“%.250s”，該檔案是檔案“%.250s”的 diverted 版本 %.10s%.100s%.10s"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"正在覆蓋“%.250s”，該檔案是檔案“%.250s”的 diverted 版本 %.10s%.100s%.10s"
 
-#: src/archives.c:371
+#: src/archives.c:372
 msgid " (package: "
 msgstr " (套件："
 
-#: src/archives.c:393
+#: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr "無法 stat “%.255s” (而我正打算安裝這個檔案)"
 
-#: src/archives.c:401
+#: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
 msgstr "在安裝另一版本前，無法清理“%.255s”的暫存檔案"
 
-#: src/archives.c:407
+#: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr "在安裝另一版本前，無法 stat 恢復後的“%.255s”"
 
-#: src/archives.c:439
+#: src/archives.c:440
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr "壓縮檔案中含有一個物件“%.255s”，我不能辨識它的型別 0x%x"
 
-#: src/archives.c:499
+#: src/archives.c:500
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr "正在替換原套件中的檔案 %s ...\n"
 
-#: src/archives.c:502
+#: src/archives.c:503
 #, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "正在替換安裝的套件中的檔案 %s ...\n"
 
-#: src/archives.c:508
+#: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr "正試圖用一個非目錄的檔案替換目錄“%.250s”，該目錄屬於套件 %.250s"
 
-#: src/archives.c:518
+#: src/archives.c:519
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr "正試圖覆蓋“%.250s”，它屬於套件 %.250s"
 
-#: src/archives.c:543
+#: src/archives.c:544
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr "多次替換檔案“%.255s”"
 
-#: src/archives.c:605
+#: src/archives.c:606
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "“%.255s” 時，dpkg-deb 被作為後端程式"
 
-#: src/archives.c:623
+#: src/archives.c:624
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "關閉/寫入“%.255s”出錯"
 
-#: src/archives.c:628
+#: src/archives.c:629
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "建立管線“%.255s”時出錯"
 
-#: src/archives.c:634
-#: src/archives.c:640
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "建立設備檔案“%.255s”時出錯"
 
-#: src/archives.c:649
+#: src/archives.c:650
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "建立硬鏈接“%.255s”時出錯"
 
-#: src/archives.c:656
+#: src/archives.c:657
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "建立符號鏈接“%.255s”時出錯"
 
-#: src/archives.c:662
-#: src/archives.c:667
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "為符號鏈接“%.255s”設定所有權時出錯"
 
-#: src/archives.c:673
+#: src/archives.c:674
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "建立目錄“%.255s”時出錯"
 
-#: src/archives.c:708
+#: src/archives.c:709
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "無法將“%.255s”更名，以安裝新的版本"
 
-#: src/archives.c:717
+#: src/archives.c:718
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "無法讀取符號鏈接“%.255s”"
 
-#: src/archives.c:721
+#: src/archives.c:722
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "無法為“%.255s”做一個符號鏈接備份"
 
-#: src/archives.c:724
-#: src/archives.c:727
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "無法 chown “%.255s”的符號鏈接備份"
 
-#: src/archives.c:732
+#: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "無法在安裝新的版本前，為“%.255s”做一個符號鏈接備份"
 
-#: src/archives.c:756
+#: src/archives.c:757
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "無法安裝“%.255s”的新版本"
 
-#: src/archives.c:788
+#: src/archives.c:789
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
@@ -1049,14 +1034,14 @@ msgstr ""
 "dpkg: 警告 - 忽視相依性問題將會把 %s 刪除：\n"
 "%s"
 
-#: src/archives.c:795
+#: src/archives.c:796
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr "dpkg: 警告 - 為了能刪除 %2$s，正准備移除重要套件 %1$s 的設定。\n"
 
-#: src/archives.c:799
+#: src/archives.c:800
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1065,7 +1050,7 @@ msgstr ""
 "dpkg：不行，%s 是重要的套件，它的設定訊息\n"
 "將不會移除，這才能刪除  %s。\n"
 
-#: src/archives.c:812
+#: src/archives.c:813
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
@@ -1074,39 +1059,46 @@ msgstr ""
 "dpkg：不行，不能刪除 %s (不妨試一下 --auto-deconfigure)：\n"
 "%s"
 
-#: src/archives.c:846
+#: src/archives.c:847
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg：為了 %2$s，正准備刪除%1$s ...\n"
 
-#: src/archives.c:850
+#: src/archives.c:851
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s 沒有被正常安裝 - 將忽略所有對它的相依關系。\n"
 
-#: src/archives.c:877
+#: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg：也許刪除 %s 會有問題，因為它提供了 %s ...\n"
 
-#: src/archives.c:892
+#: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
 msgstr ""
 "dpkg：盡管套件 %s 需要重新安裝，但還是將遵照您的要求，\n"
 "把它刪除。\n"
 
-#: src/archives.c:895
+#: src/archives.c:896
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg：套件 %s 需要重新安裝，它將不會被刪除。\n"
 
-#: src/archives.c:908
+#: src/archives.c:903
+#, c-format
+msgid "package %s has too many Conflicts/Replaces pairs"
+msgstr ""
+
+#: src/archives.c:909
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg：好的，為了 %2$s 我將刪除 %1$s。\n"
 
-#: src/archives.c:916
+#: src/archives.c:917
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1115,79 +1107,81 @@ msgstr ""
 "dpkg：關於含有 %2$s 的 %1$s：\n"
 "%3$s"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "套件相互衝突 - 將不安裝 %.250s"
 
-#: src/archives.c:920
+#: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg：警告 - 忽視了套件間的衝突，無論怎樣，繼續安裝！\n"
 
-#: src/archives.c:958
+#: src/archives.c:959
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --遞回執行的話需要至少一個路徑作為參數"
 
-#: src/archives.c:988
+#: src/archives.c:989
 msgid "failed to exec find for --recursive"
 msgstr "無法為 --recursive 選項 exec find"
 
-#: src/archives.c:993
+#: src/archives.c:994
 msgid "failed to fdopen find's pipe"
 msgstr "無法 fdopen find 的管線"
 
-#: src/archives.c:999
+#: src/archives.c:1000
 msgid "error reading find's pipe"
 msgstr "讀取 find 的管線時出錯"
 
-#: src/archives.c:1000
+#: src/archives.c:1001
 msgid "error closing find's pipe"
 msgstr "關閉 find 的管線時出錯"
 
-#: src/archives.c:1003
+#: src/archives.c:1004
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 選項所呼叫的 find 返回了一個沒有被處理的錯誤 %i"
 
-#: src/archives.c:1006
+#: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已搜尋壓縮檔案，但是沒有發現任何套件（即與 *.deb 匹配的檔案）"
 
-#: src/archives.c:1022
+#: src/archives.c:1023
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "-- %s 需要至少一個套件檔案作為參數"
 
-#: src/archives.c:1092
+#: src/archives.c:1093
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "選中了曾被取消選擇的套件 %s。\n"
 
-#: src/archives.c:1097
+#: src/archives.c:1098
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "忽略了被取消選擇的套件·%s。\n"
 
-#: src/archives.c:1111
+#: src/archives.c:1112
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%1$.250s 的 %2$.250s 版本已經安裝，因而將不再安裝它。\n"
 
-#: src/archives.c:1123
+#: src/archives.c:1124
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - 警告：即將把 %.250s 從 %.250s 降級到 %.250s。\n"
 
-#: src/archives.c:1129
+#: src/archives.c:1130
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "由於不希望把 %.250s 從 %.250s 降級到 %.250s，因而將不再安裝它。\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
 msgstr "無法移除新安裝版本的”%.250s“的版本，移除它就能重新安裝備份拷貝"
 
 #: src/cleanup.c:90
@@ -1264,8 +1258,7 @@ msgstr "正在設定 %s (%s) ...\n"
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr "無法 stat 新發布版的 conffile “%.250s”"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr "無法 stat 當前已被安裝的 conffile “%.250s”"
@@ -1309,7 +1302,8 @@ msgstr "dpkg：%s：警告 - 無法刪除“%.250s”(在覆蓋前)：%s\n"
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg：%1$s：警告 - 無法建立一個指向“%2$.250s”的硬鏈接“%3$.250s”：%4$s\n"
+msgstr ""
+"dpkg：%1$s：警告 - 無法建立一個指向“%2$.250s”的硬鏈接“%3$.250s”：%4$s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1359,7 +1353,9 @@ msgstr ""
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
 msgstr "dpkg：%s：警告 - conffile “%.250s”不是普通檔案或者符號鏈接 (= “%s“)\n"
 
 #: src/configure.c:411
@@ -1386,8 +1382,7 @@ msgstr "無法設定新發布版的 conffile “%.250s”的權限"
 msgid "failed to run %s (%.250s)"
 msgstr "無法運行 %s (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "等待 shell 子程序退出失敗"
 
@@ -1540,118 +1535,122 @@ msgstr "在 conffile 提示輸入時，在 stdin 中讀到了 EOF "
 msgid "unable to check for existence of `%.250s'"
 msgstr "無法檢查“%.250s”是否存在"
 
-#: src/depcon.c:153
-#: src/packages.c:396
-msgid " depends on "
+#: src/depcon.c:156
+#, fuzzy, c-format
+msgid "%s depends on %s"
 msgstr " 相依於 "
 
-#: src/depcon.c:154
-msgid " pre-depends on "
+#: src/depcon.c:159
+#, fuzzy, c-format
+msgid "%s pre-depends on %s"
 msgstr " 預相依於 "
 
-#: src/depcon.c:155
-msgid " recommends "
+#: src/depcon.c:162
+#, fuzzy, c-format
+msgid "%s recommends %s"
 msgstr " 推薦 "
 
-#: src/depcon.c:156
-msgid " breaks "
+#: src/depcon.c:165
+#, fuzzy, c-format
+msgid "%s suggests %s"
+msgstr " 建議 "
+
+#: src/depcon.c:168
+#, fuzzy, c-format
+msgid "%s breaks %s"
 msgstr "breaks"
 
-#: src/depcon.c:157
-msgid " conflicts with "
+#: src/depcon.c:171
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
 msgstr " 衝突於 "
 
-#: src/depcon.c:158
-msgid " suggests "
-msgstr " 建議 "
-
-#: src/depcon.c:159
-msgid " enhances "
+#: src/depcon.c:174
+#, fuzzy, c-format
+msgid "%s enhances %s"
 msgstr " 加強 "
 
-#: src/depcon.c:246
+#: src/depcon.c:269
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即將刪除 %.250s。\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即將抹除 %.250s 的設定訊息。\n"
 
-#: src/depcon.c:253
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即將安裝 %.250s，不過安裝的版本是 %.250s。\n"
 
-#: src/depcon.c:261
+#: src/depcon.c:284
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安裝了 %.250s，不過安裝的版本是 %.250s。\n"
 
-#: src/depcon.c:276
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已經解開了 %.250s 的套件，但是它還沒有被設定過。\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:303
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已經解開了 %.250s 的套件，不過它的版本是 %.250s。\n"
 
-#: src/depcon.c:286
+#: src/depcon.c:309
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次設定 %.250s 時，它的版本是 %.250s。\n"
 
-#: src/depcon.c:295
+#: src/depcon.c:318
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 現在 %s。\n"
 
-#: src/depcon.c:331
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但是它即將被刪除。\n"
 
-#: src/depcon.c:335
+#: src/depcon.c:358
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但是它的設定訊息將被取代。\n"
 
-#: src/depcon.c:340
+#: src/depcon.c:363
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它現在 %s。\n"
 
-#: src/depcon.c:354
+#: src/depcon.c:377
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 沒有被安裝。\n"
 
-#: src/depcon.c:385
+#: src/depcon.c:408
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即將安裝 %.250s (版本為 %.250s)。\n"
 
-#: src/depcon.c:399
+#: src/depcon.c:422
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (版本為 %.250s)現在 %s。\n"
 
-#: src/depcon.c:424
+#: src/depcon.c:447
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，它將被安裝。\n"
 
-#: src/depcon.c:455
+#: src/depcon.c:478
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s 提供了 %.250s，它現在 %s。\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(無相關介紹)"
 
@@ -1759,15 +1758,16 @@ msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture 不需要帶任何參數"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "--compare-version 需要帶三個參數，它們分別是：<版本號> <比較關系> <版本號>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"--compare-version 需要帶三個參數，它們分別是：<版本號> <比較關系> <版本號>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions 錯誤的比較關系"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg：版本“%s”有錯誤的語法：%s\n"
@@ -1782,7 +1782,8 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr "dpkg：在無法處理的套件列表中增加項目時，分配項目所需的記憶體空間失敗。"
 
 #: src/errors.c:91
@@ -1805,8 +1806,11 @@ msgstr "套件 %s 本來被要求保持原來的版本，但還是如您所願
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "套件 %s 被要求保持原來的版本，因而不會去改動它。請使用 --force-hold 選項來忽略該設定。\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"套件 %s 被要求保持原來的版本，因而不會去改動它。請使用 --force-hold 選項來忽"
+"略該設定。\n"
 
 #: src/errors.c:125
 msgid ""
@@ -1823,8 +1827,12 @@ msgstr "無法打開套件“%.250s”的檔案列表檔案"
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
-msgstr "dpkg：嚴重警告：無法找到套件“%.250s”的檔案列表檔案，假定該套件目前沒有任何檔案被安裝在系統裡。\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
+msgstr ""
+"dpkg：嚴重警告：無法找到套件“%.250s”的檔案列表檔案，假定該套件目前沒有任何檔"
+"案被安裝在系統裡。\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -1934,8 +1942,7 @@ msgstr "在轉移項(diversions)檔案中發現了預料外的 EOF [ii]"
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets 從轉移項(diversions)中取回了一個空的字元串·[ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "轉移項(diversions)檔案有的行過長，或者含有 EOF [ii]"
 
@@ -2027,9 +2034,7 @@ msgstr "無法設定 %s 的執行權限(execute permissions)"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "無法 stat 已安裝的 %s script“%.250s”"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "無法執行 %s"
@@ -2086,8 +2091,7 @@ msgstr "unlink"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "刪除"
 
@@ -2096,8 +2100,7 @@ msgstr "刪除"
 msgid "failed to %s `%%.255s'"
 msgstr "切換到%s失敗“%%.255s”"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "無法使用 exec rm 來清除"
 
@@ -2106,10 +2109,7 @@ msgstr "無法使用 exec rm 來清除"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian“%s”套件管理程式版本%s。\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2120,10 +2120,7 @@ msgstr ""
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
 "請執行 %s --license 來查看版權和許可証的細節。\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2187,10 +2184,7 @@ msgstr ""
 "  -Dh|--debug=help                 顯示偵錯模式的求助畫面。\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2231,16 +2225,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2253,16 +2252,21 @@ msgstr ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2276,15 +2280,19 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "--compare-versions 的運算子：\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 
 #: src/main.c:134
@@ -2299,9 +2307,11 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
 "輸入 dpkg --help 可獲得安裝和移除套件的說明 [*]﹔\n"
 "使用 dselect 就能使用使用者親和的套件管理﹔\n"
@@ -2312,10 +2322,7 @@ msgstr ""
 "\n"
 "帶有[*]的選項將會輸出較大篇幅的文字 - 可使用管線將其輸出到“less”或“more”！"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "操作之間有矛盾 -%c (--%s) 和 -%c (--%s)"
@@ -2376,8 +2383,7 @@ msgstr "在 --ignore-depends 的用逗號相隔的參數列表“%s”中，發
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一個有效的套件名。而“%.250s”卻不是﹔%s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一個無效的數字參數：“%.250s”"
@@ -2393,23 +2399,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2418,7 +2429,8 @@ msgid ""
 msgstr ""
 "%s 強制選項 - 可指定遇到問題時的處理方法：\n"
 "  警告的同時繼續執行：  --force-<手段>，<手段>，...\n"
-"  有錯誤時立即中止：    --refuse-<手段>，<手段>，... | --no-force-<手段>，...\n"
+"  有錯誤時立即中止：    --refuse-<手段>，<手段>，... | --no-force-<手段"
+">，...\n"
 " 強制執行的各種方法：\n"
 "  all                    應用所有的強制方法\n"
 "  downgrade [*]          把套件替換成更舊的版本\n"
@@ -2427,7 +2439,8 @@ msgstr ""
 "  bad-path               PATH 環境變數中找不到關鍵的程序，有可能引起錯誤\n"
 "  not-root               即使用戶不是 root，也試圖安裝(或移除)軟體\n"
 "  overwrite              使用來自某個套件的檔案覆蓋原本屬於另一套件的檔案\n"
-"  overwrite-diverted     使用一個不是轉移(diverted)版本的檔案覆蓋轉移(diverted)版本的檔案\n"
+"  overwrite-diverted     使用一個不是轉移(diverted)版本的檔案覆蓋轉移"
+"(diverted)版本的檔案\n"
 "  bad-verify             即使套件沒能通過驗証，它也將被安裝\n"
 "  depends-version [!]    把有關版本的相依問題作為警告處理\n"
 "  depends [!]            把所有類型的相依問題都作為警告處理\n"
@@ -2456,14 +2469,11 @@ msgstr "無法識別的 force/refuse 選項“%.*s”"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告：已廢棄不用的選項“%s”\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "無法在 execbackend 中 malloc"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "無法在 execbackend 中 strdup"
 
@@ -2494,10 +2504,7 @@ msgstr "無法打開“%i”，並把它作為串流處理"
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未結束時，發現了預料之外的 eof"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:200
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "需要一個指示操作的選項"
@@ -2507,14 +2514,15 @@ msgstr "需要一個指示操作的選項"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending 不需任何不是選項的參數"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s 需要至少一個套件名稱作為參數"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
 msgstr "您必須指定套件本身的名稱，而不是直接引用套件檔案的檔案名"
 
 #: src/packages.c:150
@@ -2571,6 +2579,10 @@ msgstr "提供 %2s 的套件 %1s 尚未安裝。\n"
 msgid "  Package %s is not installed.\n"
 msgstr "套件“%s”沒有安裝。\n"
 
+#: src/packages.c:396
+msgid " depends on "
+msgstr " 相依於 "
+
 #: src/packages.c:402
 msgid "; however:\n"
 msgstr "﹔然而：\n"
@@ -2586,7 +2598,9 @@ msgstr "在確保檔案“%.250s”不存在時出錯"
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "exec dpkg-split 時出錯，該操作被用來判斷這是否為一個套件(multiparter)中的一個部分"
+msgstr ""
+"exec dpkg-split 時出錯，該操作被用來判斷這是否為一個套件(multiparter)中的一個"
+"部分"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2748,7 +2762,9 @@ msgstr "dpkg：警告 - 無法刪除原有的目錄“%.250s”：%s\n"
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
 msgstr "dpkg：警告 - old conffile “%.250s” 先前是空目錄(現已刪除)\n"
 
 #: src/processarc.c:663
@@ -2757,8 +2773,10 @@ msgid "unable to stat other new file `%.250s'"
 msgstr "無法取得新檔案“%.250s”的資訊"
 
 #: src/processarc.c:674
-#, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')"
+#, fuzzy, c-format
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
 msgstr "dpkg：警告 - 舊檔案“%250s”與部份新檔案相同！(“%250s”和“%250s”)"
 
 #: src/processarc.c:715
@@ -2766,16 +2784,15 @@ msgstr "dpkg：警告 - 舊檔案“%250s”與部份新檔案相同！(“%250s
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg：警告 - 無法 %s 舊有的檔案“%%.250s”：%%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "無法讀取訊息(info)目錄"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "原先版本的套件中有一個訊息檔案的檔案名稱過長，檔案名稱是以“%.250s”開頭的"
+msgstr ""
+"原先版本的套件中有一個訊息檔案的檔案名稱過長，檔案名稱是以“%.250s”開頭的"
 
 #: src/processarc.c:766
 #, c-format
@@ -2830,10 +2847,12 @@ msgstr "無法刪除已經消失了的控制訊息檔案“%.250s”"
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "期望狀態=未知(u)/安裝(i)/刪除(r)/清除(p)/保持(h)\n"
-"| 當前狀態=未(n)/已安裝(i)/僅存設定(c)/僅解壓縮(U)/設定失敗(F)/不完全安裝(H)\n"
+"| 當前狀態=未(n)/已安裝(i)/僅存設定(c)/僅解壓縮(U)/設定失敗(F)/不完全安裝"
+"(H)\n"
 "|/ 錯誤？=(無)/保持(?)/須重裝(R)/兩者兼有(#) (狀態，錯誤：大寫=故障)\n"
 
 #: src/query.c:164
@@ -2848,9 +2867,7 @@ msgstr "版本"
 msgid "Description"
 msgstr "簡介"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "沒有找到與 %s 相匹配的套件。\n"
@@ -2964,26 +2981,27 @@ msgstr ""
 "  -f|--showformat=<format>       指定 --show 的替代格式。\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 
 #: src/query.c:514
@@ -2998,7 +3016,8 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
 msgstr "dpkg - 警告：忽略了刪除 %.250s 的要求，系統沒有安裝該套件。\n"
 
 #: src/remove.c:100
@@ -3054,14 +3073,16 @@ msgstr "這樣肯定會刪除或清除(purge) %s ...\n"
 msgid "Removing %s ...\n"
 msgstr "正在刪除 %s ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - 警告：當刪除 %.250s 時，無法刪掉目錄“%.250s”：%s - 該目錄會不會是一個掛載點呢？\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - 警告：當刪除 %.250s 時，無法刪掉目錄“%.250s”：%s - 該目錄會不會是一個"
+"掛載點呢？\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "無法刪除“%.250s”"
@@ -3078,8 +3099,11 @@ msgstr "無法刪除控制訊息檔案“%.250s”"
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - 警告：當刪除“%.250s 時，目錄“%.250s 不是空的，所以不會刪除該目錄。\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - 警告：當刪除“%.250s 時，目錄“%.250s 不是空的，所以不會刪除該目錄。\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3203,24 +3227,29 @@ msgstr "--forget-old-unavail 不需帶任何參數"
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - 錯誤：%s (“%s”) 未含有任何數字\n"
 
-#: dpkg-deb/build.c:170
+#: dpkg-deb/build.c:111
+#, c-format
+msgid "file name '%.50s...' is too long"
+msgstr ""
+
+#: dpkg-deb/build.c:172
 msgid "--build needs a directory argument"
 msgstr "--build 需要一個目錄名作為參數"
 
-#: dpkg-deb/build.c:179
+#: dpkg-deb/build.c:181
 msgid "--build takes at most two arguments"
 msgstr "--build 至多可有兩個參數"
 
-#: dpkg-deb/build.c:183
+#: dpkg-deb/build.c:185
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "無法判斷壓縮檔案“%.250s”存在與否"
 
-#: dpkg-deb/build.c:198
+#: dpkg-deb/build.c:200
 msgid "target is directory - cannot skip control file check"
 msgstr "目標是一個目錄 - 無法忽略主控檔案的檢查步驟"
 
-#: dpkg-deb/build.c:199
+#: dpkg-deb/build.c:201
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3229,178 +3258,175 @@ msgstr ""
 "dpkg-deb：警告，沒有檢查控制區的內容。\n"
 "dpkg-deb：正在在“%s“內建立一個未知的套件。\n"
 
-#: dpkg-deb/build.c:217
+#: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "套件的名字含有不是小寫字母或“-+”的字元"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:221
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "警告，“%s”含有用戶自訂的優先級別(Priority value) “%s”\n"
 
-#: dpkg-deb/build.c:224
+#: dpkg-deb/build.c:226
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "警告，“%s”含有用戶自訂的欄位“%s”\n"
 
-#: dpkg-deb/build.c:230
+#: dpkg-deb/build.c:232
 #, c-format
 msgid "%d errors in control file"
 msgstr "主控檔案中共有 %d 個錯誤"
 
-#: dpkg-deb/build.c:241
+#: dpkg-deb/build.c:243
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb：正在建立套件“%s”，壓縮檔案為“%s”。\n"
 
-#: dpkg-deb/build.c:249
+#: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "控制目錄的的權限位階是 %03lo (必須 >=0755 且 <=0755)"
 
-#: dpkg-deb/build.c:260
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "維護者的script“%.50s”不是普通檔案或符號鏈接"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
 msgstr "維護者的script“%.50s”的權限位階是 %03lo (必須 >=0555 且 <=0775)"
 
-#: dpkg-deb/build.c:266
+#: dpkg-deb/build.c:268
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "無法擷取維護者的script檔案“%.50s”的狀態"
 
-#: dpkg-deb/build.c:276
+#: dpkg-deb/build.c:278
 msgid "empty string from fgets reading conffiles"
 msgstr "通過 fgets 讀取 conffile 時，傳回了空字元串"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "警告，conffile 的檔案名“%.50s”過長，或是缺少最後結尾的換行符號\n"
 
-#: dpkg-deb/build.c:291
+#: dpkg-deb/build.c:293
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "warning, conffile filename `%s' contains trailing white spaces\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:295
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "套件內沒有發現 conffile “%.250s”"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:297
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "無法得知 conffile “%.50s”的狀態"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:299
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "警告，conffile “%s”不是普通檔案\n"
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:304
 msgid "error reading conffiles file"
 msgstr "讀取 conffile 檔案時出錯"
 
-#: dpkg-deb/build.c:305
+#: dpkg-deb/build.c:307
 msgid "error opening conffiles file"
 msgstr "打開 conffile 檔案時出錯"
 
-#: dpkg-deb/build.c:308
+#: dpkg-deb/build.c:310
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb：總計忽視了有關主控檔案的 %d 個警告\n"
 
-#: dpkg-deb/build.c:318
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "無法關閉檔案緩衝“%.255s”"
 
-#: dpkg-deb/build.c:323
-#: dpkg-deb/build.c:396
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir 到“%.255s”失敗"
 
-#: dpkg-deb/build.c:324
+#: dpkg-deb/build.c:326
 msgid "failed to chdir to .../DEBIAN"
 msgstr "chdir 到 .../DEBIAN 失敗"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "exec tar -cf 失敗"
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:333
 msgid "failed to make tmpfile (control)"
 msgstr "建立臨時檔案(控制訊息)失敗"
 
-#: dpkg-deb/build.c:332
+#: dpkg-deb/build.c:334
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "打開臨時檔案(控制訊息)失敗，%s"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "unlink 臨時檔案(控制訊息)失敗，%s"
 
-#: dpkg-deb/build.c:343
-#: dpkg-deb/build.c:372
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "控制訊息"
 
-#: dpkg-deb/build.c:348
+#: dpkg-deb/build.c:350
 msgid "failed to fstat tmpfile (control)"
 msgstr "fstat 臨時檔案(控制訊息)失敗"
 
-#: dpkg-deb/build.c:371
+#: dpkg-deb/build.c:373
 msgid "failed to rewind tmpfile (control)"
 msgstr "跳到臨時檔案(控制訊息)的起始位置(rewind)失敗"
 
-#: dpkg-deb/build.c:379
+#: dpkg-deb/build.c:381
 msgid "failed to make tmpfile (data)"
 msgstr "建立臨時檔案(數據)失敗"
 
-#: dpkg-deb/build.c:380
+#: dpkg-deb/build.c:382
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "建立臨時檔案(數據)失敗，%s"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:385
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "unlink 臨時檔案(數據)失敗，%s"
 
-#: dpkg-deb/build.c:407
-#: dpkg-deb/extract.c:274
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "數據"
 
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:421
 msgid "failed to exec find"
 msgstr "exec find 失敗"
 
-#: dpkg-deb/build.c:430
-#: dpkg-deb/build.c:437
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "寫入檔案名稱到 tar 的管線(數據)失敗"
 
-#: dpkg-deb/build.c:451
+#: dpkg-deb/build.c:462
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "內部錯誤，未知的壓縮類型“%i”！"
 
-#: dpkg-deb/build.c:463
+#: dpkg-deb/build.c:474
 msgid "failed to rewind tmpfile (data)"
 msgstr "跳到臨時檔案(數據)的起始位置(rewind)失敗"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:475
 msgid "cat (data)"
 msgstr "cat (數據)"
 
@@ -3418,14 +3444,12 @@ msgstr "無法從 %2$.255s 讀取 %1$s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "在 %2$.255s 中讀取 %1$s 時遇到意料之外的檔案結束符號"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "檔案“%.250s”已損毀 - %.250s 的長度含有null"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "檔案 `%.250s'已損毀 - (代碼 %d)在 %s 中有無效數字"
@@ -3447,8 +3471,7 @@ msgstr "版本編號"
 msgid "between members"
 msgstr "成員之間"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr "檔案“%.250s”已損毀 - 在第一個檔案頭末尾有錯誤的\"magic\""
@@ -3480,23 +3503,22 @@ msgstr "壓縮檔案的版本編號中沒有點"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "無法識別壓縮檔案的版本 %.250s，請升級 dpkg-deb"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "忽略了 %s 中的成員數據"
 
-#: dpkg-deb/extract.c:165
+#: dpkg-deb/extract.c:169
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "檔案“%.250s”含有未知的數據成員 %.*s，取消操作"
 
-#: dpkg-deb/extract.c:171
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "檔案“%.250s”含有兩個控制成員，動作取消"
 
-#: dpkg-deb/extract.c:183
+#: dpkg-deb/extract.c:187
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3505,16 +3527,16 @@ msgstr ""
 " 新格式的 debian 套件，版本是 %s。\n"
 " 大小 %ld bytes：主控檔案=%zi bytes。\n"
 
-#: dpkg-deb/extract.c:195
+#: dpkg-deb/extract.c:199
 msgid "control information length"
 msgstr "控制訊息長度"
 
-#: dpkg-deb/extract.c:197
+#: dpkg-deb/extract.c:201
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "壓縮檔案中的控制訊息長度“%s”不合規格"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3523,15 +3545,15 @@ msgstr ""
 " 舊格式的 debian 套件，版本是 %s。\n"
 " 大小 %ld bytes：主控檔案= %zi bytes，主要檔案= %ld。\n"
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:212
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "為“ctrlarea”配制記憶體時出錯"
 
-#: dpkg-deb/extract.c:211
+#: dpkg-deb/extract.c:215
 msgid "control area"
 msgstr "控制區"
 
-#: dpkg-deb/extract.c:217
+#: dpkg-deb/extract.c:221
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3540,67 +3562,65 @@ msgstr ""
 "dpkg-deb：該檔案看上去似乎原本是一個壓縮檔案，但是由於下載它時\n"
 "dpkg-deb：使用的是 ASCII 模式，而導致了壓縮檔案受損\n"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:226
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "“%.255s”並非 debian 格式的壓縮檔案"
 
-#: dpkg-deb/extract.c:228
+#: dpkg-deb/extract.c:232
 msgid "failed getting the current file position"
 msgstr "無法取得目前的檔案位置"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:237
 msgid "failed setting the current file position"
 msgstr "無法設定目前的檔案位置"
 
-#: dpkg-deb/extract.c:242
+#: dpkg-deb/extract.c:246
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "在貼上時，無法開啟管線檔案(pipe)"
 
-#: dpkg-deb/extract.c:244
+#: dpkg-deb/extract.c:248
 msgid "failed to write to gzip -dc"
 msgstr "在寫入 gzip -dc 時，動作失敗"
 
-#: dpkg-deb/extract.c:245
+#: dpkg-deb/extract.c:249
 msgid "failed to close gzip -dc"
 msgstr "在關閉 gzip -dc 時，動作失敗"
 
-#: dpkg-deb/extract.c:252
+#: dpkg-deb/extract.c:256
 msgid "failed to syscall lseek to files archive portion"
 msgstr "當使用 lseek 系統呼叫，在跳到檔案開頭時失敗"
 
-#: dpkg-deb/extract.c:260
+#: dpkg-deb/extract.c:264
 msgid "failed to write to pipe in copy"
 msgstr "寫入複製管線出錯"
 
-#: dpkg-deb/extract.c:261
+#: dpkg-deb/extract.c:265
 msgid "failed to close pipe in copy"
 msgstr "關閉複製管線出錯"
 
-#: dpkg-deb/extract.c:282
+#: dpkg-deb/extract.c:286
 msgid "failed to create directory"
 msgstr "建立目錄失敗"
 
-#: dpkg-deb/extract.c:283
+#: dpkg-deb/extract.c:287
 msgid "failed to chdir to directory after creating it"
 msgstr "建立目錄後，chdir 到該目錄失敗"
 
-#: dpkg-deb/extract.c:285
+#: dpkg-deb/extract.c:289
 msgid "failed to chdir to directory"
 msgstr "chdir 到目錄失敗"
 
-#: dpkg-deb/extract.c:299
+#: dpkg-deb/extract.c:303
 msgid "failed to exec tar"
 msgstr "exec tar 失敗"
 
-#: dpkg-deb/extract.c:322
-#: dpkg-deb/extract.c:337
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 需要一個 .deb 檔案的檔案名稱作為參數"
 
-#: dpkg-deb/extract.c:325
+#: dpkg-deb/extract.c:329
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3609,12 +3629,12 @@ msgstr ""
 "--%s 需要一個目錄作為標的目錄。\n"
 "或許您應該使用 dpkg --install？"
 
-#: dpkg-deb/extract.c:328
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 最多能有兩個參數(分別是 .deb 檔案和目錄)"
 
-#: dpkg-deb/extract.c:339
+#: dpkg-deb/extract.c:343
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 只帶一個參數(即 .deb 檔案的檔案名)"
@@ -3768,7 +3788,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
@@ -3777,8 +3797,10 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Options:\n"
@@ -3813,7 +3835,7 @@ msgstr ""
 "輸入 dpkg-deb --help 可獲得有關操作 *.deb 檔案的幫助﹔\n"
 "輸入 dpkg --help 可獲得有關安裝和移除套件的幫助。"
 
-#: dpkg-deb/main.c:192
+#: dpkg-deb/main.c:194
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "無法識別的壓縮類型“%s”！"
@@ -3845,7 +3867,8 @@ msgstr "檔案“%.250s”已經損毀 - info 小節中發現了空字元(null)"
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "檔案“%.250s”格式的版本是“%.250s” - 您需要用更新版本的 dpkg-split 來處理它"
+msgstr ""
+"檔案“%.250s”格式的版本是“%.250s” - 您需要用更新版本的 dpkg-split 來處理它"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3892,8 +3915,7 @@ msgstr "無法 fstat 分塊檔案“%.250s”"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "檔案“%.250s”已經損毀 - 檔案過小"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "無法打開存檔的分塊檔案“%.250s”"
@@ -4012,7 +4034,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4120,8 +4143,7 @@ msgstr "--listq 不需要帶任何參數"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "在存儲目錄留下了一些垃圾檔案：\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "無法 stat “%.250s”"
@@ -4186,11 +4208,9 @@ msgstr "原始檔案“%.250s”不是普通檔案"
 msgid "unable to exec mksplit"
 msgstr "無法執行 mksplit"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:22
-#: scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:37
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
+#: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s 版本 %s。\n"
@@ -4203,11 +4223,9 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:27
-#: scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:43
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
+#: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -4236,26 +4254,22 @@ msgstr ""
 "  --help       show this help message.\n"
 "  --version    show the version.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s：警告 - 無法解鎖 %s：%s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s：無法識別的選項“%s”"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s：太多參數"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s：鎖定要編輯的目錄失敗！%s"
@@ -4265,48 +4279,40 @@ msgstr "%s：鎖定要編輯的目錄失敗！%s"
 msgid "try deleting %s"
 msgstr "嘗試刪除 %s"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:211
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
+#: scripts/update-alternatives.pl:166
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "無法開啟 %s：%s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "無法建立 %s：%s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "無法寫入 %s：%s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "無法讀取 %s：%s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "讀取完畢：%s 後，無法關閉該檔案 %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:472
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:517
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "無法關閉 %s：%s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "無法備份舊檔 %s，取消：%s"
@@ -4321,13 +4327,12 @@ msgstr "無法安裝 %s；將遺留下 %s：%s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s：無法解除 %s 鎖：%s"
 
-#: scripts/dpkg-divert.pl:12
-#: scripts/update-alternatives.pl:33
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "無法從 %s：%s 取得 ENOENT 值"
 
-#: scripts/dpkg-divert.pl:18
+#: scripts/dpkg-divert.pl:21
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4337,7 +4342,7 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-divert.pl:30
+#: scripts/dpkg-divert.pl:33
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4349,7 +4354,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4362,7 +4368,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4373,7 +4380,8 @@ msgstr ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4386,99 +4394,92 @@ msgstr ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 
-#: scripts/dpkg-divert.pl:64
-#: scripts/update-alternatives.pl:110
+#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
 #, perl-format
 msgid "two modes specified: %s and --%s"
 msgstr "指定兩種模式：%s 以及 --%s"
 
-#: scripts/dpkg-divert.pl:97
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr "--%s 需要轉移(divert-to)參數"
 
-#: scripts/dpkg-divert.pl:99
+#: scripts/dpkg-divert.pl:113
 msgid "divert-to may not contain newlines"
 msgstr "divert-to 可能不包含新的空白行"
 
-#: scripts/dpkg-divert.pl:101
+#: scripts/dpkg-divert.pl:115
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr "--%s 需要 <套件> 參數"
 
-#: scripts/dpkg-divert.pl:103
+#: scripts/dpkg-divert.pl:117
 msgid "package may not contain newlines"
 msgstr "套件可能不含有新的行數"
 
-#: scripts/dpkg-divert.pl:105
-#: scripts/dpkg-statoverride.pl:74
-#: scripts/update-alternatives.pl:152
-#: scripts/update-alternatives.pl:155
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一個<目錄名>作為參數"
 
-#: scripts/dpkg-divert.pl:108
-#: scripts/dpkg-statoverride.pl:86
-#: scripts/update-alternatives.pl:160
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:280
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "無法識別的選項“%s”"
 
-#: scripts/dpkg-divert.pl:114
+#: scripts/dpkg-divert.pl:128
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr "無法打開轉移項(diversions)檔案：%s"
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:131
 msgid "missing altname"
 msgstr "missing altname"
 
-#: scripts/dpkg-divert.pl:119
+#: scripts/dpkg-divert.pl:133
 msgid "missing package"
 msgstr "找不到套件"
 
-#: scripts/dpkg-divert.pl:125
-#: scripts/dpkg-divert.pl:153
-#: scripts/dpkg-divert.pl:195
-#: scripts/dpkg-statoverride.pl:144
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s 需要一個參數"
 
-#: scripts/dpkg-divert.pl:127
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "檔名“%s”不是唯一的"
 
-#: scripts/dpkg-divert.pl:128
-#: scripts/dpkg-statoverride.pl:118
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "檔案可能不包含新的行數"
 
-#: scripts/dpkg-divert.pl:129
+#: scripts/dpkg-divert.pl:143
 msgid "Cannot divert directories"
 msgstr "無法建立目錄的轉移項目"
 
-#: scripts/dpkg-divert.pl:138
+#: scripts/dpkg-divert.pl:152
 #, perl-format
 msgid "Leaving `%s'"
 msgstr "Leaving `%s'"
 
-#: scripts/dpkg-divert.pl:141
+#: scripts/dpkg-divert.pl:155
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr "“%s”衝突於“%s”"
 
-#: scripts/dpkg-divert.pl:147
+#: scripts/dpkg-divert.pl:161
 #, perl-format
 msgid "Adding `%s'"
 msgstr "增加“%s”"
 
-#: scripts/dpkg-divert.pl:157
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4489,7 +4490,7 @@ msgstr ""
 "發生“%s”\n"
 "轉移項目不符"
 
-#: scripts/dpkg-divert.pl:159
+#: scripts/dpkg-divert.pl:173
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4500,37 +4501,37 @@ msgstr ""
 "發生“%s”\n"
 "套件不符"
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:175
 #, perl-format
 msgid "Removing `%s'"
 msgstr "正在刪除“%s”"
 
-#: scripts/dpkg-divert.pl:176
+#: scripts/dpkg-divert.pl:190
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr "無轉移項目“%s”，所以無刪除的項目"
 
-#: scripts/dpkg-divert.pl:205
+#: scripts/dpkg-divert.pl:220
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr "內部錯誤：不正常的模式“%s”"
 
-#: scripts/dpkg-divert.pl:219
+#: scripts/dpkg-divert.pl:234
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr "無法取得舊名稱“%s”的資訊：%s"
 
-#: scripts/dpkg-divert.pl:221
+#: scripts/dpkg-divert.pl:236
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr "無法取得新名稱“%s”的資訊：%s"
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:251
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "處理“%s”時發生錯誤：%s"
 
-#: scripts/dpkg-divert.pl:241
+#: scripts/dpkg-divert.pl:256
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4539,53 +4540,52 @@ msgstr ""
 "更改“%2$s”檔名會複寫“%1$s”，\n"
 "不允許此操作"
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:266
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "更名：移除重覆的舊鏈結“%s”：%s"
 
-#: scripts/dpkg-divert.pl:253
+#: scripts/dpkg-divert.pl:268
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "更名：更名“%s”為“%s”：%s"
 
-#: scripts/dpkg-divert.pl:260
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "建立diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "寫入diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "關閉diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "移除舊有的轉移項目(diversions-old)：%s"
 
-#: scripts/dpkg-divert.pl:270
+#: scripts/dpkg-divert.pl:285
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "建立新的diversions-old：%s"
 
-#: scripts/dpkg-divert.pl:272
+#: scripts/dpkg-divert.pl:287
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "安裝新的轉移項目(diversions)：%s"
 
-#: scripts/dpkg-divert.pl:291
-#: scripts/update-alternatives.pl:662
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "內部錯誤：%s 損毀：%s"
 
-#: scripts/dpkg-statoverride.pl:24
+#: scripts/dpkg-statoverride.pl:31
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
@@ -4593,7 +4593,7 @@ msgstr ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 
-#: scripts/dpkg-statoverride.pl:35
+#: scripts/dpkg-statoverride.pl:42
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4628,107 +4628,106 @@ msgstr ""
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: scripts/dpkg-statoverride.pl:93
+#: scripts/dpkg-statoverride.pl:100
 msgid "no mode specified"
 msgstr "無指定的模式"
 
-#: scripts/dpkg-statoverride.pl:97
+#: scripts/dpkg-statoverride.pl:104
 msgid "--add needs four arguments"
 msgstr "--add 需要四個參數"
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "illegal user %s"
 msgstr "不合法的使用者 %s"
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "non-existing user %s"
 msgstr "不存在的使用者 %s"
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:121
 #, perl-format
 msgid "illegal group %s"
 msgstr "不合法的群組 %s"
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:124
 #, perl-format
 msgid "non-existing group %s"
 msgstr "不存在的群組 %s"
 
-#: scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "illegal mode %s"
 msgstr "不合法的模式%s"
 
-#: scripts/dpkg-statoverride.pl:119
-#: scripts/dpkg-statoverride.pl:146
-#: scripts/dpkg-statoverride.pl:165
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "stripping trailing /"
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:134
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr "“%s”的override已存在，"
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:136
 msgid "but --force specified so will be ignored."
 msgstr "--force 已指定，所以先前的設定會忽略。"
 
-#: scripts/dpkg-statoverride.pl:126
+#: scripts/dpkg-statoverride.pl:138
 msgid "aborting"
 msgstr "放棄"
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:149
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr "警告：--update 已指定但 %s 不存在"
 
-#: scripts/dpkg-statoverride.pl:139
+#: scripts/dpkg-statoverride.pl:151
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr "chown %s：%s 失敗"
 
-#: scripts/dpkg-statoverride.pl:140
+#: scripts/dpkg-statoverride.pl:152
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "chmod %s：%s 失敗"
 
-#: scripts/dpkg-statoverride.pl:148
+#: scripts/dpkg-statoverride.pl:160
 msgid "No override present."
 msgstr "No override present."
 
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-statoverride.pl:168
 msgid "warning: --update is useless for --remove"
 msgstr "警告：--update 已無效，請改用 --remove"
 
-#: scripts/dpkg-statoverride.pl:182
+#: scripts/dpkg-statoverride.pl:194
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "無法打開 statoverride：%s"
 
-#: scripts/dpkg-statoverride.pl:188
+#: scripts/dpkg-statoverride.pl:200
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr "“%s”出現多個強制選項(overrides)，放棄中"
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:213
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "無法打開新的 statoverride 檔案：%s"
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:220
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr "移除 statoverride-old：%s 出錯"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:222
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "建立新的 statoverride-old：%s 時出錯"
 
-#: scripts/dpkg-statoverride.pl:212
+#: scripts/dpkg-statoverride.pl:224
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr "安裝新的 statoverride：%s 時出錯"
@@ -4749,15 +4748,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4770,15 +4772,18 @@ msgstr ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4841,8 +4846,7 @@ msgstr ""
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s：缺少 %s 檔案，嘗試取得備份檔 %s。"
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s：複製 %s 並更名成 %s 時出錯，放棄中：%s"
@@ -4942,7 +4946,7 @@ msgstr "無法讀取 %s：%d"
 msgid "dbg: %s"
 msgstr "dbg: %s"
 
-#: scripts/update-alternatives.pl:39
+#: scripts/update-alternatives.pl:66
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
@@ -4952,8 +4956,8 @@ msgstr ""
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 
-#: scripts/update-alternatives.pl:51
-#, perl-format
+#: scripts/update-alternatives.pl:78
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
 "\n"
@@ -4962,22 +4966,25 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
 "\n"
-"<link> is the symlink pointing to /etc/alternatives/<name>.\n"
+"<link> is the symlink pointing to %s/<name>.\n"
 "  (e.g. /usr/bin/pager)\n"
 "<name> is the master name for this link group.\n"
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -4996,11 +5003,13 @@ msgstr ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
@@ -5011,7 +5020,8 @@ msgstr ""
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -5023,162 +5033,160 @@ msgstr ""
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 
-#: scripts/update-alternatives.pl:117
-#, perl-format
-msgid "unknown argument `%s'"
-msgstr "無法識別參數“%s”"
-
-#: scripts/update-alternatives.pl:130
-msgid "--install needs <link> <name> <path> <priority>"
-msgstr "--install 需要 <link> <name> <path> <priority>"
-
-#: scripts/update-alternatives.pl:132
-msgid "priority must be an integer"
-msgstr "優先權必須是數字"
-
-#: scripts/update-alternatives.pl:136
-#, perl-format
-msgid "--%s needs <name> <path>"
-msgstr "--%s 需要名稱<name> 路徑<path>"
-
-#: scripts/update-alternatives.pl:141
-#, perl-format
-msgid "--%s needs <name>"
-msgstr "--%s 需要 <參數>"
-
-#: scripts/update-alternatives.pl:145
-msgid "--slave needs <link> <name> <path>"
-msgstr "--slave 需有 <link> <name> <path>"
-
-#: scripts/update-alternatives.pl:147
-#, perl-format
-msgid "slave name %s duplicated"
-msgstr "次要名稱 %s 已重覆"
-
-#: scripts/update-alternatives.pl:148
-#, perl-format
-msgid "slave link %s duplicated"
-msgstr "次要鏈結 %s 已重覆"
-
-#: scripts/update-alternatives.pl:164
-#, perl-format
-msgid "name %s is both primary and slave"
-msgstr "檔名 %s 是主要也是次要"
-
-#: scripts/update-alternatives.pl:165
-#, perl-format
-msgid "link %s is both primary and slave"
-msgstr "鏈結 %s 是主要也是次要"
-
-#: scripts/update-alternatives.pl:167
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 --auto 選項"
-
-#: scripts/update-alternatives.pl:168
-msgid "--slave only allowed with --install"
-msgstr "--slave 只能搭配 --install 使用"
-
-#: scripts/update-alternatives.pl:176
+#: scripts/update-alternatives.pl:131
 msgid "manflag"
 msgstr "manflag"
 
-#: scripts/update-alternatives.pl:180
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "重複的次要 %s"
 
-#: scripts/update-alternatives.pl:183
+#: scripts/update-alternatives.pl:138
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "次要的鏈結與主要鏈結 %s 相同"
 
-#: scripts/update-alternatives.pl:184
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "重複的次要鏈結 %s"
 
-#: scripts/update-alternatives.pl:188
+#: scripts/update-alternatives.pl:143
 #, perl-format
 msgid "duplicate path %s"
 msgstr "重覆的路徑 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:149
 #, perl-format
 msgid "priority %s %s"
 msgstr "優先權 %s %s"
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
 msgstr "找不到指向 %2$s 的替換項目 %1$s。從替換項目列表中移除。"
 
-#: scripts/update-alternatives.pl:216
-#: scripts/update-alternatives.pl:265
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:168
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "無 %s 的替換檔案。"
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 狀態 %s。"
 
-#: scripts/update-alternatives.pl:221
+#: scripts/update-alternatives.pl:191
 #, perl-format
 msgid " link currently points to %s"
 msgstr "目前的鏈結指向 %s"
 
-#: scripts/update-alternatives.pl:223
+#: scripts/update-alternatives.pl:193
 msgid " link currently absent"
 msgstr "鏈結失效"
 
-#: scripts/update-alternatives.pl:225
+#: scripts/update-alternatives.pl:195
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "鏈結無法解讀 - %s"
 
-#: scripts/update-alternatives.pl:232
+#: scripts/update-alternatives.pl:199
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 優先權 %s"
 
-#: scripts/update-alternatives.pl:235
+#: scripts/update-alternatives.pl:203
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:239
+#: scripts/update-alternatives.pl:208
 msgid "No versions available."
 msgstr "無任何版本。"
 
-#: scripts/update-alternatives.pl:241
+#: scripts/update-alternatives.pl:210
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本 %s"
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:237
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr "無法識別參數“%s”"
+
+#: scripts/update-alternatives.pl:250
+msgid "--install needs <link> <name> <path> <priority>"
+msgstr "--install 需要 <link> <name> <path> <priority>"
+
+#: scripts/update-alternatives.pl:252
+msgid "priority must be an integer"
+msgstr "優先權必須是數字"
+
+#: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "--%s needs <name> <path>"
+msgstr "--%s 需要名稱<name> 路徑<path>"
+
+#: scripts/update-alternatives.pl:261
+#, perl-format
+msgid "--%s needs <name>"
+msgstr "--%s 需要 <參數>"
+
+#: scripts/update-alternatives.pl:265
+msgid "--slave needs <link> <name> <path>"
+msgstr "--slave 需有 <link> <name> <path>"
+
+#: scripts/update-alternatives.pl:267
+#, perl-format
+msgid "slave name %s duplicated"
+msgstr "次要名稱 %s 已重覆"
+
+#: scripts/update-alternatives.pl:268
+#, perl-format
+msgid "slave link %s duplicated"
+msgstr "次要鏈結 %s 已重覆"
+
+#: scripts/update-alternatives.pl:284
+#, perl-format
+msgid "name %s is both primary and slave"
+msgstr "檔名 %s 是主要也是次要"
+
+#: scripts/update-alternatives.pl:286
+#, perl-format
+msgid "link %s is both primary and slave"
+msgstr "鏈結 %s 是主要也是次要"
+
+#: scripts/update-alternatives.pl:288
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
+"--auto 選項"
+
+#: scripts/update-alternatives.pl:289
+msgid "--slave only allowed with --install"
+msgstr "--slave 只能搭配 --install 使用"
+
+#: scripts/update-alternatives.pl:342
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在設定 %s 的自選功能。"
 
-#: scripts/update-alternatives.pl:303
-#: scripts/update-alternatives.pl:305
-#: scripts/update-alternatives.pl:413
-#: scripts/update-alternatives.pl:415
-#: scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:481
-#: scripts/update-alternatives.pl:483
-#: scripts/update-alternatives.pl:485
-#: scripts/update-alternatives.pl:541
-#: scripts/update-alternatives.pl:543
-#: scripts/update-alternatives.pl:609
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
+#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
+#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
+#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
+#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
+#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "無法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:316
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5187,7 +5195,7 @@ msgstr ""
 "%s 已更動(手動更改或透過script)。\n"
 "切換成手動更新。"
 
-#: scripts/update-alternatives.pl:328
+#: scripts/update-alternatives.pl:370
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5196,69 +5204,67 @@ msgstr ""
 "檢查 %s 可安裝的版本，更新 %s 鏈結中…\n"
 "(你也可以依照自已的喜好來修改鏈結 - 請參閱“man ln”。)"
 
-#: scripts/update-alternatives.pl:334
+#: scripts/update-alternatives.pl:376
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更名 %s 鏈結，%s 更名成 %s。"
 
-#: scripts/update-alternatives.pl:337
-#: scripts/update-alternatives.pl:359
-#: scripts/update-alternatives.pl:439
-#: scripts/update-alternatives.pl:514
+#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
+#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s無法更名成%s：%s"
 
-#: scripts/update-alternatives.pl:354
+#: scripts/update-alternatives.pl:398
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要鏈結名稱 %s 已重覆"
 
-#: scripts/update-alternatives.pl:356
+#: scripts/update-alternatives.pl:400
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s 次要鏈結更名中，%s 更名為 %s"
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:415
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "移除手動選擇的替代指令 - 切換為自動模式"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:429
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替換項目 %1$s 沒有註冊，無法移除。"
 
-#: scripts/update-alternatives.pl:410
+#: scripts/update-alternatives.pl:456
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "捨棄無效的鏈結 %s(%s)。"
 
-#: scripts/update-alternatives.pl:431
+#: scripts/update-alternatives.pl:477
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 自動更新功能。"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:479
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回復成自動更新，執行“update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:483
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s 回復成更新前的狀態…"
 
-#: scripts/update-alternatives.pl:452
+#: scripts/update-alternatives.pl:498
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "無法開啟 %s 檔案以供寫入：%s"
 
-#: scripts/update-alternatives.pl:476
+#: scripts/update-alternatives.pl:521
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最後一個提供 %s(%s) 的套件已移除，刪除中。"
 
-#: scripts/update-alternatives.pl:489
+#: scripts/update-alternatives.pl:534
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5267,48 +5273,38 @@ msgstr ""
 "警告：%s可能是%s的鏈結\n"
 "(或者不存在)；讀取鏈結失敗：%s"
 
-#: scripts/update-alternatives.pl:494
-#: scripts/update-alternatives.pl:508
-#: scripts/update-alternatives.pl:528
-#: scripts/update-alternatives.pl:536
+#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "無法確認%s是否存在：%s"
 
-#: scripts/update-alternatives.pl:496
-#: scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:595
-#: scripts/update-alternatives.pl:631
-#: scripts/update-alternatives.pl:670
+#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
+#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "無法建立 %2s 的鏈結 %1s：%3s"
 
-#: scripts/update-alternatives.pl:498
-#: scripts/update-alternatives.pl:518
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:555
-#: scripts/update-alternatives.pl:597
-#: scripts/update-alternatives.pl:633
-#: scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
+#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "無法把“%s”安裝到“%s”：%s"
 
-#: scripts/update-alternatives.pl:501
-#: scripts/update-alternatives.pl:546
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Leaving %s (%s) pointing to %s."
 
-#: scripts/update-alternatives.pl:504
-#: scripts/update-alternatives.pl:549
+#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s(%s)並指向 %s。"
 
-#: scripts/update-alternatives.pl:523
+#: scripts/update-alternatives.pl:568
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5317,14 +5313,13 @@ msgstr ""
 "警告：%s可能是%s的次要鏈結\n"
 "，或者不存在；讀取鏈結失敗：%s"
 
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:606
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:688
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s(%s)中，不適用於%s。"
 
-#: scripts/update-alternatives.pl:563
+#: scripts/update-alternatives.pl:608
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5333,7 +5328,7 @@ msgstr ""
 "只有一個程式提供 %s\n"
 "(%s)。無須做任何設定。\n"
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:613
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5346,49 +5341,57 @@ msgstr ""
 "  可使用的替換項目\n"
 "===========================\n"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:623
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "按下 enter 來指定預設選項[*]，或者輸入選擇的號碼："
 
-#: scripts/update-alternatives.pl:592
-#: scripts/update-alternatives.pl:629
+#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "以“%1s”取代 “%2s”"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:673
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替換檔案“%s”。"
 
-#: scripts/update-alternatives.pl:650
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "%s寫入錯誤"
 
-#: scripts/update-alternatives.pl:652
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines prohibited in update-alternatives files (%s)"
 
-#: scripts/update-alternatives.pl:657
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：發生錯誤或是讀到檔案%1$s尾端(%3$s)"
 
-#: scripts/update-alternatives.pl:658
+#: scripts/update-alternatives.pl:704
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在%s後沒有發現換行字元"
 
-#: scripts/update-alternatives.pl:678
+#: scripts/update-alternatives.pl:724
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "嚴重的問題：%s"
 
+#~ msgid "%s: failed to exec gzip -dc"
+#~ msgstr "%s：執行 gzip -dc 失敗"
+
+#~ msgid "%s: failed to exec bzip2 -dc"
+#~ msgstr "%s：執行 bzip2 -dc 失敗"
+
+#~ msgid "%s: failed to exec bzip2 %s"
+#~ msgstr "%s：執行 bzip2 %s 失敗"
+
 #~ msgid "unable to create %.250s"
 #~ msgstr "無法建立 %.250s"
+
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
 #~ msgstr "“%s”欄位，於“%.255s”：版本號含有“·”"
 
@@ -5445,6 +5448,7 @@ msgstr "嚴重的問題：%s"
 #, fuzzy
 #~ msgid "unable to install %s as %s"
 #~ msgstr "無法把“%.250s”安裝到“%.250s”"
+
 #~ msgid "version a has bad syntax: %s\n"
 #~ msgstr "左側的版本號有語法錯誤：%s\n"
 
@@ -5602,22 +5606,31 @@ msgstr "嚴重的問題：%s"
 #~ " < << <= = >= >> >       (僅僅是為了與控制檔案的語法相容)。\n"
 #~ "\n"
 #~ "“dselect”提供了更容易使用的套件管理工具。\n"
+
 #~ msgid "  Package "
 #~ msgstr "  套件 "
+
 #~ msgid " which provides "
 #~ msgstr " 提供了 "
+
 #~ msgid " is to be removed.\n"
 #~ msgstr " 即將被刪除。\n"
+
 #~ msgid "  Version of "
 #~ msgstr "  系統裡的 "
+
 #~ msgid " on system is "
 #~ msgstr " 的版本是 "
+
 #~ msgid " is not installed.\n"
 #~ msgstr "還沒有被安裝。\n"
+
 #~ msgid " to: %s\n"
 #~ msgstr " 轉移檔案現指向：%s\n"
+
 #~ msgid "fgetpos failed"
 #~ msgstr "fgetpos 失敗"
+
 #~ msgid "fsetpos failed"
 #~ msgstr "fsetpos 失敗"
 
@@ -5739,4 +5752,3 @@ msgstr "嚴重的問題：%s"
 #~ "          --msdos                 (生成 8.3 的檔案名)\n"
 #~ "\n"
 #~ "返回碼: 0 = OK;  1 = -a 不是一個分塊;  2 = 出錯了！\n"
-
diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index 96fef406..514f3307 100644
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-21  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+
 2006-12-04  Jordi Mallach  <jordi@debian.org>
 
 	* ca.po: Fix typo.
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index d912ae40..998be271 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: 2006-06-21 07:29+0300\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\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"
@@ -16,219 +16,229 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: scripts/controllib.pl:64 scripts/controllib.pl:67
+#: scripts/822-date.pl:13
+msgid "Usage: 822-date"
+msgstr ""
+
+#: scripts/822-date.pl:15
+msgid "This program is deprecated. Please use 'date -R' instead."
+msgstr ""
+
+#: scripts/controllib.pl:63 scripts/controllib.pl:68
 #, perl-format
 msgid "unable to get login information for username \"%s\""
 msgstr "no s'ha pogut obtenir la informació d'entrada per a l'usuari «%s»"
 
-#: scripts/controllib.pl:69
+#: scripts/controllib.pl:71
 #, perl-format
 msgid ""
 "no utmp entry available and LOGNAME not defined; using uid of process (%d)"
-msgstr "no hi ha una entrada utmp disponible i LOGNAME no està definit; s'utilitzarà l'uid del procés (%d)"
+msgstr ""
+"no hi ha una entrada utmp disponible i LOGNAME no està definit; s'utilitzarà "
+"l'uid del procés (%d)"
 
-#: scripts/controllib.pl:71
+#: scripts/controllib.pl:74
 #, perl-format
 msgid "unable to get login information for uid %d"
 msgstr "no es pot obtenir la informació d'entrada per a l'uid %d"
 
-#: scripts/controllib.pl:146
+#: scripts/controllib.pl:153
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:152
+#: scripts/controllib.pl:159
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "la variable de substitució ${%s} és desconeguda"
 
-#: scripts/controllib.pl:169
+#: scripts/controllib.pl:179
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:170
+#: scripts/controllib.pl:180
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:171
+#: scripts/controllib.pl:181
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:178
+#: scripts/controllib.pl:188
 msgid "write error on control data"
 msgstr ""
 
-#: scripts/controllib.pl:181
+#: scripts/controllib.pl:191
 msgid "write error on close control data"
 msgstr ""
 
-#: scripts/controllib.pl:187
+#: scripts/controllib.pl:199
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:189
+#: scripts/controllib.pl:202
 #, perl-format
 msgid "control file %s"
 msgstr ""
 
-#: scripts/controllib.pl:190
+#: scripts/controllib.pl:203
 msgid "control file must have at least one binary package part"
 msgstr ""
 
-#: scripts/controllib.pl:194
+#: scripts/controllib.pl:207
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 
-#: scripts/controllib.pl:199
+#: scripts/controllib.pl:212
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 
-#: scripts/controllib.pl:214
+#: scripts/controllib.pl:229
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr ""
 
-#: scripts/controllib.pl:220
+#: scripts/controllib.pl:235
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:271
+#: scripts/controllib.pl:286
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr ""
 
-#: scripts/controllib.pl:296
+#: scripts/controllib.pl:313
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:305 scripts/dpkg-genchanges.pl:236
-#: scripts/dpkg-gencontrol.pl:180 scripts/dpkg-source.pl:261
+#: scripts/controllib.pl:316 scripts/dpkg-genchanges.pl:238
+#: scripts/dpkg-gencontrol.pl:183 scripts/dpkg-source.pl:263
 msgid "parsed version of changelog"
 msgstr ""
 
-#: scripts/controllib.pl:306
+#: scripts/controllib.pl:318
 msgid "parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:328
+#: scripts/controllib.pl:353
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:330
+#: scripts/controllib.pl:355
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 
-#: scripts/controllib.pl:336
+#: scripts/controllib.pl:361
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:343
+#: scripts/controllib.pl:370
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
-#: scripts/controllib.pl:352
+#: scripts/controllib.pl:379
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:375
+#: scripts/controllib.pl:402
 msgid "continued value line not in field"
 msgstr ""
 
-#: scripts/controllib.pl:378
+#: scripts/controllib.pl:405
 msgid "expected blank line before PGP signature"
 msgstr ""
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:417
 msgid "expected PGP signature, found EOF after blank line"
 msgstr ""
 
-#: scripts/controllib.pl:391
+#: scripts/controllib.pl:420
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:396
+#: scripts/controllib.pl:425
 msgid "found several `paragraphs' where only one expected"
 msgstr ""
 
-#: scripts/controllib.pl:400
+#: scripts/controllib.pl:429
 msgid "line with unknown format (not field-colon-value)"
 msgstr ""
 
-#: scripts/controllib.pl:403
+#: scripts/controllib.pl:432
 msgid "found start of PGP body but no signature"
 msgstr ""
 
-#: scripts/controllib.pl:405
+#: scripts/controllib.pl:434
 msgid "empty file"
 msgstr ""
 
-#: scripts/controllib.pl:411
+#: scripts/controllib.pl:440
 #, perl-format
 msgid "unknown information field `%s' in input data in %s"
 msgstr ""
 
-#: scripts/controllib.pl:415
+#: scripts/controllib.pl:444
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
-#: scripts/controllib.pl:418
+#: scripts/controllib.pl:447
 #, perl-format
 msgid "%s: failure: %s"
 msgstr ""
 
-#: scripts/controllib.pl:419
+#: scripts/controllib.pl:448
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:449
 #, perl-format
 msgid "%s: error: %s"
 msgstr "%s: error: %s"
 
-#: scripts/controllib.pl:421
+#: scripts/controllib.pl:450
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr "%s: error intern: %s"
 
-#: scripts/controllib.pl:422
+#: scripts/controllib.pl:451
 #, perl-format
 msgid "%s: warning: %s"
 msgstr "%s: avís: %s"
 
-#: scripts/controllib.pl:434
+#: scripts/controllib.pl:464
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr ""
 
-#: scripts/controllib.pl:437
+#: scripts/controllib.pl:467
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr ""
 
-#: scripts/controllib.pl:440
+#: scripts/controllib.pl:470
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:34 scripts/dpkg-distaddfile.pl:18
 #: scripts/dpkg-genchanges.pl:35 scripts/dpkg-gencontrol.pl:22
-#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:65
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:36
-#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:26
+#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:69
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:37
+#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:25
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -245,13 +255,16 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:40 scripts/dpkg-distaddfile.pl:23
 #: scripts/dpkg-genchanges.pl:41 scripts/dpkg-gencontrol.pl:28
-#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:43
-#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:30
+#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:44
+#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:29
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
-msgstr "\nAquest és programari lliure; vegeu la Llicència Pública General GNU versió 2 o posterior per a les condicions de còpia. NO hi ha garantia.\n"
+msgstr ""
+"\n"
+"Aquest és programari lliure; vegeu la Llicència Pública General GNU versió 2 "
+"o posterior per a les condicions de còpia. NO hi ha garantia.\n"
 
 #: scripts/dpkg-architecture.pl:48
 #, perl-format
@@ -298,8 +311,8 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:228 scripts/dpkg-distaddfile.pl:51
 #: scripts/dpkg-genchanges.pl:130 scripts/dpkg-gencontrol.pl:102
-#: scripts/dpkg-shlibdeps.pl:95 scripts/dpkg-source.pl:170
-#: scripts/changelog/debian.pl:59
+#: scripts/dpkg-shlibdeps.pl:102 scripts/dpkg-source.pl:170
+#: scripts/changelog/debian.pl:58
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -331,7 +344,7 @@ msgstr ""
 msgid "%s is not a supported variable name"
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:17
+#: scripts/dpkg-checkbuilddeps.pl:18
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] [<control-file>]\n"
@@ -339,30 +352,34 @@ msgid ""
 "Options:\n"
 "  control-file   control file to process (default: debian/control).\n"
 "  -B             binary-only, ignore -Indep.\n"
+"  --admindir=<directory>\n"
+"                 change the administrative directory.\n"
 "  -h             show this help message.\n"
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:69
+#: scripts/dpkg-checkbuilddeps.pl:74
 #, perl-format
 msgid "%s: Unmet build dependencies: "
 msgstr "%s: Dependències de construcció no satisfetes: "
 
-#: scripts/dpkg-checkbuilddeps.pl:73
+#: scripts/dpkg-checkbuilddeps.pl:78
 #, perl-format
 msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
-#: scripts/dpkg-checkbuilddeps.pl:146 scripts/dpkg-gencontrol.pl:199
-#: scripts/dpkg-source.pl:208
+#: scripts/dpkg-checkbuilddeps.pl:151 scripts/dpkg-gencontrol.pl:202
+#: scripts/dpkg-source.pl:210
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "s'ha produït un error en analitzar %s"
 
-#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:28
+#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:27
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson."
-msgstr "\nCopyright © 1996 Ian Jackson."
+msgstr ""
+"\n"
+"Copyright © 1996 Ian Jackson."
 
 #: scripts/dpkg-distaddfile.pl:31
 #, perl-format
@@ -383,27 +400,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:256
+#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:259
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:259
+#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:262
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:271
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:275
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:280
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:283
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:284
 msgid "close new files list file"
 msgstr ""
 
@@ -476,127 +493,132 @@ msgstr ""
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:181 scripts/dpkg-gencontrol.pl:134
-#: scripts/dpkg-source.pl:213
+#: scripts/dpkg-genchanges.pl:183 scripts/dpkg-gencontrol.pl:137
+#: scripts/dpkg-source.pl:215
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:188
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:223 scripts/dpkg-gencontrol.pl:165
-#: scripts/dpkg-source.pl:248
+#: scripts/dpkg-genchanges.pl:225 scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-source.pl:250
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:240 scripts/dpkg-gencontrol.pl:184
-#: scripts/dpkg-source.pl:265
+#: scripts/dpkg-genchanges.pl:242 scripts/dpkg-gencontrol.pl:187
+#: scripts/dpkg-source.pl:267
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:247
+#: scripts/dpkg-genchanges.pl:249
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:258
+#: scripts/dpkg-genchanges.pl:260
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:264
+#: scripts/dpkg-genchanges.pl:266
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:265
+#: scripts/dpkg-genchanges.pl:267
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:270
+#: scripts/dpkg-genchanges.pl:272
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:279
+#: scripts/dpkg-genchanges.pl:281
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:281
+#: scripts/dpkg-genchanges.pl:283
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:285 scripts/dpkg-source.pl:610
-#: scripts/dpkg-source.pl:640
+#: scripts/dpkg-genchanges.pl:287 scripts/dpkg-source.pl:613
+#: scripts/dpkg-source.pl:643
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-source.pl:677
+#: scripts/dpkg-genchanges.pl:290 scripts/dpkg-source.pl:644
+#, perl-format
+msgid "source control file %s"
+msgstr "fitxer de control font %s"
+
+#: scripts/dpkg-genchanges.pl:296 scripts/dpkg-source.pl:680
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:302
+#: scripts/dpkg-genchanges.pl:305
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-genchanges.pl:309
 msgid "Ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:311
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:311
+#: scripts/dpkg-genchanges.pl:314
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:315
+#: scripts/dpkg-genchanges.pl:318
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:336
+#: scripts/dpkg-genchanges.pl:339
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:337
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:341
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:344
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:344
+#: scripts/dpkg-genchanges.pl:347
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:359 scripts/dpkg-source.pl:273
+#: scripts/dpkg-genchanges.pl:362 scripts/dpkg-source.pl:275
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:363 scripts/dpkg-gencontrol.pl:220
-#: scripts/dpkg-gencontrol.pl:223 scripts/dpkg-source.pl:276
+#: scripts/dpkg-genchanges.pl:366 scripts/dpkg-gencontrol.pl:223
+#: scripts/dpkg-gencontrol.pl:226 scripts/dpkg-source.pl:278
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -647,55 +669,55 @@ msgstr "el paquet %s no és a la informació de control"
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:151
+#: scripts/dpkg-gencontrol.pl:154
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:157
+#: scripts/dpkg-gencontrol.pl:160
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:235
+#: scripts/dpkg-gencontrol.pl:238
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:237
+#: scripts/dpkg-gencontrol.pl:240
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:238
+#: scripts/dpkg-gencontrol.pl:241
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:241
+#: scripts/dpkg-gencontrol.pl:244
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:242
+#: scripts/dpkg-gencontrol.pl:245
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:270
+#: scripts/dpkg-gencontrol.pl:273
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:285
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:288
+#: scripts/dpkg-gencontrol.pl:291
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:293
+#: scripts/dpkg-gencontrol.pl:298
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -766,10 +788,10 @@ msgstr ""
 msgid "cannot exec format parser: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:71
+#: scripts/dpkg-scanpackages.pl:75
 #, perl-format
 msgid ""
-"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > "
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > "
 "Packages\n"
 "\n"
 "Options:\n"
@@ -780,119 +802,123 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:97
+#: scripts/dpkg-scanpackages.pl:92
 #, perl-format
-msgid "Binary dir %s not found"
+msgid "Override file %s not found"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:99
+#: scripts/dpkg-scanpackages.pl:98
 #, perl-format
-msgid "Override file %s not found"
+msgid "Couldn't open override file %s: %s"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:124
+#, perl-format
+msgid " * Unconditional maintainer override for %s *"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:140 scripts/dpkg-scansources.pl:507
+msgid "1 to 3 args expected\n"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:162
+#, perl-format
+msgid "Binary dir %s not found"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:116
+#: scripts/dpkg-scanpackages.pl:180
 #, perl-format
 msgid "Couldn't open %s for reading: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:124
+#: scripts/dpkg-scanpackages.pl:188
 #, perl-format
 msgid "Couldn't call dpkg-deb on %s: %s, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:128
+#: scripts/dpkg-scanpackages.pl:192
 #, perl-format
 msgid "`dpkg-deb -I %s control' exited with %d, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:142
+#: scripts/dpkg-scanpackages.pl:206
 #, perl-format
 msgid ""
 "Unprocessed text from %s control file; info:\n"
 "%s / %s\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:145
+#: scripts/dpkg-scanpackages.pl:209
 #, perl-format
 msgid "No Package field in control file of %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:152
+#: scripts/dpkg-scanpackages.pl:216
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat but newer version;\n"
 "   used that one and ignored data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:158
+#: scripts/dpkg-scanpackages.pl:222
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat;\n"
 "   ignored that one and using data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:165
+#: scripts/dpkg-scanpackages.pl:229
 #, perl-format
 msgid " ! Package %s (filename %s) has Filename field!\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:171
+#: scripts/dpkg-scanpackages.pl:235
 #, perl-format
 msgid "`md5sum < %s' exited with %d"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:172
+#: scripts/dpkg-scanpackages.pl:236
 #, perl-format
 msgid "Strange text from `md5sum < %s': `%s'"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:175
+#: scripts/dpkg-scanpackages.pl:239
 #, perl-format
 msgid "Couldn't stat %s: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:176
+#: scripts/dpkg-scanpackages.pl:240
 #, perl-format
 msgid "%s is empty"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:210
-#, perl-format
-msgid "Couldn't open override file %s: %s"
-msgstr ""
-
-#: scripts/dpkg-scanpackages.pl:232
-#, perl-format
-msgid " * Unconditional maintainer override for %s *"
-msgstr ""
-
-#: scripts/dpkg-scanpackages.pl:258
+#: scripts/dpkg-scanpackages.pl:284
 #, perl-format
 msgid "Failed when writing stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:261
+#: scripts/dpkg-scanpackages.pl:287
 #, perl-format
 msgid "Couldn't close stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:265
+#: scripts/dpkg-scanpackages.pl:291
 msgid "** Packages in archive but missing from override file: **"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:269
+#: scripts/dpkg-scanpackages.pl:295
 msgid " ++ Packages in override file with incorrect old maintainer value: ++"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:275
+#: scripts/dpkg-scanpackages.pl:301
 msgid " -- Packages specifying same maintainer as override file: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:281
+#: scripts/dpkg-scanpackages.pl:307
 msgid " -- Packages in override file but not in archive: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:286
+#: scripts/dpkg-scanpackages.pl:312
 #, perl-format
 msgid " Wrote %s entries to output Packages file."
 msgstr ""
@@ -1042,11 +1068,7 @@ msgstr ""
 msgid "no binary packages specified in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:507
-msgid "1 to 3 args expected\n"
-msgstr ""
-
-#: scripts/dpkg-shlibdeps.pl:38
+#: scripts/dpkg-shlibdeps.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1054,7 +1076,7 @@ msgid ""
 "Copyright (C) 2006 Frank Lichtenheld."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:51
+#: scripts/dpkg-shlibdeps.pl:52
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1070,6 +1092,7 @@ msgid ""
 "  -L<localshlibsfile>      shlibs override file, not debian/shlibs.local.\n"
 "  -T<varlistfile>          update variables here, not debian/substvars.\n"
 "  -t<type>                 set package type (default is deb).\n"
+"  --admindir=<directory>   change the administrative directory.\n"
 "  -h, --help               show this help message.\n"
 "      --version            show the version.\n"
 "\n"
@@ -1077,129 +1100,134 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:89
+#: scripts/dpkg-shlibdeps.pl:91
+#, perl-format
+msgid "administrative directory '%s' does not exist"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:96
 #, perl-format
 msgid "unrecognised dependency field `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:101
+#: scripts/dpkg-shlibdeps.pl:110
 msgid "need at least one executable"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:104
+#: scripts/dpkg-shlibdeps.pl:113
 #, perl-format
 msgid "unable to open '%s' for test"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:107
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid "unable to read first four bytes of '%s' as magic number"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:120
+#: scripts/dpkg-shlibdeps.pl:129
 #, perl-format
 msgid "unrecognized file type for '%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:155
+#: scripts/dpkg-shlibdeps.pl:165
 #, perl-format
 msgid "couldn't open /etc/ld.so.conf: %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:173 scripts/dpkg-shlibdeps.pl:331
+#: scripts/dpkg-shlibdeps.pl:183 scripts/dpkg-shlibdeps.pl:341
 msgid "cannot fork for objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:176 scripts/dpkg-shlibdeps.pl:334
+#: scripts/dpkg-shlibdeps.pl:186 scripts/dpkg-shlibdeps.pl:344
 msgid "cannot exec objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:195
+#: scripts/dpkg-shlibdeps.pl:205
 #, perl-format
 msgid "format of `NEEDED %s' not recognized"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:201 scripts/dpkg-shlibdeps.pl:343
+#: scripts/dpkg-shlibdeps.pl:211 scripts/dpkg-shlibdeps.pl:353
 #, perl-format
 msgid "objdump on `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:263
+#: scripts/dpkg-shlibdeps.pl:273
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:269
+#: scripts/dpkg-shlibdeps.pl:279
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:274
+#: scripts/dpkg-shlibdeps.pl:284
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:275
+#: scripts/dpkg-shlibdeps.pl:285
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:279
+#: scripts/dpkg-shlibdeps.pl:289
 #, perl-format
 msgid "unknown output from dpkg --search: `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:302
+#: scripts/dpkg-shlibdeps.pl:312
 #, perl-format
 msgid "could not find any packages for %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:312
+#: scripts/dpkg-shlibdeps.pl:322
 #, perl-format
 msgid ""
 "unable to find dependency information for shared library %s (soname %s, path "
 "%s, dependency field %s)"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:353
+#: scripts/dpkg-shlibdeps.pl:363
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:360
+#: scripts/dpkg-shlibdeps.pl:370
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:395
+#: scripts/dpkg-shlibdeps.pl:405
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:398
+#: scripts/dpkg-shlibdeps.pl:408
 #, perl-format
 msgid "chown of `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:405
+#: scripts/dpkg-shlibdeps.pl:415
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:408
+#: scripts/dpkg-shlibdeps.pl:418
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:423
+#: scripts/dpkg-shlibdeps.pl:433
 msgid "write output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:427
+#: scripts/dpkg-shlibdeps.pl:437
 msgid "write userdef output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:429
+#: scripts/dpkg-shlibdeps.pl:439
 msgid "close output"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:432
+#: scripts/dpkg-shlibdeps.pl:442
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
@@ -1286,841 +1314,837 @@ msgstr ""
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:231
+#: scripts/dpkg-source.pl:233
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:233
+#: scripts/dpkg-source.pl:235
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:278
+#: scripts/dpkg-source.pl:280
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:294
+#: scripts/dpkg-source.pl:296
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:300
+#: scripts/dpkg-source.pl:302
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.gz)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:306
+#: scripts/dpkg-source.pl:308
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:316
 #, 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:321
+#: scripts/dpkg-source.pl:323
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:324
+#: scripts/dpkg-source.pl:326
 #, perl-format
 msgid "unable to stat putative packed orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:326
+#: scripts/dpkg-source.pl:328
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:329
+#: scripts/dpkg-source.pl:331
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:335
+#: scripts/dpkg-source.pl:337
 #, perl-format
 msgid "source directory `%s' is not <sourcepackage>-<upstreamversion> `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:343
+#: scripts/dpkg-source.pl:345
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:350
+#: scripts/dpkg-source.pl:352
 #, perl-format
 msgid ""
 ".orig.tar.gz name %s is not <package>_<upstreamversion>.orig.tar.gz (wanted %"
 "s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:361
+#: scripts/dpkg-source.pl:363
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:364
+#: scripts/dpkg-source.pl:366
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:367 scripts/dpkg-source.pl:432
-#: scripts/dpkg-source.pl:576
+#: scripts/dpkg-source.pl:369 scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:578
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s: s'està construint %s a %s"
 
-#: scripts/dpkg-source.pl:369
+#: scripts/dpkg-source.pl:371
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:373
+#: scripts/dpkg-source.pl:375
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:375
+#: scripts/dpkg-source.pl:377
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:376
+#: scripts/dpkg-source.pl:378
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:378
+#: scripts/dpkg-source.pl:380
 msgid "exec tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:382
+#: scripts/dpkg-source.pl:384
 msgid "wait for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:385 scripts/dpkg-source.pl:539
+#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
+#: scripts/dpkg-source.pl:389 scripts/dpkg-source.pl:543
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:391
+#: scripts/dpkg-source.pl:393
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:393
+#: scripts/dpkg-source.pl:395
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:403
+#: scripts/dpkg-source.pl:405
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:409
+#: scripts/dpkg-source.pl:411
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:418 scripts/dpkg-source.pl:748
+#: scripts/dpkg-source.pl:420 scripts/dpkg-source.pl:751
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:422 scripts/dpkg-source.pl:729
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:424 scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:757
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:426 scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:428 scripts/dpkg-source.pl:759
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:436
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:439
+#: scripts/dpkg-source.pl:441
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:441
+#: scripts/dpkg-source.pl:443
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:444
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:451
+#: scripts/dpkg-source.pl:453
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:459
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:459
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:460 scripts/dpkg-source.pl:461
+#: scripts/dpkg-source.pl:462 scripts/dpkg-source.pl:463
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:465 scripts/dpkg-source.pl:526
+#: scripts/dpkg-source.pl:467 scripts/dpkg-source.pl:528
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid "executable mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:472
+#: scripts/dpkg-source.pl:474
 #, perl-format
 msgid "special mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:477 scripts/dpkg-source.pl:1269
+#: scripts/dpkg-source.pl:479 scripts/dpkg-source.pl:1275
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:478
+#: scripts/dpkg-source.pl:480
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:481
+#: scripts/dpkg-source.pl:483
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:489
+#: scripts/dpkg-source.pl:491
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:496
+#: scripts/dpkg-source.pl:498
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:501
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:505
+#: scripts/dpkg-source.pl:507
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:507
+#: scripts/dpkg-source.pl:509
 msgid "failed to write to gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:512
+#: scripts/dpkg-source.pl:514
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:515
+#: scripts/dpkg-source.pl:517
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:521
+#: scripts/dpkg-source.pl:523
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:530
 msgid "not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:529
+#: scripts/dpkg-source.pl:531
 msgid "directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:534
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:536
+#: scripts/dpkg-source.pl:538
 msgid "finish write to gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:543
+#: scripts/dpkg-source.pl:545
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:545
+#: scripts/dpkg-source.pl:547
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:546
+#: scripts/dpkg-source.pl:548
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:554
+#: scripts/dpkg-source.pl:556
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:556
+#: scripts/dpkg-source.pl:558
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:558
+#: scripts/dpkg-source.pl:560
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:562
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:562
+#: scripts/dpkg-source.pl:564
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:563 scripts/dpkg-source.pl:1265
+#: scripts/dpkg-source.pl:565 scripts/dpkg-source.pl:1271
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:578
+#: scripts/dpkg-source.pl:580
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:579
+#: scripts/dpkg-source.pl:581
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:583
+#: scripts/dpkg-source.pl:586
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/dpkg-source.pl:585
+#: scripts/dpkg-source.pl:588
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:597
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:596
+#: scripts/dpkg-source.pl:599
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:597
+#: scripts/dpkg-source.pl:600
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:604
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:606
+#: scripts/dpkg-source.pl:609
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:630
+#: scripts/dpkg-source.pl:633
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:634
+#: scripts/dpkg-source.pl:637
 #, 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"
+msgstr ""
+"no s'ha pogut verificar la signatura de %s perquè gpg no està instal·lat"
 
-#: scripts/dpkg-source.pl:637
+#: scripts/dpkg-source.pl:640
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "s'està extraient el paquet font sense signar (%s)"
 
-#: scripts/dpkg-source.pl:641
-#, perl-format
-msgid "source control file %s"
-msgstr "fitxer de control font %s"
-
-#: scripts/dpkg-source.pl:646
+#: scripts/dpkg-source.pl:649
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:655
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:681
+#: scripts/dpkg-source.pl:684
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:689
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:699
+#: scripts/dpkg-source.pl:702
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:706
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:709
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:707
+#: scripts/dpkg-source.pl:710
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:713
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:712
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:716
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:722
+#: scripts/dpkg-source.pl:725
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: s'està extraient %s a %s"
 
-#: scripts/dpkg-source.pl:724
+#: scripts/dpkg-source.pl:727
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:750
+#: scripts/dpkg-source.pl:753
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s: s'està desempaquetant %s"
 
-#: scripts/dpkg-source.pl:764
+#: scripts/dpkg-source.pl:767
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:767
+#: scripts/dpkg-source.pl:770
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:783
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:814 scripts/dpkg-source.pl:870
+#: scripts/dpkg-source.pl:817 scripts/dpkg-source.pl:873
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:819
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:819
+#: scripts/dpkg-source.pl:822
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:828
+#: scripts/dpkg-source.pl:831
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:833
+#: scripts/dpkg-source.pl:836
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:837
+#: scripts/dpkg-source.pl:840
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s: s'està aplicant %s"
 
-#: scripts/dpkg-source.pl:842 scripts/dpkg-source.pl:1145
+#: scripts/dpkg-source.pl:845 scripts/dpkg-source.pl:1149
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:845
+#: scripts/dpkg-source.pl:848
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:847
+#: scripts/dpkg-source.pl:850
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:848
+#: scripts/dpkg-source.pl:851
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:852
+#: scripts/dpkg-source.pl:855
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:855
+#: scripts/dpkg-source.pl:858
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:864
+#: scripts/dpkg-source.pl:867
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:866
+#: scripts/dpkg-source.pl:869
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:871
+#: scripts/dpkg-source.pl:874
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:874
+#: scripts/dpkg-source.pl:877
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:876
+#: scripts/dpkg-source.pl:879
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:880
+#: scripts/dpkg-source.pl:883
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:889
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:895
+#: scripts/dpkg-source.pl:898
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:899
+#: scripts/dpkg-source.pl:902
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:909
+#: scripts/dpkg-source.pl:913
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:910
+#: scripts/dpkg-source.pl:914
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:911
+#: scripts/dpkg-source.pl:915
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:918
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:915
+#: scripts/dpkg-source.pl:919
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:922
+#: scripts/dpkg-source.pl:926
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:932
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:930
+#: scripts/dpkg-source.pl:934
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:948
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:948
+#: scripts/dpkg-source.pl:952
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:950
+#: scripts/dpkg-source.pl:954
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:968
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:972
+#: scripts/dpkg-source.pl:976
 #, 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:980
+#: scripts/dpkg-source.pl:984
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:989
+#: scripts/dpkg-source.pl:993
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:996
+#: scripts/dpkg-source.pl:1000
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1024
+#: scripts/dpkg-source.pl:1028
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1028
+#: scripts/dpkg-source.pl:1032
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1029
+#: scripts/dpkg-source.pl:1033
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1039
+#: scripts/dpkg-source.pl:1043
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1046
+#: scripts/dpkg-source.pl:1050
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1056
+#: scripts/dpkg-source.pl:1060
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1079
+#: scripts/dpkg-source.pl:1083
 #, perl-format
 msgid "filename `%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1086
+#: scripts/dpkg-source.pl:1090
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1095
+#: scripts/dpkg-source.pl:1099
 #, perl-format
 msgid "tarfile `%s' contains object with/../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1104
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1104
+#: scripts/dpkg-source.pl:1108
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1109
+#: scripts/dpkg-source.pl:1113
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1122
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1157 scripts/dpkg-source.pl:1194
-#: scripts/dpkg-source.pl:1203
+#: scripts/dpkg-source.pl:1161 scripts/dpkg-source.pl:1198
+#: scripts/dpkg-source.pl:1207
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1158
+#: scripts/dpkg-source.pl:1162
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1161
+#: scripts/dpkg-source.pl:1165
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1163
+#: scripts/dpkg-source.pl:1167
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1167
+#: scripts/dpkg-source.pl:1171
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1171 scripts/dpkg-source.pl:1177
+#: scripts/dpkg-source.pl:1175 scripts/dpkg-source.pl:1181
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1185
+#: scripts/dpkg-source.pl:1189
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1187
+#: scripts/dpkg-source.pl:1191
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diff aplica pedaços al fitxer %s dues vegades"
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1201
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1202
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1208
+#: scripts/dpkg-source.pl:1212
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1211
+#: scripts/dpkg-source.pl:1215
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1221
+#: scripts/dpkg-source.pl:1225
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1223
+#: scripts/dpkg-source.pl:1227
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1225
+#: scripts/dpkg-source.pl:1229
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1226
+#: scripts/dpkg-source.pl:1230
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1229
+#: scripts/dpkg-source.pl:1233
 msgid "wait for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1233
+#: scripts/dpkg-source.pl:1237
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1239
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1238 scripts/dpkg-source.pl:1247
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1242 scripts/dpkg-source.pl:1251
+#: scripts/dpkg-source.pl:1256
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1243
+#: scripts/dpkg-source.pl:1247
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1260
+#: scripts/dpkg-source.pl:1264
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1267
+#: scripts/dpkg-source.pl:1273
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1275
+#: scripts/dpkg-source.pl:1281
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1280
+#: scripts/dpkg-source.pl:1286
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1282 scripts/dpkg-source.pl:1291
+#: scripts/dpkg-source.pl:1288 scripts/dpkg-source.pl:1297
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1287
+#: scripts/dpkg-source.pl:1293
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2128,80 +2152,85 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1296
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid "create file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1297
+#: scripts/dpkg-source.pl:1303
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1298
+#: scripts/dpkg-source.pl:1304
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1300
+#: scripts/dpkg-source.pl:1306
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1301
+#: scripts/dpkg-source.pl:1307
 msgid "reopen tar.gz"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1302
+#: scripts/dpkg-source.pl:1308
 msgid "exec gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1311
+#: scripts/dpkg-source.pl:1325
+#, fuzzy, perl-format
+msgid "unknown compression type on file %s"
+msgstr "la variable de substitució ${%s} és desconeguda"
+
+#: scripts/dpkg-source.pl:1328
 #, perl-format
 msgid "read file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1312
+#: scripts/dpkg-source.pl:1329
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1330
 #, perl-format
 msgid "fork for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1315
+#: scripts/dpkg-source.pl:1332
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1316
+#: scripts/dpkg-source.pl:1333
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1317
+#: scripts/dpkg-source.pl:1334
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1324
+#: scripts/dpkg-source.pl:1341
 msgid "wait for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1334
+#: scripts/dpkg-source.pl:1351
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1335
+#: scripts/dpkg-source.pl:1352
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1356
+#: scripts/dpkg-source.pl:1373
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:38
+#: scripts/changelog/debian.pl:37
 #, perl-format
 msgid ""
 "Usage: %s [<option>]\n"
@@ -2213,77 +2242,77 @@ msgid ""
 "      --version       print program version.\n"
 msgstr ""
 
-#: scripts/changelog/debian.pl:80
+#: scripts/changelog/debian.pl:79
 msgid "-v<since> option specifies most recent version"
 msgstr ""
 
-#: scripts/changelog/debian.pl:87
+#: scripts/changelog/debian.pl:86
 #, perl-format
 msgid "found start of entry where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:93
+#: scripts/changelog/debian.pl:92
 #, perl-format
 msgid "bad key-value after `;': `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:95
+#: scripts/changelog/debian.pl:94
 #, perl-format
 msgid "repeated key-value %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:98
+#: scripts/changelog/debian.pl:97
 msgid "badly formatted urgency value"
 msgstr ""
 
-#: scripts/changelog/debian.pl:102
+#: scripts/changelog/debian.pl:101
 #, perl-format
 msgid "unknown urgency value %s - comparing very low"
 msgstr ""
 
-#: scripts/changelog/debian.pl:105
+#: scripts/changelog/debian.pl:104
 #, perl-format
 msgid "urgency >%s<"
 msgstr ""
 
-#: scripts/changelog/debian.pl:123
+#: scripts/changelog/debian.pl:122
 #, perl-format
 msgid "unknown key-value key %s - copying to %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:130
+#: scripts/changelog/debian.pl:129
 msgid "badly formatted heading line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:133
+#: scripts/changelog/debian.pl:132
 #, perl-format
 msgid "found trailer where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:140
+#: scripts/changelog/debian.pl:139
 msgid "badly formatted trailer line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:143
+#: scripts/changelog/debian.pl:142
 #, perl-format
 msgid "found change data where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:149
+#: scripts/changelog/debian.pl:148
 #, perl-format
 msgid "found blank line where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:152
+#: scripts/changelog/debian.pl:151
 msgid "unrecognised line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:156
+#: scripts/changelog/debian.pl:155
 #, perl-format
 msgid "found eof where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:170 scripts/changelog/debian.pl:175
+#: scripts/changelog/debian.pl:169 scripts/changelog/debian.pl:174
 #, perl-format
 msgid "%s, at file %s line %d"
 msgstr ""
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index ae8cab50..8116a03d 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: 2006-06-21 07:29+0300\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,219 +17,227 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: scripts/controllib.pl:64 scripts/controllib.pl:67
+#: scripts/822-date.pl:13
+msgid "Usage: 822-date"
+msgstr ""
+
+#: scripts/822-date.pl:15
+msgid "This program is deprecated. Please use 'date -R' instead."
+msgstr ""
+
+#: scripts/controllib.pl:63 scripts/controllib.pl:68
 #, perl-format
 msgid "unable to get login information for username \"%s\""
 msgstr ""
 
-#: scripts/controllib.pl:69
+#: scripts/controllib.pl:71
 #, perl-format
 msgid ""
 "no utmp entry available and LOGNAME not defined; using uid of process (%d)"
 msgstr ""
 
-#: scripts/controllib.pl:71
+#: scripts/controllib.pl:74
 #, perl-format
 msgid "unable to get login information for uid %d"
 msgstr ""
 
-#: scripts/controllib.pl:146
+#: scripts/controllib.pl:153
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:152
+#: scripts/controllib.pl:159
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr ""
 
-#: scripts/controllib.pl:169
+#: scripts/controllib.pl:179
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:170
+#: scripts/controllib.pl:180
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:171
+#: scripts/controllib.pl:181
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:178
+#: scripts/controllib.pl:188
 msgid "write error on control data"
 msgstr ""
 
-#: scripts/controllib.pl:181
+#: scripts/controllib.pl:191
 msgid "write error on close control data"
 msgstr ""
 
-#: scripts/controllib.pl:187
+#: scripts/controllib.pl:199
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:189
+#: scripts/controllib.pl:202
 #, perl-format
 msgid "control file %s"
 msgstr ""
 
-#: scripts/controllib.pl:190
+#: scripts/controllib.pl:203
 msgid "control file must have at least one binary package part"
 msgstr ""
 
-#: scripts/controllib.pl:194
+#: scripts/controllib.pl:207
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 
-#: scripts/controllib.pl:199
+#: scripts/controllib.pl:212
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 
-#: scripts/controllib.pl:214
+#: scripts/controllib.pl:229
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr ""
 
-#: scripts/controllib.pl:220
+#: scripts/controllib.pl:235
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:271
+#: scripts/controllib.pl:286
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr ""
 
-#: scripts/controllib.pl:296
+#: scripts/controllib.pl:313
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:305 scripts/dpkg-genchanges.pl:236
-#: scripts/dpkg-gencontrol.pl:180 scripts/dpkg-source.pl:261
+#: scripts/controllib.pl:316 scripts/dpkg-genchanges.pl:238
+#: scripts/dpkg-gencontrol.pl:183 scripts/dpkg-source.pl:263
 msgid "parsed version of changelog"
 msgstr ""
 
-#: scripts/controllib.pl:306
+#: scripts/controllib.pl:318
 msgid "parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:328
+#: scripts/controllib.pl:353
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:330
+#: scripts/controllib.pl:355
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 
-#: scripts/controllib.pl:336
+#: scripts/controllib.pl:361
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:343
+#: scripts/controllib.pl:370
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
-#: scripts/controllib.pl:352
+#: scripts/controllib.pl:379
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:375
+#: scripts/controllib.pl:402
 msgid "continued value line not in field"
 msgstr ""
 
-#: scripts/controllib.pl:378
+#: scripts/controllib.pl:405
 msgid "expected blank line before PGP signature"
 msgstr ""
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:417
 msgid "expected PGP signature, found EOF after blank line"
 msgstr ""
 
-#: scripts/controllib.pl:391
+#: scripts/controllib.pl:420
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:396
+#: scripts/controllib.pl:425
 msgid "found several `paragraphs' where only one expected"
 msgstr ""
 
-#: scripts/controllib.pl:400
+#: scripts/controllib.pl:429
 msgid "line with unknown format (not field-colon-value)"
 msgstr ""
 
-#: scripts/controllib.pl:403
+#: scripts/controllib.pl:432
 msgid "found start of PGP body but no signature"
 msgstr ""
 
-#: scripts/controllib.pl:405
+#: scripts/controllib.pl:434
 msgid "empty file"
 msgstr ""
 
-#: scripts/controllib.pl:411
+#: scripts/controllib.pl:440
 #, perl-format
 msgid "unknown information field `%s' in input data in %s"
 msgstr ""
 
-#: scripts/controllib.pl:415
+#: scripts/controllib.pl:444
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
-#: scripts/controllib.pl:418
+#: scripts/controllib.pl:447
 #, perl-format
 msgid "%s: failure: %s"
 msgstr ""
 
-#: scripts/controllib.pl:419
+#: scripts/controllib.pl:448
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:449
 #, perl-format
 msgid "%s: error: %s"
 msgstr ""
 
-#: scripts/controllib.pl:421
+#: scripts/controllib.pl:450
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr ""
 
-#: scripts/controllib.pl:422
+#: scripts/controllib.pl:451
 #, perl-format
 msgid "%s: warning: %s"
 msgstr ""
 
-#: scripts/controllib.pl:434
+#: scripts/controllib.pl:464
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr ""
 
-#: scripts/controllib.pl:437
+#: scripts/controllib.pl:467
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr ""
 
-#: scripts/controllib.pl:440
+#: scripts/controllib.pl:470
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:34 scripts/dpkg-distaddfile.pl:18
 #: scripts/dpkg-genchanges.pl:35 scripts/dpkg-gencontrol.pl:22
-#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:65
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:36
-#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:26
+#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:69
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:37
+#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:25
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -243,8 +251,8 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:40 scripts/dpkg-distaddfile.pl:23
 #: scripts/dpkg-genchanges.pl:41 scripts/dpkg-gencontrol.pl:28
-#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:43
-#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:30
+#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:44
+#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:29
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -296,8 +304,8 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:228 scripts/dpkg-distaddfile.pl:51
 #: scripts/dpkg-genchanges.pl:130 scripts/dpkg-gencontrol.pl:102
-#: scripts/dpkg-shlibdeps.pl:95 scripts/dpkg-source.pl:170
-#: scripts/changelog/debian.pl:59
+#: scripts/dpkg-shlibdeps.pl:102 scripts/dpkg-source.pl:170
+#: scripts/changelog/debian.pl:58
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -329,7 +337,7 @@ msgstr ""
 msgid "%s is not a supported variable name"
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:17
+#: scripts/dpkg-checkbuilddeps.pl:18
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] [<control-file>]\n"
@@ -337,26 +345,28 @@ msgid ""
 "Options:\n"
 "  control-file   control file to process (default: debian/control).\n"
 "  -B             binary-only, ignore -Indep.\n"
+"  --admindir=<directory>\n"
+"                 change the administrative directory.\n"
 "  -h             show this help message.\n"
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:69
+#: scripts/dpkg-checkbuilddeps.pl:74
 #, perl-format
 msgid "%s: Unmet build dependencies: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:73
+#: scripts/dpkg-checkbuilddeps.pl:78
 #, perl-format
 msgid "%s: Build conflicts: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:146 scripts/dpkg-gencontrol.pl:199
-#: scripts/dpkg-source.pl:208
+#: scripts/dpkg-checkbuilddeps.pl:151 scripts/dpkg-gencontrol.pl:202
+#: scripts/dpkg-source.pl:210
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:28
+#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:27
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson."
@@ -381,27 +391,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:256
+#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:259
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:259
+#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:262
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:271
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:275
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:280
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:283
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:284
 msgid "close new files list file"
 msgstr ""
 
@@ -471,127 +481,132 @@ msgstr ""
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:181 scripts/dpkg-gencontrol.pl:134
-#: scripts/dpkg-source.pl:213
+#: scripts/dpkg-genchanges.pl:183 scripts/dpkg-gencontrol.pl:137
+#: scripts/dpkg-source.pl:215
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:188
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:223 scripts/dpkg-gencontrol.pl:165
-#: scripts/dpkg-source.pl:248
+#: scripts/dpkg-genchanges.pl:225 scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-source.pl:250
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:240 scripts/dpkg-gencontrol.pl:184
-#: scripts/dpkg-source.pl:265
+#: scripts/dpkg-genchanges.pl:242 scripts/dpkg-gencontrol.pl:187
+#: scripts/dpkg-source.pl:267
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:247
+#: scripts/dpkg-genchanges.pl:249
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:258
+#: scripts/dpkg-genchanges.pl:260
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:264
+#: scripts/dpkg-genchanges.pl:266
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:265
+#: scripts/dpkg-genchanges.pl:267
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:270
+#: scripts/dpkg-genchanges.pl:272
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:279
+#: scripts/dpkg-genchanges.pl:281
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:281
+#: scripts/dpkg-genchanges.pl:283
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:285 scripts/dpkg-source.pl:610
-#: scripts/dpkg-source.pl:640
+#: scripts/dpkg-genchanges.pl:287 scripts/dpkg-source.pl:613
+#: scripts/dpkg-source.pl:643
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-source.pl:677
+#: scripts/dpkg-genchanges.pl:290 scripts/dpkg-source.pl:644
+#, perl-format
+msgid "source control file %s"
+msgstr ""
+
+#: scripts/dpkg-genchanges.pl:296 scripts/dpkg-source.pl:680
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:302
+#: scripts/dpkg-genchanges.pl:305
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-genchanges.pl:309
 msgid "Ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:311
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:311
+#: scripts/dpkg-genchanges.pl:314
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:315
+#: scripts/dpkg-genchanges.pl:318
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:336
+#: scripts/dpkg-genchanges.pl:339
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:337
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:341
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:344
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:344
+#: scripts/dpkg-genchanges.pl:347
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:359 scripts/dpkg-source.pl:273
+#: scripts/dpkg-genchanges.pl:362 scripts/dpkg-source.pl:275
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:363 scripts/dpkg-gencontrol.pl:220
-#: scripts/dpkg-gencontrol.pl:223 scripts/dpkg-source.pl:276
+#: scripts/dpkg-genchanges.pl:366 scripts/dpkg-gencontrol.pl:223
+#: scripts/dpkg-gencontrol.pl:226 scripts/dpkg-source.pl:278
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -642,55 +657,55 @@ msgstr ""
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:151
+#: scripts/dpkg-gencontrol.pl:154
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:157
+#: scripts/dpkg-gencontrol.pl:160
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:235
+#: scripts/dpkg-gencontrol.pl:238
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:237
+#: scripts/dpkg-gencontrol.pl:240
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:238
+#: scripts/dpkg-gencontrol.pl:241
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:241
+#: scripts/dpkg-gencontrol.pl:244
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:242
+#: scripts/dpkg-gencontrol.pl:245
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:270
+#: scripts/dpkg-gencontrol.pl:273
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:285
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:288
+#: scripts/dpkg-gencontrol.pl:291
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:293
+#: scripts/dpkg-gencontrol.pl:298
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
@@ -761,10 +776,10 @@ msgstr ""
 msgid "cannot exec format parser: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:71
+#: scripts/dpkg-scanpackages.pl:75
 #, perl-format
 msgid ""
-"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > "
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > "
 "Packages\n"
 "\n"
 "Options:\n"
@@ -775,119 +790,123 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:97
+#: scripts/dpkg-scanpackages.pl:92
 #, perl-format
-msgid "Binary dir %s not found"
+msgid "Override file %s not found"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:99
+#: scripts/dpkg-scanpackages.pl:98
 #, perl-format
-msgid "Override file %s not found"
+msgid "Couldn't open override file %s: %s"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:124
+#, perl-format
+msgid " * Unconditional maintainer override for %s *"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:140 scripts/dpkg-scansources.pl:507
+msgid "1 to 3 args expected\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:116
+#: scripts/dpkg-scanpackages.pl:162
+#, perl-format
+msgid "Binary dir %s not found"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl:180
 #, perl-format
 msgid "Couldn't open %s for reading: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:124
+#: scripts/dpkg-scanpackages.pl:188
 #, perl-format
 msgid "Couldn't call dpkg-deb on %s: %s, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:128
+#: scripts/dpkg-scanpackages.pl:192
 #, perl-format
 msgid "`dpkg-deb -I %s control' exited with %d, skipping package"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:142
+#: scripts/dpkg-scanpackages.pl:206
 #, perl-format
 msgid ""
 "Unprocessed text from %s control file; info:\n"
 "%s / %s\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:145
+#: scripts/dpkg-scanpackages.pl:209
 #, perl-format
 msgid "No Package field in control file of %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:152
+#: scripts/dpkg-scanpackages.pl:216
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat but newer version;\n"
 "   used that one and ignored data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:158
+#: scripts/dpkg-scanpackages.pl:222
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat;\n"
 "   ignored that one and using data from %s !\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:165
+#: scripts/dpkg-scanpackages.pl:229
 #, perl-format
 msgid " ! Package %s (filename %s) has Filename field!\n"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:171
+#: scripts/dpkg-scanpackages.pl:235
 #, perl-format
 msgid "`md5sum < %s' exited with %d"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:172
+#: scripts/dpkg-scanpackages.pl:236
 #, perl-format
 msgid "Strange text from `md5sum < %s': `%s'"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:175
+#: scripts/dpkg-scanpackages.pl:239
 #, perl-format
 msgid "Couldn't stat %s: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:176
+#: scripts/dpkg-scanpackages.pl:240
 #, perl-format
 msgid "%s is empty"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:210
-#, perl-format
-msgid "Couldn't open override file %s: %s"
-msgstr ""
-
-#: scripts/dpkg-scanpackages.pl:232
-#, perl-format
-msgid " * Unconditional maintainer override for %s *"
-msgstr ""
-
-#: scripts/dpkg-scanpackages.pl:258
+#: scripts/dpkg-scanpackages.pl:284
 #, perl-format
 msgid "Failed when writing stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:261
+#: scripts/dpkg-scanpackages.pl:287
 #, perl-format
 msgid "Couldn't close stdout: %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:265
+#: scripts/dpkg-scanpackages.pl:291
 msgid "** Packages in archive but missing from override file: **"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:269
+#: scripts/dpkg-scanpackages.pl:295
 msgid " ++ Packages in override file with incorrect old maintainer value: ++"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:275
+#: scripts/dpkg-scanpackages.pl:301
 msgid " -- Packages specifying same maintainer as override file: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:281
+#: scripts/dpkg-scanpackages.pl:307
 msgid " -- Packages in override file but not in archive: --"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl:286
+#: scripts/dpkg-scanpackages.pl:312
 #, perl-format
 msgid " Wrote %s entries to output Packages file."
 msgstr ""
@@ -1037,11 +1056,7 @@ msgstr ""
 msgid "no binary packages specified in %s"
 msgstr ""
 
-#: scripts/dpkg-scansources.pl:507
-msgid "1 to 3 args expected\n"
-msgstr ""
-
-#: scripts/dpkg-shlibdeps.pl:38
+#: scripts/dpkg-shlibdeps.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1049,7 +1064,7 @@ msgid ""
 "Copyright (C) 2006 Frank Lichtenheld."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:51
+#: scripts/dpkg-shlibdeps.pl:52
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1065,6 +1080,7 @@ msgid ""
 "  -L<localshlibsfile>      shlibs override file, not debian/shlibs.local.\n"
 "  -T<varlistfile>          update variables here, not debian/substvars.\n"
 "  -t<type>                 set package type (default is deb).\n"
+"  --admindir=<directory>   change the administrative directory.\n"
 "  -h, --help               show this help message.\n"
 "      --version            show the version.\n"
 "\n"
@@ -1072,129 +1088,134 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:89
+#: scripts/dpkg-shlibdeps.pl:91
+#, perl-format
+msgid "administrative directory '%s' does not exist"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:96
 #, perl-format
 msgid "unrecognised dependency field `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:101
+#: scripts/dpkg-shlibdeps.pl:110
 msgid "need at least one executable"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:104
+#: scripts/dpkg-shlibdeps.pl:113
 #, perl-format
 msgid "unable to open '%s' for test"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:107
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid "unable to read first four bytes of '%s' as magic number"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:120
+#: scripts/dpkg-shlibdeps.pl:129
 #, perl-format
 msgid "unrecognized file type for '%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:155
+#: scripts/dpkg-shlibdeps.pl:165
 #, perl-format
 msgid "couldn't open /etc/ld.so.conf: %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:173 scripts/dpkg-shlibdeps.pl:331
+#: scripts/dpkg-shlibdeps.pl:183 scripts/dpkg-shlibdeps.pl:341
 msgid "cannot fork for objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:176 scripts/dpkg-shlibdeps.pl:334
+#: scripts/dpkg-shlibdeps.pl:186 scripts/dpkg-shlibdeps.pl:344
 msgid "cannot exec objdump"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:195
+#: scripts/dpkg-shlibdeps.pl:205
 #, perl-format
 msgid "format of `NEEDED %s' not recognized"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:201 scripts/dpkg-shlibdeps.pl:343
+#: scripts/dpkg-shlibdeps.pl:211 scripts/dpkg-shlibdeps.pl:353
 #, perl-format
 msgid "objdump on `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:263
+#: scripts/dpkg-shlibdeps.pl:273
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:269
+#: scripts/dpkg-shlibdeps.pl:279
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:274
+#: scripts/dpkg-shlibdeps.pl:284
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:275
+#: scripts/dpkg-shlibdeps.pl:285
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:279
+#: scripts/dpkg-shlibdeps.pl:289
 #, perl-format
 msgid "unknown output from dpkg --search: `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:302
+#: scripts/dpkg-shlibdeps.pl:312
 #, perl-format
 msgid "could not find any packages for %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:312
+#: scripts/dpkg-shlibdeps.pl:322
 #, perl-format
 msgid ""
 "unable to find dependency information for shared library %s (soname %s, path "
 "%s, dependency field %s)"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:353
+#: scripts/dpkg-shlibdeps.pl:363
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:360
+#: scripts/dpkg-shlibdeps.pl:370
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:395
+#: scripts/dpkg-shlibdeps.pl:405
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:398
+#: scripts/dpkg-shlibdeps.pl:408
 #, perl-format
 msgid "chown of `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:405
+#: scripts/dpkg-shlibdeps.pl:415
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:408
+#: scripts/dpkg-shlibdeps.pl:418
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:423
+#: scripts/dpkg-shlibdeps.pl:433
 msgid "write output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:427
+#: scripts/dpkg-shlibdeps.pl:437
 msgid "write userdef output entry"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:429
+#: scripts/dpkg-shlibdeps.pl:439
 msgid "close output"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:432
+#: scripts/dpkg-shlibdeps.pl:442
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
@@ -1281,841 +1302,836 @@ msgstr ""
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:231
+#: scripts/dpkg-source.pl:233
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:233
+#: scripts/dpkg-source.pl:235
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:278
+#: scripts/dpkg-source.pl:280
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:294
+#: scripts/dpkg-source.pl:296
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:300
+#: scripts/dpkg-source.pl:302
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.gz)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:306
+#: scripts/dpkg-source.pl:308
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:316
 #, 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:321
+#: scripts/dpkg-source.pl:323
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:324
+#: scripts/dpkg-source.pl:326
 #, perl-format
 msgid "unable to stat putative packed orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:326
+#: scripts/dpkg-source.pl:328
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:329
+#: scripts/dpkg-source.pl:331
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:335
+#: scripts/dpkg-source.pl:337
 #, perl-format
 msgid "source directory `%s' is not <sourcepackage>-<upstreamversion> `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:343
+#: scripts/dpkg-source.pl:345
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:350
+#: scripts/dpkg-source.pl:352
 #, perl-format
 msgid ""
 ".orig.tar.gz name %s is not <package>_<upstreamversion>.orig.tar.gz (wanted %"
 "s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:361
+#: scripts/dpkg-source.pl:363
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:364
+#: scripts/dpkg-source.pl:366
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:367 scripts/dpkg-source.pl:432
-#: scripts/dpkg-source.pl:576
+#: scripts/dpkg-source.pl:369 scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:578
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:369
+#: scripts/dpkg-source.pl:371
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:373
+#: scripts/dpkg-source.pl:375
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:375
+#: scripts/dpkg-source.pl:377
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:376
+#: scripts/dpkg-source.pl:378
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:378
+#: scripts/dpkg-source.pl:380
 msgid "exec tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:382
+#: scripts/dpkg-source.pl:384
 msgid "wait for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:385 scripts/dpkg-source.pl:539
+#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
+#: scripts/dpkg-source.pl:389 scripts/dpkg-source.pl:543
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:391
+#: scripts/dpkg-source.pl:393
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:393
+#: scripts/dpkg-source.pl:395
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:403
+#: scripts/dpkg-source.pl:405
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:409
+#: scripts/dpkg-source.pl:411
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:418 scripts/dpkg-source.pl:748
+#: scripts/dpkg-source.pl:420 scripts/dpkg-source.pl:751
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:422 scripts/dpkg-source.pl:729
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:424 scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:757
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:426 scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:428 scripts/dpkg-source.pl:759
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:436
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:439
+#: scripts/dpkg-source.pl:441
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:441
+#: scripts/dpkg-source.pl:443
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:444
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:451
+#: scripts/dpkg-source.pl:453
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:459
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:459
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:460 scripts/dpkg-source.pl:461
+#: scripts/dpkg-source.pl:462 scripts/dpkg-source.pl:463
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:465 scripts/dpkg-source.pl:526
+#: scripts/dpkg-source.pl:467 scripts/dpkg-source.pl:528
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid "executable mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:472
+#: scripts/dpkg-source.pl:474
 #, perl-format
 msgid "special mode %04o of `%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:477 scripts/dpkg-source.pl:1269
+#: scripts/dpkg-source.pl:479 scripts/dpkg-source.pl:1275
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:478
+#: scripts/dpkg-source.pl:480
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:481
+#: scripts/dpkg-source.pl:483
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:489
+#: scripts/dpkg-source.pl:491
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:496
+#: scripts/dpkg-source.pl:498
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:501
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:505
+#: scripts/dpkg-source.pl:507
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:507
+#: scripts/dpkg-source.pl:509
 msgid "failed to write to gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:512
+#: scripts/dpkg-source.pl:514
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:515
+#: scripts/dpkg-source.pl:517
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:521
+#: scripts/dpkg-source.pl:523
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:530
 msgid "not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:529
+#: scripts/dpkg-source.pl:531
 msgid "directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:534
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:536
+#: scripts/dpkg-source.pl:538
 msgid "finish write to gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:543
+#: scripts/dpkg-source.pl:545
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:545
+#: scripts/dpkg-source.pl:547
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:546
+#: scripts/dpkg-source.pl:548
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:554
+#: scripts/dpkg-source.pl:556
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:556
+#: scripts/dpkg-source.pl:558
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:558
+#: scripts/dpkg-source.pl:560
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:562
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:562
+#: scripts/dpkg-source.pl:564
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:563 scripts/dpkg-source.pl:1265
+#: scripts/dpkg-source.pl:565 scripts/dpkg-source.pl:1271
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:578
+#: scripts/dpkg-source.pl:580
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:579
+#: scripts/dpkg-source.pl:581
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:583
+#: scripts/dpkg-source.pl:586
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
 
-#: scripts/dpkg-source.pl:585
+#: scripts/dpkg-source.pl:588
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:597
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:596
+#: scripts/dpkg-source.pl:599
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:597
+#: scripts/dpkg-source.pl:600
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:604
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:606
+#: scripts/dpkg-source.pl:609
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:630
+#: scripts/dpkg-source.pl:633
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:634
+#: scripts/dpkg-source.pl:637
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:637
+#: scripts/dpkg-source.pl:640
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:641
-#, perl-format
-msgid "source control file %s"
-msgstr ""
-
-#: scripts/dpkg-source.pl:646
+#: scripts/dpkg-source.pl:649
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:655
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:681
+#: scripts/dpkg-source.pl:684
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:689
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:699
+#: scripts/dpkg-source.pl:702
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:706
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:709
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:707
+#: scripts/dpkg-source.pl:710
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:713
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:712
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:716
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:722
+#: scripts/dpkg-source.pl:725
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:724
+#: scripts/dpkg-source.pl:727
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:750
+#: scripts/dpkg-source.pl:753
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:764
+#: scripts/dpkg-source.pl:767
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:767
+#: scripts/dpkg-source.pl:770
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:783
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:814 scripts/dpkg-source.pl:870
+#: scripts/dpkg-source.pl:817 scripts/dpkg-source.pl:873
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:819
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:819
+#: scripts/dpkg-source.pl:822
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:828
+#: scripts/dpkg-source.pl:831
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:833
+#: scripts/dpkg-source.pl:836
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:837
+#: scripts/dpkg-source.pl:840
 #, perl-format
 msgid "%s: applying %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:842 scripts/dpkg-source.pl:1145
+#: scripts/dpkg-source.pl:845 scripts/dpkg-source.pl:1149
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:845
+#: scripts/dpkg-source.pl:848
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:847
+#: scripts/dpkg-source.pl:850
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:848
+#: scripts/dpkg-source.pl:851
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:852
+#: scripts/dpkg-source.pl:855
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:855
+#: scripts/dpkg-source.pl:858
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:864
+#: scripts/dpkg-source.pl:867
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:866
+#: scripts/dpkg-source.pl:869
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:871
+#: scripts/dpkg-source.pl:874
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:874
+#: scripts/dpkg-source.pl:877
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:876
+#: scripts/dpkg-source.pl:879
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:880
+#: scripts/dpkg-source.pl:883
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:889
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:895
+#: scripts/dpkg-source.pl:898
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:899
+#: scripts/dpkg-source.pl:902
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:909
+#: scripts/dpkg-source.pl:913
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:910
+#: scripts/dpkg-source.pl:914
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:911
+#: scripts/dpkg-source.pl:915
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:918
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:915
+#: scripts/dpkg-source.pl:919
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:922
+#: scripts/dpkg-source.pl:926
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:932
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:930
+#: scripts/dpkg-source.pl:934
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:948
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:948
+#: scripts/dpkg-source.pl:952
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:950
+#: scripts/dpkg-source.pl:954
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:968
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:972
+#: scripts/dpkg-source.pl:976
 #, 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:980
+#: scripts/dpkg-source.pl:984
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:989
+#: scripts/dpkg-source.pl:993
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:996
+#: scripts/dpkg-source.pl:1000
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1024
+#: scripts/dpkg-source.pl:1028
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1028
+#: scripts/dpkg-source.pl:1032
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1029
+#: scripts/dpkg-source.pl:1033
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1039
+#: scripts/dpkg-source.pl:1043
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1046
+#: scripts/dpkg-source.pl:1050
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1056
+#: scripts/dpkg-source.pl:1060
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1079
+#: scripts/dpkg-source.pl:1083
 #, perl-format
 msgid "filename `%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1086
+#: scripts/dpkg-source.pl:1090
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1095
+#: scripts/dpkg-source.pl:1099
 #, perl-format
 msgid "tarfile `%s' contains object with/../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1104
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1104
+#: scripts/dpkg-source.pl:1108
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1109
+#: scripts/dpkg-source.pl:1113
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1122
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1157 scripts/dpkg-source.pl:1194
-#: scripts/dpkg-source.pl:1203
+#: scripts/dpkg-source.pl:1161 scripts/dpkg-source.pl:1198
+#: scripts/dpkg-source.pl:1207
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1158
+#: scripts/dpkg-source.pl:1162
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1161
+#: scripts/dpkg-source.pl:1165
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1163
+#: scripts/dpkg-source.pl:1167
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1167
+#: scripts/dpkg-source.pl:1171
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1171 scripts/dpkg-source.pl:1177
+#: scripts/dpkg-source.pl:1175 scripts/dpkg-source.pl:1181
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1185
+#: scripts/dpkg-source.pl:1189
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1187
+#: scripts/dpkg-source.pl:1191
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1201
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1202
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1208
+#: scripts/dpkg-source.pl:1212
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1211
+#: scripts/dpkg-source.pl:1215
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1221
+#: scripts/dpkg-source.pl:1225
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1223
+#: scripts/dpkg-source.pl:1227
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1225
+#: scripts/dpkg-source.pl:1229
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1226
+#: scripts/dpkg-source.pl:1230
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1229
+#: scripts/dpkg-source.pl:1233
 msgid "wait for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1233
+#: scripts/dpkg-source.pl:1237
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1239
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1238 scripts/dpkg-source.pl:1247
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1242 scripts/dpkg-source.pl:1251
+#: scripts/dpkg-source.pl:1256
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1243
+#: scripts/dpkg-source.pl:1247
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1260
+#: scripts/dpkg-source.pl:1264
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1267
+#: scripts/dpkg-source.pl:1273
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1275
+#: scripts/dpkg-source.pl:1281
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1280
+#: scripts/dpkg-source.pl:1286
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1282 scripts/dpkg-source.pl:1291
+#: scripts/dpkg-source.pl:1288 scripts/dpkg-source.pl:1297
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1287
+#: scripts/dpkg-source.pl:1293
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2123,80 +2139,85 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1296
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid "create file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1297
+#: scripts/dpkg-source.pl:1303
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1298
+#: scripts/dpkg-source.pl:1304
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1300
+#: scripts/dpkg-source.pl:1306
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1301
+#: scripts/dpkg-source.pl:1307
 msgid "reopen tar.gz"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1302
+#: scripts/dpkg-source.pl:1308
 msgid "exec gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1311
+#: scripts/dpkg-source.pl:1325
+#, perl-format
+msgid "unknown compression type on file %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:1328
 #, perl-format
 msgid "read file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1312
+#: scripts/dpkg-source.pl:1329
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1330
 #, perl-format
 msgid "fork for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1315
+#: scripts/dpkg-source.pl:1332
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1316
+#: scripts/dpkg-source.pl:1333
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1317
+#: scripts/dpkg-source.pl:1334
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1324
+#: scripts/dpkg-source.pl:1341
 msgid "wait for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1334
+#: scripts/dpkg-source.pl:1351
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1335
+#: scripts/dpkg-source.pl:1352
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1356
+#: scripts/dpkg-source.pl:1373
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:38
+#: scripts/changelog/debian.pl:37
 #, perl-format
 msgid ""
 "Usage: %s [<option>]\n"
@@ -2208,77 +2229,77 @@ msgid ""
 "      --version       print program version.\n"
 msgstr ""
 
-#: scripts/changelog/debian.pl:80
+#: scripts/changelog/debian.pl:79
 msgid "-v<since> option specifies most recent version"
 msgstr ""
 
-#: scripts/changelog/debian.pl:87
+#: scripts/changelog/debian.pl:86
 #, perl-format
 msgid "found start of entry where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:93
+#: scripts/changelog/debian.pl:92
 #, perl-format
 msgid "bad key-value after `;': `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:95
+#: scripts/changelog/debian.pl:94
 #, perl-format
 msgid "repeated key-value %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:98
+#: scripts/changelog/debian.pl:97
 msgid "badly formatted urgency value"
 msgstr ""
 
-#: scripts/changelog/debian.pl:102
+#: scripts/changelog/debian.pl:101
 #, perl-format
 msgid "unknown urgency value %s - comparing very low"
 msgstr ""
 
-#: scripts/changelog/debian.pl:105
+#: scripts/changelog/debian.pl:104
 #, perl-format
 msgid "urgency >%s<"
 msgstr ""
 
-#: scripts/changelog/debian.pl:123
+#: scripts/changelog/debian.pl:122
 #, perl-format
 msgid "unknown key-value key %s - copying to %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:130
+#: scripts/changelog/debian.pl:129
 msgid "badly formatted heading line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:133
+#: scripts/changelog/debian.pl:132
 #, perl-format
 msgid "found trailer where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:140
+#: scripts/changelog/debian.pl:139
 msgid "badly formatted trailer line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:143
+#: scripts/changelog/debian.pl:142
 #, perl-format
 msgid "found change data where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:149
+#: scripts/changelog/debian.pl:148
 #, perl-format
 msgid "found blank line where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:152
+#: scripts/changelog/debian.pl:151
 msgid "unrecognised line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:156
+#: scripts/changelog/debian.pl:155
 #, perl-format
 msgid "found eof where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:170 scripts/changelog/debian.pl:175
+#: scripts/changelog/debian.pl:169 scripts/changelog/debian.pl:174
 #, perl-format
 msgid "%s, at file %s line %d"
 msgstr ""
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index d235d15e..e35403e7 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: 2006-06-21 07:29+0300\n"
+"POT-Creation-Date: 2007-03-20 23:55+0200\n"
 "PO-Revision-Date: 2006-07-08 14:27+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -16,13 +16,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: scripts/controllib.pl:64 scripts/controllib.pl:67
+#: scripts/822-date.pl:13
+msgid "Usage: 822-date"
+msgstr ""
+
+#: scripts/822-date.pl:15
+msgid "This program is deprecated. Please use 'date -R' instead."
+msgstr ""
+
+#: scripts/controllib.pl:63 scripts/controllib.pl:68
 #, perl-format
 msgid "unable to get login information for username \"%s\""
 msgstr ""
 "impossible d'obtenir les éléments de connexion pour l'utilisateur « %s »"
 
-#: scripts/controllib.pl:69
+#: scripts/controllib.pl:71
 #, perl-format
 msgid ""
 "no utmp entry available and LOGNAME not defined; using uid of process (%d)"
@@ -30,218 +38,218 @@ msgstr ""
 "aucune entrée utmp disponible et LOGNAME n'est pas définie ; utilisation de "
 "l'uid du processus (%d)."
 
-#: scripts/controllib.pl:71
+#: scripts/controllib.pl:74
 #, perl-format
 msgid "unable to get login information for uid %d"
 msgstr "impossible d'obtenir les éléments de connexion pour l'uid %d"
 
-#: scripts/controllib.pl:146
+#: scripts/controllib.pl:153
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr "trop de substitutions - mode récursif ? - dans « %s »"
 
-#: scripts/controllib.pl:152
+#: scripts/controllib.pl:159
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "variable de substitution inconnue ${%s}"
 
-#: scripts/controllib.pl:169
+#: scripts/controllib.pl:179
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 "le champ %s contient un caractère nouvelle ligne puis un caractère >%s<"
 
-#: scripts/controllib.pl:170
+#: scripts/controllib.pl:180
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr "le champ %s contient des lignes blanches >%s<"
 
-#: scripts/controllib.pl:171
+#: scripts/controllib.pl:181
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr "le champ %s se termine par un caractère nouvelle ligne >%s<"
 
-#: scripts/controllib.pl:178
+#: scripts/controllib.pl:188
 msgid "write error on control data"
 msgstr "erreur d'écriture sur des données de contrôle"
 
-#: scripts/controllib.pl:181
+#: scripts/controllib.pl:191
 msgid "write error on close control data"
 msgstr "erreur d'écriture au moment de la fermeture des données de contrôle"
 
-#: scripts/controllib.pl:187
+#: scripts/controllib.pl:199
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr "impossible de lire le fichier de contrôle %s : %s"
 
-#: scripts/controllib.pl:189
+#: scripts/controllib.pl:202
 #, perl-format
 msgid "control file %s"
 msgstr "fichier de contrôle %s"
 
-#: scripts/controllib.pl:190
+#: scripts/controllib.pl:203
 msgid "control file must have at least one binary package part"
 msgstr ""
 "le fichier de contrôle doit contenir au moins une partie concernant les "
 "paquets binaires"
 
-#: scripts/controllib.pl:194
+#: scripts/controllib.pl:207
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 "il manque une ligne Package dans le paragraphe %d concernant les paquets "
 "dans le fichier de contrôle"
 
-#: scripts/controllib.pl:199
+#: scripts/controllib.pl:212
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 "il manque une ligne Source dans le paragraphe concernant les sources dans le "
 "fichier de contrôle"
 
-#: scripts/controllib.pl:214
+#: scripts/controllib.pl:229
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr "fichier substvars %s : ligne %d mal formée"
 
-#: scripts/controllib.pl:220
+#: scripts/controllib.pl:235
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr "impossible d'ouvrir le fichier substvars %s : %s"
 
-#: scripts/controllib.pl:271
+#: scripts/controllib.pl:286
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr "impossible d'analyser la dépendance %s"
 
-#: scripts/controllib.pl:296
+#: scripts/controllib.pl:313
 msgid "fork for parse changelog"
 msgstr "fork pour analyse du changelog"
 
-#: scripts/controllib.pl:305 scripts/dpkg-genchanges.pl:236
-#: scripts/dpkg-gencontrol.pl:180 scripts/dpkg-source.pl:261
+#: scripts/controllib.pl:316 scripts/dpkg-genchanges.pl:238
+#: scripts/dpkg-gencontrol.pl:183 scripts/dpkg-source.pl:263
 msgid "parsed version of changelog"
 msgstr "version analysée du changelog"
 
-#: scripts/controllib.pl:306
+#: scripts/controllib.pl:318
 msgid "parse changelog"
 msgstr "analyse du changelog"
 
-#: scripts/controllib.pl:328
+#: scripts/controllib.pl:353
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 "le nom du paquet source « %s » contient un caractère « %s » non autorisé"
 
-#: scripts/controllib.pl:330
+#: scripts/controllib.pl:355
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 "le nom du paquet source « %s » ne commence ni par une lettre ni par un "
 "chiffre"
 
-#: scripts/controllib.pl:336
+#: scripts/controllib.pl:361
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "le numéro de version contient un caractère « %s » non autorisé"
 
-#: scripts/controllib.pl:343
+#: scripts/controllib.pl:370
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr "le paquet source a deux valeurs en conflit : %s et %s"
 
-#: scripts/controllib.pl:352
+#: scripts/controllib.pl:379
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr "résultat anormal de md5sum « %s »"
 
-#: scripts/controllib.pl:375
+#: scripts/controllib.pl:402
 msgid "continued value line not in field"
 msgstr "la ligne continuée n'est pas dans le champ"
 
-#: scripts/controllib.pl:378
+#: scripts/controllib.pl:405
 msgid "expected blank line before PGP signature"
 msgstr "ligne blanche attendue avant la signature PGP"
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:417
 msgid "expected PGP signature, found EOF after blank line"
 msgstr "signature PGP attendue, EOF après ligne blanche trouvé"
 
-#: scripts/controllib.pl:391
+#: scripts/controllib.pl:420
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr "signature PGP attendue, « %s » trouvé"
 
-#: scripts/controllib.pl:396
+#: scripts/controllib.pl:425
 msgid "found several `paragraphs' where only one expected"
 msgstr "plusieurs « paragraphes » trouvés, un seul attendu"
 
-#: scripts/controllib.pl:400
+#: scripts/controllib.pl:429
 msgid "line with unknown format (not field-colon-value)"
 msgstr "ligne au format inconnu, format différent de « champ-virgule-valeur »"
 
-#: scripts/controllib.pl:403
+#: scripts/controllib.pl:432
 msgid "found start of PGP body but no signature"
 msgstr "début d'un format PGP trouvé, mais pas de signature"
 
-#: scripts/controllib.pl:405
+#: scripts/controllib.pl:434
 msgid "empty file"
 msgstr "fichier vide"
 
-#: scripts/controllib.pl:411
+#: scripts/controllib.pl:440
 #, perl-format
 msgid "unknown information field `%s' in input data in %s"
 msgstr "champ d'information inconnu « %s » dans les données d'entrée de %s"
 
-#: scripts/controllib.pl:415
+#: scripts/controllib.pl:444
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "erreur de syntaxe dans %s à la ligne %d : %s"
 
-#: scripts/controllib.pl:418
+#: scripts/controllib.pl:447
 #, perl-format
 msgid "%s: failure: %s"
 msgstr "%s : échec : %s"
 
-#: scripts/controllib.pl:419
+#: scripts/controllib.pl:448
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr "%s : échec : %s : %s"
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:449
 #, perl-format
 msgid "%s: error: %s"
 msgstr "%s : erreur : %s"
 
-#: scripts/controllib.pl:421
+#: scripts/controllib.pl:450
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr "%s : erreur interne : %s"
 
-#: scripts/controllib.pl:422
+#: scripts/controllib.pl:451
 #, perl-format
 msgid "%s: warning: %s"
 msgstr "%s : avertissement : %s"
 
-#: scripts/controllib.pl:434
+#: scripts/controllib.pl:464
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr "%s : échec : %s a produit une erreur de sortie de type %s"
 
-#: scripts/controllib.pl:437
+#: scripts/controllib.pl:467
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr "%s : échec : %s tué par le signal %s"
 
-#: scripts/controllib.pl:440
+#: scripts/controllib.pl:470
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr "%s : échec : %s a échoué avec une erreur de sortie de type inconnu %d"
 
 #: scripts/dpkg-architecture.pl:34 scripts/dpkg-distaddfile.pl:18
 #: scripts/dpkg-genchanges.pl:35 scripts/dpkg-gencontrol.pl:22
-#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:65
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:36
-#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:26
+#: scripts/dpkg-parsechangelog.pl:21 scripts/dpkg-scanpackages.pl:69
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:37
+#: scripts/dpkg-source.pl:61 scripts/changelog/debian.pl:25
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -258,8 +266,8 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:40 scripts/dpkg-distaddfile.pl:23
 #: scripts/dpkg-genchanges.pl:41 scripts/dpkg-gencontrol.pl:28
-#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:43
-#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:30
+#: scripts/dpkg-parsechangelog.pl:27 scripts/dpkg-shlibdeps.pl:44
+#: scripts/dpkg-source.pl:66 scripts/changelog/debian.pl:29
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -342,8 +350,8 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:228 scripts/dpkg-distaddfile.pl:51
 #: scripts/dpkg-genchanges.pl:130 scripts/dpkg-gencontrol.pl:102
-#: scripts/dpkg-shlibdeps.pl:95 scripts/dpkg-source.pl:170
-#: scripts/changelog/debian.pl:59
+#: scripts/dpkg-shlibdeps.pl:102 scripts/dpkg-source.pl:170
+#: scripts/changelog/debian.pl:58
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "option inconnue « %s »"
@@ -381,14 +389,16 @@ msgstr "le type du syst
 msgid "%s is not a supported variable name"
 msgstr "%s n'est pas le nom d'une variable reconnue"
 
-#: scripts/dpkg-checkbuilddeps.pl:17
-#, perl-format
+#: scripts/dpkg-checkbuilddeps.pl:18
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] [<control-file>]\n"
 "\n"
 "Options:\n"
 "  control-file   control file to process (default: debian/control).\n"
 "  -B             binary-only, ignore -Indep.\n"
+"  --admindir=<directory>\n"
+"                 change the administrative directory.\n"
 "  -h             show this help message.\n"
 msgstr ""
 "Usage : %s [<option> ...] [<fichier_de_contrôle>]\n"
@@ -399,23 +409,23 @@ msgstr ""
 "  -B                    binaire seul, ignore -Indep.\n"
 "  -h                    afficher ce message d'aide.\n"
 
-#: scripts/dpkg-checkbuilddeps.pl:69
+#: scripts/dpkg-checkbuilddeps.pl:74
 #, perl-format
 msgid "%s: Unmet build dependencies: "
 msgstr "%s : dépendances de construction non trouvées : "
 
-#: scripts/dpkg-checkbuilddeps.pl:73
+#: scripts/dpkg-checkbuilddeps.pl:78
 #, perl-format
 msgid "%s: Build conflicts: "
 msgstr "%s : conflits de construction du paquet : "
 
-#: scripts/dpkg-checkbuilddeps.pl:146 scripts/dpkg-gencontrol.pl:199
-#: scripts/dpkg-source.pl:208
+#: scripts/dpkg-checkbuilddeps.pl:151 scripts/dpkg-gencontrol.pl:202
+#: scripts/dpkg-source.pl:210
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "erreur rencontrée lors de l'analyse de %s"
 
-#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:28
+#: scripts/dpkg-distaddfile.pl:20 scripts/changelog/debian.pl:27
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson."
@@ -449,27 +459,27 @@ msgstr "Il est demand
 msgid "filename, section and priority may contain no whitespace"
 msgstr "fichier, section et priorité ne peuvent contenir d'espace"
 
-#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:256
+#: scripts/dpkg-distaddfile.pl:62 scripts/dpkg-gencontrol.pl:259
 msgid "open new files list file"
 msgstr "ouverture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:259
+#: scripts/dpkg-distaddfile.pl:64 scripts/dpkg-gencontrol.pl:262
 msgid "chown new files list file"
 msgstr "modification du propriétaire du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:271
 msgid "copy old entry to new files list file"
 msgstr "copie de l'ancienne entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-distaddfile.pl:72 scripts/dpkg-gencontrol.pl:275
 msgid "read old files list file"
 msgstr "lecture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:280
+#: scripts/dpkg-distaddfile.pl:75 scripts/dpkg-gencontrol.pl:283
 msgid "write new entry to new files list file"
 msgstr "écriture de la nouvelle entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:281
+#: scripts/dpkg-distaddfile.pl:76 scripts/dpkg-gencontrol.pl:284
 msgid "close new files list file"
 msgstr "fermeture du nouveau fichier des fichiers"
 
@@ -583,135 +593,140 @@ msgstr ""
 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:181 scripts/dpkg-gencontrol.pl:134
-#: scripts/dpkg-source.pl:213
+#: scripts/dpkg-genchanges.pl:183 scripts/dpkg-gencontrol.pl:137
+#: scripts/dpkg-source.pl:215
 msgid "general section of control info file"
 msgstr "section générale dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:188
+#: scripts/dpkg-genchanges.pl:190
 #, 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:223 scripts/dpkg-gencontrol.pl:165
-#: scripts/dpkg-source.pl:248
+#: scripts/dpkg-genchanges.pl:225 scripts/dpkg-gencontrol.pl:168
+#: scripts/dpkg-source.pl:250
 msgid "package's section of control info file"
 msgstr "section du paquet dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:240 scripts/dpkg-gencontrol.pl:184
-#: scripts/dpkg-source.pl:265
+#: scripts/dpkg-genchanges.pl:242 scripts/dpkg-gencontrol.pl:187
+#: scripts/dpkg-source.pl:267
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "valeur de nulle part, avec clé >%s< et valeur >%s<"
 
-#: scripts/dpkg-genchanges.pl:247
+#: scripts/dpkg-genchanges.pl:249
 msgid "read changesdescription"
 msgstr "lecture de changesdescription"
 
-#: scripts/dpkg-genchanges.pl:258
+#: scripts/dpkg-genchanges.pl:260
 #, 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:264
+#: scripts/dpkg-genchanges.pl:266
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "la section du paquet binaire %s manque ; utilisation de « - »"
 
-#: scripts/dpkg-genchanges.pl:265
+#: scripts/dpkg-genchanges.pl:267
 #, 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:270
+#: scripts/dpkg-genchanges.pl:272
 #, 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:279
+#: scripts/dpkg-genchanges.pl:281
 msgid "missing Section for source files"
 msgstr "il manque la section pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:281
+#: scripts/dpkg-genchanges.pl:283
 msgid "missing Priority for source files"
 msgstr "il manque la priorité pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:285 scripts/dpkg-source.pl:610
-#: scripts/dpkg-source.pl:640
+#: scripts/dpkg-genchanges.pl:287 scripts/dpkg-source.pl:613
+#: scripts/dpkg-source.pl:643
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "impossible d'ouvrir le fichier .dsc %s : %s"
 
-#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-source.pl:677
+#: scripts/dpkg-genchanges.pl:290 scripts/dpkg-source.pl:644
+#, perl-format
+msgid "source control file %s"
+msgstr "fichier de contrôle des sources %s"
+
+#: scripts/dpkg-genchanges.pl:296 scripts/dpkg-source.pl:680
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "le champ Files contient une ligne mal formée « %s »"
 
-#: scripts/dpkg-genchanges.pl:302
+#: scripts/dpkg-genchanges.pl:305
 msgid "not including original source code in upload"
 msgstr "pas d'inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-genchanges.pl:309
 msgid "Ignoring -sd option for native Debian package"
 msgstr "option -sd ignorée pour les paquets Debian pure souche"
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:311
 msgid "including full source code in upload"
 msgstr "inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:311
+#: scripts/dpkg-genchanges.pl:314
 msgid "binary-only upload - not including any source code"
 msgstr "envoi d'un binaire - aucune inclusion de code source"
 
-#: scripts/dpkg-genchanges.pl:315
+#: scripts/dpkg-genchanges.pl:318
 msgid "write original source message"
 msgstr "écriture du message source original"
 
-#: scripts/dpkg-genchanges.pl:336
+#: scripts/dpkg-genchanges.pl:339
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "impossible de lire le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:337
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "impossible de lancer « fstat » sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:341
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "le fichier d'envoi %s est vide"
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "exécution de md5sum sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:344
 #, 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:344
+#: scripts/dpkg-genchanges.pl:347
 #, 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:359 scripts/dpkg-source.pl:273
+#: scripts/dpkg-genchanges.pl:362 scripts/dpkg-source.pl:275
 #, 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:363 scripts/dpkg-gencontrol.pl:220
-#: scripts/dpkg-gencontrol.pl:223 scripts/dpkg-source.pl:276
+#: scripts/dpkg-genchanges.pl:366 scripts/dpkg-gencontrol.pl:223
+#: scripts/dpkg-gencontrol.pl:226 scripts/dpkg-source.pl:278
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "il manque l'information pour le champ de sortie %s"
@@ -791,55 +806,55 @@ msgid "must specify package since control info has many (%s)"
 msgstr ""
 "il faut indiquer un paquet car le fichier de contrôle contient plusieurs (%s)"
 
-#: scripts/dpkg-gencontrol.pl:151
+#: scripts/dpkg-gencontrol.pl:154
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] "« %s » n'est pas une architecture autorisée."
 msgstr[1] "« %s » ne sont pas des architectures autorisées."
 
-#: scripts/dpkg-gencontrol.pl:157
+#: scripts/dpkg-gencontrol.pl:160
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr "l'actuelle architecture de construction %s n'apparaît pas dans %s"
 
-#: scripts/dpkg-gencontrol.pl:235
+#: scripts/dpkg-gencontrol.pl:238
 msgid "fork for du"
 msgstr "fork pour du"
 
-#: scripts/dpkg-gencontrol.pl:237
+#: scripts/dpkg-gencontrol.pl:240
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "chdir pour du vers %s"
 
-#: scripts/dpkg-gencontrol.pl:238
+#: scripts/dpkg-gencontrol.pl:241
 msgid "exec du"
 msgstr "exec du"
 
-#: scripts/dpkg-gencontrol.pl:241
+#: scripts/dpkg-gencontrol.pl:244
 #, perl-format
 msgid "du in `%s'"
 msgstr "du dans %s"
 
-#: scripts/dpkg-gencontrol.pl:242
+#: scripts/dpkg-gencontrol.pl:245
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "résultat inattendu de du %s"
 
-#: scripts/dpkg-gencontrol.pl:270
+#: scripts/dpkg-gencontrol.pl:273
 msgid "close old files list file"
 msgstr "fermeture de l'ancien fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:282
+#: scripts/dpkg-gencontrol.pl:285
 msgid "install new files list file"
 msgstr "installation du nouveau fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:288
+#: scripts/dpkg-gencontrol.pl:291
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "impossible d'ouvrir nouveau fichier de sortie %s"
 
-#: scripts/dpkg-gencontrol.pl:293
+#: scripts/dpkg-gencontrol.pl:298
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "impossible d'installer nouveau fichier de sortie %s"
@@ -925,10 +940,10 @@ msgstr "impossible d'ouvrir %s ; %s"
 msgid "cannot exec format parser: %s"
 msgstr "impossible d'exécuter l'analyseur de format : %s"
 
-#: scripts/dpkg-scanpackages.pl:71
-#, perl-format
+#: scripts/dpkg-scanpackages.pl:75
+#, fuzzy, perl-format
 msgid ""
-"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > "
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > "
 "Packages\n"
 "\n"
 "Options:\n"
@@ -949,32 +964,46 @@ msgstr ""
 "  -h, --help            afficher ce message d'aide.\n"
 "      --version         afficher la version.\n"
 
-#: scripts/dpkg-scanpackages.pl:97
-#, perl-format
-msgid "Binary dir %s not found"
-msgstr "Répertoire de binaires %s non trouvé"
-
-#: scripts/dpkg-scanpackages.pl:99
+#: scripts/dpkg-scanpackages.pl:92
 #, perl-format
 msgid "Override file %s not found"
 msgstr "Fichier override %s non trouvé"
 
-#: scripts/dpkg-scanpackages.pl:116
+#: scripts/dpkg-scanpackages.pl:98
+#, perl-format
+msgid "Couldn't open override file %s: %s"
+msgstr "Impossible d'ouvrir le fichier d'override %s : %s"
+
+#: scripts/dpkg-scanpackages.pl:124
+#, perl-format
+msgid " * Unconditional maintainer override for %s *"
+msgstr " * Annulation inconditionnelle du responsable pour %s *"
+
+#: scripts/dpkg-scanpackages.pl:140 scripts/dpkg-scansources.pl:507
+msgid "1 to 3 args expected\n"
+msgstr "de 1 à 3 arguments attendus\n"
+
+#: scripts/dpkg-scanpackages.pl:162
+#, perl-format
+msgid "Binary dir %s not found"
+msgstr "Répertoire de binaires %s non trouvé"
+
+#: scripts/dpkg-scanpackages.pl:180
 #, perl-format
 msgid "Couldn't open %s for reading: %s"
 msgstr "Impossible de lire %s : %s"
 
-#: scripts/dpkg-scanpackages.pl:124
+#: scripts/dpkg-scanpackages.pl:188
 #, perl-format
 msgid "Couldn't call dpkg-deb on %s: %s, skipping package"
 msgstr "Impossible d'appeler dpkg-deb sur %s : %s, paquet sauté"
 
-#: scripts/dpkg-scanpackages.pl:128
+#: scripts/dpkg-scanpackages.pl:192
 #, perl-format
 msgid "`dpkg-deb -I %s control' exited with %d, skipping package"
 msgstr "« dpkg-deb -I %s control », sortie avec %d, paquet sauté"
 
-#: scripts/dpkg-scanpackages.pl:142
+#: scripts/dpkg-scanpackages.pl:206
 #, perl-format
 msgid ""
 "Unprocessed text from %s control file; info:\n"
@@ -983,12 +1012,12 @@ msgstr ""
 "Texte non traité du fichier de contrôle %s ; info :\n"
 "%s / %s\n"
 
-#: scripts/dpkg-scanpackages.pl:145
+#: scripts/dpkg-scanpackages.pl:209
 #, perl-format
 msgid "No Package field in control file of %s"
 msgstr "Pas de champ Package dans le fichier de contrôle de %s"
 
-#: scripts/dpkg-scanpackages.pl:152
+#: scripts/dpkg-scanpackages.pl:216
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat but newer version;\n"
@@ -997,7 +1026,7 @@ msgstr ""
 " ! Paquet %s (nom %s) répété, mais version plus récente ;\n"
 "   utilisation de celle-ci, données de %s ignorées !\n"
 
-#: scripts/dpkg-scanpackages.pl:158
+#: scripts/dpkg-scanpackages.pl:222
 #, perl-format
 msgid ""
 " ! Package %s (filename %s) is repeat;\n"
@@ -1006,71 +1035,61 @@ msgstr ""
 " ! Paquet %s (nom %s) répété ;\n"
 "   version ignorée, utilisation des données de %s !\n"
 
-#: scripts/dpkg-scanpackages.pl:165
+#: scripts/dpkg-scanpackages.pl:229
 #, perl-format
 msgid " ! Package %s (filename %s) has Filename field!\n"
 msgstr " ! Paquet %s (nom %s) a un champ Filename !\n"
 
-#: scripts/dpkg-scanpackages.pl:171
+#: scripts/dpkg-scanpackages.pl:235
 #, perl-format
 msgid "`md5sum < %s' exited with %d"
 msgstr "« md5sum < %s », sortie avec %d"
 
-#: scripts/dpkg-scanpackages.pl:172
+#: scripts/dpkg-scanpackages.pl:236
 #, perl-format
 msgid "Strange text from `md5sum < %s': `%s'"
 msgstr "Texte étrange produit par `md5sum < %s' : `%s'"
 
-#: scripts/dpkg-scanpackages.pl:175
+#: scripts/dpkg-scanpackages.pl:239
 #, perl-format
 msgid "Couldn't stat %s: %s"
 msgstr "stat de %s impossible : %s"
 
-#: scripts/dpkg-scanpackages.pl:176
+#: scripts/dpkg-scanpackages.pl:240
 #, perl-format
 msgid "%s is empty"
 msgstr "%s est vide"
 
-#: scripts/dpkg-scanpackages.pl:210
-#, perl-format
-msgid "Couldn't open override file %s: %s"
-msgstr "Impossible d'ouvrir le fichier d'override %s : %s"
-
-#: scripts/dpkg-scanpackages.pl:232
-#, perl-format
-msgid " * Unconditional maintainer override for %s *"
-msgstr " * Annulation inconditionnelle du responsable pour %s *"
-
-#: scripts/dpkg-scanpackages.pl:258
+#: scripts/dpkg-scanpackages.pl:284
 #, perl-format
 msgid "Failed when writing stdout: %s"
 msgstr "Impossible d'écrire sur stdout : %s"
 
-#: scripts/dpkg-scanpackages.pl:261
+#: scripts/dpkg-scanpackages.pl:287
 #, perl-format
 msgid "Couldn't close stdout: %s"
 msgstr "Impossible de fermer stdout : %s"
 
-#: scripts/dpkg-scanpackages.pl:265
+#: scripts/dpkg-scanpackages.pl:291
 msgid "** Packages in archive but missing from override file: **"
 msgstr "** Paquets dans l'archive mais pas dans le fichier d'override : **"
 
-#: scripts/dpkg-scanpackages.pl:269
+#: scripts/dpkg-scanpackages.pl:295
 msgid " ++ Packages in override file with incorrect old maintainer value: ++"
 msgstr ""
 "++  Paquets dans le fichier d'override avec valeur incorrecte pour l'ancien "
 "responsable : ++"
 
-#: scripts/dpkg-scanpackages.pl:275
+#: scripts/dpkg-scanpackages.pl:301
 msgid " -- Packages specifying same maintainer as override file: --"
 msgstr ""
 "-- Paquets indiquant le même responsable que le fichier d'override : --"
 
-#: scripts/dpkg-scanpackages.pl:281
+#: scripts/dpkg-scanpackages.pl:307
 msgid " -- Packages in override file but not in archive: --"
 msgstr "-- Paquets dans le fichier d'override mais pas dans l'archive : --"
 
-#: scripts/dpkg-scanpackages.pl:286
+#: scripts/dpkg-scanpackages.pl:312
 #, perl-format
 msgid " Wrote %s entries to output Packages file."
 msgstr "%s entrées écrites dans le fichier Packages."
@@ -1237,11 +1256,7 @@ msgstr "champ binary en double dans %s"
 msgid "no binary packages specified in %s"
 msgstr "pas de paquets binaires indiqués dans %s"
 
-#: scripts/dpkg-scansources.pl:507
-msgid "1 to 3 args expected\n"
-msgstr "de 1 à 3 arguments attendus\n"
-
-#: scripts/dpkg-shlibdeps.pl:38
+#: scripts/dpkg-shlibdeps.pl:39
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1253,8 +1268,8 @@ msgstr ""
 "Copyright (C) 2000 Wichert Akkerman.\n"
 "Copyright (C) 2006 Frank Lichtenheld."
 
-#: scripts/dpkg-shlibdeps.pl:51
-#, perl-format
+#: scripts/dpkg-shlibdeps.pl:52
+#, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
 "\n"
@@ -1269,6 +1284,7 @@ msgid ""
 "  -L<localshlibsfile>      shlibs override file, not debian/shlibs.local.\n"
 "  -T<varlistfile>          update variables here, not debian/substvars.\n"
 "  -t<type>                 set package type (default is deb).\n"
+"  --admindir=<directory>   change the administrative directory.\n"
 "  -h, --help               show this help message.\n"
 "      --version            show the version.\n"
 "\n"
@@ -1298,80 +1314,85 @@ msgstr ""
 "Champs de dépendance reconnus :\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:89
+#: scripts/dpkg-shlibdeps.pl:91
+#, perl-format
+msgid "administrative directory '%s' does not exist"
+msgstr ""
+
+#: scripts/dpkg-shlibdeps.pl:96
 #, perl-format
 msgid "unrecognised dependency field `%s'"
 msgstr "champ de dépendance non reconnu %s"
 
-#: scripts/dpkg-shlibdeps.pl:101
+#: scripts/dpkg-shlibdeps.pl:110
 msgid "need at least one executable"
 msgstr "au moins un exécutable est nécessaire"
 
-#: scripts/dpkg-shlibdeps.pl:104
+#: scripts/dpkg-shlibdeps.pl:113
 #, perl-format
 msgid "unable to open '%s' for test"
 msgstr "impossible d'ouvrir %s pour test"
 
-#: scripts/dpkg-shlibdeps.pl:107
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid "unable to read first four bytes of '%s' as magic number"
 msgstr "impossible de lire les quatre premiers octets de %s, le nombre magique"
 
-#: scripts/dpkg-shlibdeps.pl:120
+#: scripts/dpkg-shlibdeps.pl:129
 #, perl-format
 msgid "unrecognized file type for '%s'"
 msgstr "type de fichier non reconnu pour %s"
 
-#: scripts/dpkg-shlibdeps.pl:155
+#: scripts/dpkg-shlibdeps.pl:165
 #, perl-format
 msgid "couldn't open /etc/ld.so.conf: %s"
 msgstr "impossible d'ouvrir /etc/ld.so.conf : %s"
 
-#: scripts/dpkg-shlibdeps.pl:173 scripts/dpkg-shlibdeps.pl:331
+#: scripts/dpkg-shlibdeps.pl:183 scripts/dpkg-shlibdeps.pl:341
 msgid "cannot fork for objdump"
 msgstr "fork impossible pour objdump"
 
-#: scripts/dpkg-shlibdeps.pl:176 scripts/dpkg-shlibdeps.pl:334
+#: scripts/dpkg-shlibdeps.pl:186 scripts/dpkg-shlibdeps.pl:344
 msgid "cannot exec objdump"
 msgstr "impossible d'exécuter objdump"
 
-#: scripts/dpkg-shlibdeps.pl:195
+#: scripts/dpkg-shlibdeps.pl:205
 #, perl-format
 msgid "format of `NEEDED %s' not recognized"
 msgstr "format de « NEEDED %s » non reconnu"
 
-#: scripts/dpkg-shlibdeps.pl:201 scripts/dpkg-shlibdeps.pl:343
+#: scripts/dpkg-shlibdeps.pl:211 scripts/dpkg-shlibdeps.pl:353
 #, perl-format
 msgid "objdump on `%s'"
 msgstr "objdump sur %s"
 
-#: scripts/dpkg-shlibdeps.pl:263
+#: scripts/dpkg-shlibdeps.pl:273
 msgid "cannot fork for dpkg --search"
 msgstr "fork impossible pour dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:269
+#: scripts/dpkg-shlibdeps.pl:279
 msgid "cannot exec dpkg"
 msgstr "impossible d'exécuter dpkg"
 
-#: scripts/dpkg-shlibdeps.pl:274
+#: scripts/dpkg-shlibdeps.pl:284
 msgid "diversions involved - output may be incorrect"
 msgstr "détournements en jeu, la sortie peut être incorrecte"
 
-#: scripts/dpkg-shlibdeps.pl:275
+#: scripts/dpkg-shlibdeps.pl:285
 msgid "write diversion info to stderr"
 msgstr "info sur le détournement envoyée sur stderr"
 
-#: scripts/dpkg-shlibdeps.pl:279
+#: scripts/dpkg-shlibdeps.pl:289
 #, perl-format
 msgid "unknown output from dpkg --search: `%s'"
 msgstr "résultat de dpkg --search non pertinent : %s"
 
-#: scripts/dpkg-shlibdeps.pl:302
+#: scripts/dpkg-shlibdeps.pl:312
 #, perl-format
 msgid "could not find any packages for %s"
 msgstr "impossible de trouver un paquet pour %s"
 
-#: scripts/dpkg-shlibdeps.pl:312
+#: scripts/dpkg-shlibdeps.pl:322
 #, perl-format
 msgid ""
 "unable to find dependency information for shared library %s (soname %s, path "
@@ -1380,50 +1401,50 @@ msgstr ""
 "impossible de trouver les dépendances de la bibliothèque partagée %s (nom_so "
 "%s, chemin %s et champ_dépendance %s)"
 
-#: scripts/dpkg-shlibdeps.pl:353
+#: scripts/dpkg-shlibdeps.pl:363
 #, 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:360
+#: scripts/dpkg-shlibdeps.pl:370
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 "fichier sur les bibliothèques partagées %s, ligne %d : ligne mal formée %s"
 
-#: scripts/dpkg-shlibdeps.pl:395
+#: scripts/dpkg-shlibdeps.pl:405
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "ouverture du nouveau fichier substvars %s"
 
-#: scripts/dpkg-shlibdeps.pl:398
+#: scripts/dpkg-shlibdeps.pl:408
 #, perl-format
 msgid "chown of `%s'"
 msgstr "chown de %s"
 
-#: scripts/dpkg-shlibdeps.pl:405
+#: scripts/dpkg-shlibdeps.pl:415
 #, 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:408
+#: scripts/dpkg-shlibdeps.pl:418
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "lecture de l'ancien fichier varlist %s"
 
-#: scripts/dpkg-shlibdeps.pl:423
+#: scripts/dpkg-shlibdeps.pl:433
 msgid "write output entry"
 msgstr "entrée écrite"
 
-#: scripts/dpkg-shlibdeps.pl:427
+#: scripts/dpkg-shlibdeps.pl:437
 msgid "write userdef output entry"
 msgstr "entrée userdef écrite"
 
-#: scripts/dpkg-shlibdeps.pl:429
+#: scripts/dpkg-shlibdeps.pl:439
 msgid "close output"
 msgstr "close output"
 
-#: scripts/dpkg-shlibdeps.pl:432
+#: scripts/dpkg-shlibdeps.pl:442
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "installation du nouveau fichier varlist %s"
@@ -1565,27 +1586,27 @@ msgstr "
 msgid "directory argument %s is not a directory"
 msgstr "argument répertoire %s n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl:231
+#: scripts/dpkg-source.pl:233
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "%s n'est pas une architecture autorisée"
 
-#: scripts/dpkg-source.pl:233
+#: scripts/dpkg-source.pl:235
 #, 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:278
+#: scripts/dpkg-source.pl:280
 msgid "unable to determine source package name !"
 msgstr "impossible de déterminer le nom du paquet source !"
 
-#: scripts/dpkg-source.pl:294
+#: scripts/dpkg-source.pl:296
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr "« stat » de l'argument source %s impossible : %s"
 
-#: scripts/dpkg-source.pl:300
+#: scripts/dpkg-source.pl:302
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -1594,7 +1615,7 @@ msgstr ""
 "l'argument source n'est pas compressé mais l'option -s%s demande des sources "
 "compressées (.orig.tar.gz)"
 
-#: scripts/dpkg-source.pl:306
+#: scripts/dpkg-source.pl:308
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -1603,7 +1624,7 @@ msgstr ""
 "l'argument source est compressé mais l'option -s%s demande des sources non "
 "compressées (.orig/)"
 
-#: scripts/dpkg-source.pl:314
+#: scripts/dpkg-source.pl:316
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -1612,37 +1633,37 @@ msgstr ""
 "l'argument source est vide (pas d'orig, pas de diff) mais l'option -s%s veut "
 "quelque chose."
 
-#: scripts/dpkg-source.pl:321
+#: scripts/dpkg-source.pl:323
 #, 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:324
+#: scripts/dpkg-source.pl:326
 #, perl-format
 msgid "unable to stat putative packed orig `%s'"
 msgstr "stat impossible du supposé orig compressé %s"
 
-#: scripts/dpkg-source.pl:326
+#: scripts/dpkg-source.pl:328
 #, 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:329
+#: scripts/dpkg-source.pl:331
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "stat impossible du supposé orig non compressé %s"
 
-#: scripts/dpkg-source.pl:335
+#: scripts/dpkg-source.pl:337
 #, 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:343
+#: scripts/dpkg-source.pl:345
 #, 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:350
+#: scripts/dpkg-source.pl:352
 #, perl-format
 msgid ""
 ".orig.tar.gz name %s is not <package>_<upstreamversion>.orig.tar.gz (wanted %"
@@ -1650,7 +1671,7 @@ msgid ""
 msgstr ""
 ".orig.tar.gz %s n'est pas <paquet>_<version_amont>.orig.tar.gz (%s demandé)"
 
-#: scripts/dpkg-source.pl:361
+#: scripts/dpkg-source.pl:363
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -1659,62 +1680,62 @@ msgstr ""
 "le fichier tar %s existe déjà, pas de modification, abandon ; utiliser -sU "
 "ou -sR."
 
-#: scripts/dpkg-source.pl:364
+#: scripts/dpkg-source.pl:366
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "impossible de vérifier l'existence de %s"
 
-#: scripts/dpkg-source.pl:367 scripts/dpkg-source.pl:432
-#: scripts/dpkg-source.pl:576
+#: scripts/dpkg-source.pl:369 scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:578
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s : construction de %s dans %s"
 
-#: scripts/dpkg-source.pl:369
+#: scripts/dpkg-source.pl:371
 msgid "write building tar message"
 msgstr "écriture du message concernant la construction du tar"
 
-#: scripts/dpkg-source.pl:373
+#: scripts/dpkg-source.pl:375
 msgid "fork for tar"
 msgstr "fork pour tar"
 
-#: scripts/dpkg-source.pl:375
+#: scripts/dpkg-source.pl:377
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr "chdir to above (orig) source %s"
 
-#: scripts/dpkg-source.pl:376
+#: scripts/dpkg-source.pl:378
 msgid "reopen gzip for tar"
 msgstr "reopen gzip for tar"
 
-#: scripts/dpkg-source.pl:378
+#: scripts/dpkg-source.pl:380
 msgid "exec tar"
 msgstr "exec tar"
 
-#: scripts/dpkg-source.pl:382
+#: scripts/dpkg-source.pl:384
 msgid "wait for tar"
 msgstr "wait for tar"
 
-#: scripts/dpkg-source.pl:385 scripts/dpkg-source.pl:539
+#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "impossible de modifier %s (nouvellement créé) en %s"
 
-#: scripts/dpkg-source.pl:387 scripts/dpkg-source.pl:541
+#: scripts/dpkg-source.pl:389 scripts/dpkg-source.pl:543
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "impossible de modifier les permissions de %s"
 
-#: scripts/dpkg-source.pl:391
+#: scripts/dpkg-source.pl:393
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr "%s : construction de %s à partir de %s"
 
-#: scripts/dpkg-source.pl:393
+#: scripts/dpkg-source.pl:395
 msgid "write using existing tar message"
 msgstr "write using existing tar message"
 
-#: scripts/dpkg-source.pl:403
+#: scripts/dpkg-source.pl:405
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -1723,487 +1744,482 @@ msgstr ""
 "le rep orig %s existe déjà, pas de modification, abandon ; utiliser -sA, -sK "
 "ou -sP."
 
-#: scripts/dpkg-source.pl:409
+#: scripts/dpkg-source.pl:411
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "impossible de vérifier l'existence du rep orig %s"
 
-#: scripts/dpkg-source.pl:418 scripts/dpkg-source.pl:748
+#: scripts/dpkg-source.pl:420 scripts/dpkg-source.pl:751
 #, perl-format
 msgid "unable to create `%s'"
 msgstr "impossible de créer %s"
 
-#: scripts/dpkg-source.pl:422 scripts/dpkg-source.pl:729
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:424 scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:757
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "impossible de modifier %s en %s"
 
-#: scripts/dpkg-source.pl:426 scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:428 scripts/dpkg-source.pl:759
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr "impossible de supprimer %s"
 
-#: scripts/dpkg-source.pl:434
+#: scripts/dpkg-source.pl:436
 msgid "write building diff message"
 msgstr "écriture du message concernant la construction du diff"
 
-#: scripts/dpkg-source.pl:439
+#: scripts/dpkg-source.pl:441
 msgid "fork for find"
 msgstr "fork pour find"
 
-#: scripts/dpkg-source.pl:441
+#: scripts/dpkg-source.pl:443
 #, perl-format
 msgid "chdir to %s for find"
 msgstr "chdir vers %s pour find"
 
-#: scripts/dpkg-source.pl:442
+#: scripts/dpkg-source.pl:444
 msgid "exec find"
 msgstr "exec find"
 
-#: scripts/dpkg-source.pl:451
+#: scripts/dpkg-source.pl:453
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "stat impossible pour le fichier %s"
 
-#: scripts/dpkg-source.pl:457
+#: scripts/dpkg-source.pl:459
 #, perl-format
 msgid "cannot read link %s"
 msgstr "impossible de lire le lien %s"
 
-#: scripts/dpkg-source.pl:459
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr "impossible de lire le lien orig %s"
 
-#: scripts/dpkg-source.pl:460 scripts/dpkg-source.pl:461
+#: scripts/dpkg-source.pl:462 scripts/dpkg-source.pl:463
 #, perl-format
 msgid "symlink to %s"
 msgstr "lien symbolique vers %s"
 
-#: scripts/dpkg-source.pl:465 scripts/dpkg-source.pl:526
+#: scripts/dpkg-source.pl:467 scripts/dpkg-source.pl:528
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr "stat impossible sur fichier orig %s"
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:470
 #, perl-format
 msgid "executable mode %04o of `%s' will not be represented in diff"
 msgstr "exécutable mode %04o de %s ne sera pas représenté dans le diff"
 
-#: scripts/dpkg-source.pl:472
+#: scripts/dpkg-source.pl:474
 #, perl-format
 msgid "special mode %04o of `%s' will not be represented in diff"
 msgstr "spécial mode %04o de %s ne sera pas représenté dans le diff"
 
-#: scripts/dpkg-source.pl:477 scripts/dpkg-source.pl:1269
+#: scripts/dpkg-source.pl:479 scripts/dpkg-source.pl:1275
 msgid "something else"
 msgstr "quelque chose d'autre"
 
-#: scripts/dpkg-source.pl:478
+#: scripts/dpkg-source.pl:480
 msgid "plain file"
 msgstr "simple fichier"
 
-#: scripts/dpkg-source.pl:481
+#: scripts/dpkg-source.pl:483
 msgid "fork for diff"
 msgstr "fork pour diff"
 
-#: scripts/dpkg-source.pl:489
+#: scripts/dpkg-source.pl:491
 msgid "exec diff"
 msgstr "exec diff"
 
-#: scripts/dpkg-source.pl:496
+#: scripts/dpkg-source.pl:498
 msgid "binary file contents changed"
 msgstr "contenu d'un fichier binaire modifié"
 
-#: scripts/dpkg-source.pl:501
+#: scripts/dpkg-source.pl:503
 #, 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:505
+#: scripts/dpkg-source.pl:507
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr "ligne inconnue dans diff -u sur %s : `%s'"
 
-#: scripts/dpkg-source.pl:507
+#: scripts/dpkg-source.pl:509
 msgid "failed to write to gzip"
 msgstr "failed to write to gzip"
 
-#: scripts/dpkg-source.pl:512
+#: scripts/dpkg-source.pl:514
 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:515
+#: scripts/dpkg-source.pl:517
 #, perl-format
 msgid "diff on %s"
 msgstr "diff sur %s"
 
-#: scripts/dpkg-source.pl:521
+#: scripts/dpkg-source.pl:523
 msgid "device or socket is not allowed"
 msgstr "périphérique ou socket, non autorisé"
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:530
 msgid "not a directory"
 msgstr "pas un répertoire"
 
-#: scripts/dpkg-source.pl:529
+#: scripts/dpkg-source.pl:531
 msgid "directory"
 msgstr "répertoire"
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:534
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr "type de fichier inconnu %s"
 
-#: scripts/dpkg-source.pl:536
+#: scripts/dpkg-source.pl:538
 msgid "finish write to gzip pipe"
 msgstr "fin de l'écriture sur pipe gzip"
 
-#: scripts/dpkg-source.pl:543
+#: scripts/dpkg-source.pl:545
 msgid "fork for 2nd find"
 msgstr "fork pour deuxième find"
 
-#: scripts/dpkg-source.pl:545
+#: scripts/dpkg-source.pl:547
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr "chdir vers %s pour deuxième find"
 
-#: scripts/dpkg-source.pl:546
+#: scripts/dpkg-source.pl:548
 msgid "exec 2nd find"
 msgstr "exécution du deuxième find"
 
-#: scripts/dpkg-source.pl:554
+#: scripts/dpkg-source.pl:556
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr "impossible de vérifier fichier orig %s"
 
-#: scripts/dpkg-source.pl:556
+#: scripts/dpkg-source.pl:558
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "suppression du fichier %s ignorée"
 
-#: scripts/dpkg-source.pl:558
+#: scripts/dpkg-source.pl:560
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "suppression du répertoire %s ignorée"
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:562
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "suppression du lien symbolique %s ignorée"
 
-#: scripts/dpkg-source.pl:562
+#: scripts/dpkg-source.pl:564
 msgid "not a file, directory or link"
 msgstr "ni un fichier ni un répertoire ni un lien symbolique"
 
-#: scripts/dpkg-source.pl:563 scripts/dpkg-source.pl:1265
+#: scripts/dpkg-source.pl:565 scripts/dpkg-source.pl:1271
 msgid "nonexistent"
 msgstr "inexistant"
 
-#: scripts/dpkg-source.pl:578
+#: scripts/dpkg-source.pl:580
 msgid "write building message"
 msgstr "écriture du message de construction"
 
-#: scripts/dpkg-source.pl:579
+#: scripts/dpkg-source.pl:581
 #, perl-format
 msgid "create %s"
 msgstr "création de %s"
 
-#: scripts/dpkg-source.pl:583
+#: scripts/dpkg-source.pl:586
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s : modifications non représentables des sources"
 
-#: scripts/dpkg-source.pl:585
+#: scripts/dpkg-source.pl:588
 #, perl-format
 msgid "write error msg: %s"
 msgstr "écriture du message d'erreur : %s"
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:597
 #, 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:596
+#: scripts/dpkg-source.pl:599
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x demande au moins un argument, le fichier .dsc"
 
-#: scripts/dpkg-source.pl:597
+#: scripts/dpkg-source.pl:600
 msgid "-x takes no more than two arguments"
 msgstr "-x ne prend pas plus de deux arguments"
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:604
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x demande le fichier .dsc comme premier argument, pas un répertoire"
 
-#: scripts/dpkg-source.pl:606
+#: scripts/dpkg-source.pl:609
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cible non compressée existe : %s"
 
-#: scripts/dpkg-source.pl:630
+#: scripts/dpkg-source.pl:633
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "impossible de vérifier la signature sur %s"
 
-#: scripts/dpkg-source.pl:634
+#: scripts/dpkg-source.pl:637
 #, 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:637
+#: scripts/dpkg-source.pl:640
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraction d'un paquet source non signé (%s)"
 
-#: scripts/dpkg-source.pl:641
-#, perl-format
-msgid "source control file %s"
-msgstr "fichier de contrôle des sources %s"
-
-#: scripts/dpkg-source.pl:646
+#: scripts/dpkg-source.pl:649
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "un champ de contrôle vital manque, %s"
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:655
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr "Format du fichier .dsc non reconnu, (%s)"
 
-#: scripts/dpkg-source.pl:681
+#: scripts/dpkg-source.pl:684
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr "Le champ Files contient un nom invalide, %s"
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:689
 #, 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:699
+#: scripts/dpkg-source.pl:702
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr "format de fichier non reconnu, %s"
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:706
 msgid "no tarfile in Files field"
 msgstr "pas de fichier tar dans le champ Files"
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:709
 msgid "multiple tarfiles in native package"
 msgstr "plusieurs fichiers tar dans un paquet natif"
 
-#: scripts/dpkg-source.pl:707
+#: scripts/dpkg-source.pl:710
 msgid "native package with .orig.tar"
 msgstr "paquet natif avec .orig.tar"
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:713
 msgid "no upstream tarfile in Files field"
 msgstr "pas de tar amont dans le champ Files"
 
-#: scripts/dpkg-source.pl:712
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr "plusieurs fichiers tar dans %s"
 
-#: scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:716
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr "debian.tar dans %s"
 
-#: scripts/dpkg-source.pl:722
+#: scripts/dpkg-source.pl:725
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s : extraction de %s dans %s"
 
-#: scripts/dpkg-source.pl:724
+#: scripts/dpkg-source.pl:727
 msgid "write extracting message"
 msgstr "écriture du message d'extraction"
 
-#: scripts/dpkg-source.pl:750
+#: scripts/dpkg-source.pl:753
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s : extraction de %s"
 
-#: scripts/dpkg-source.pl:764
+#: scripts/dpkg-source.pl:767
 #, 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:767
+#: scripts/dpkg-source.pl:770
 #, 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:780
+#: scripts/dpkg-source.pl:783
 msgid "unable to keep orig directory (already exists)"
 msgstr "impossible de garder répertoire orig, il existe déjà"
 
-#: scripts/dpkg-source.pl:814 scripts/dpkg-source.pl:870
+#: scripts/dpkg-source.pl:817 scripts/dpkg-source.pl:873
 #, perl-format
 msgid "cannot stat %s"
 msgstr "stat de %s impossible"
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:819
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr "impossible de créer le sous-répertoire %s"
 
-#: scripts/dpkg-source.pl:819
+#: scripts/dpkg-source.pl:822
 #, 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:828
+#: scripts/dpkg-source.pl:831
 #, 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:833
+#: scripts/dpkg-source.pl:836
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "impossible de modifier le fichier sauvegardé %s en %s"
 
-#: scripts/dpkg-source.pl:837
+#: scripts/dpkg-source.pl:840
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s : %s"
 
-#: scripts/dpkg-source.pl:842 scripts/dpkg-source.pl:1145
+#: scripts/dpkg-source.pl:845 scripts/dpkg-source.pl:1149
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr "impossible d'ouvrir %s"
 
-#: scripts/dpkg-source.pl:845
+#: scripts/dpkg-source.pl:848
 msgid "fork for patch"
 msgstr "fork pour patch"
 
-#: scripts/dpkg-source.pl:847
+#: scripts/dpkg-source.pl:850
 msgid "reopen gzip for patch"
 msgstr "réouverture de gzip pour patch"
 
-#: scripts/dpkg-source.pl:848
+#: scripts/dpkg-source.pl:851
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr "chdir vers %s pour patch"
 
-#: scripts/dpkg-source.pl:852
+#: scripts/dpkg-source.pl:855
 msgid "exec patch"
 msgstr "exec patch"
 
-#: scripts/dpkg-source.pl:855
+#: scripts/dpkg-source.pl:858
 msgid "wait for patch"
 msgstr "attente patch"
 
-#: scripts/dpkg-source.pl:864
+#: scripts/dpkg-source.pl:867
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "impossible de modifier la date de %s"
 
-#: scripts/dpkg-source.pl:866
+#: scripts/dpkg-source.pl:869
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "suppression du fichier de sauvegarde %s"
 
-#: scripts/dpkg-source.pl:871
+#: scripts/dpkg-source.pl:874
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: scripts/dpkg-source.pl:874
+#: scripts/dpkg-source.pl:877
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "impossible de rendre %s exécutable"
 
-#: scripts/dpkg-source.pl:876
+#: scripts/dpkg-source.pl:879
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s n'est pas un fichier normal"
 
-#: scripts/dpkg-source.pl:880
+#: scripts/dpkg-source.pl:883
 msgid "cannot stat `.'"
 msgstr "stat de « . » impossible"
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:889
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr "stat de l'objet extrait %s impossible"
 
-#: scripts/dpkg-source.pl:895
+#: scripts/dpkg-source.pl:898
 #, 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:899
+#: scripts/dpkg-source.pl:902
 #, 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:909
+#: scripts/dpkg-source.pl:913
 #, perl-format
 msgid "cannot read %s"
 msgstr "impossible de lire %s"
 
-#: scripts/dpkg-source.pl:910
+#: scripts/dpkg-source.pl:914
 #, perl-format
 msgid "cannot fstat %s"
 msgstr "fstat de %s impossible"
 
-#: scripts/dpkg-source.pl:911
+#: scripts/dpkg-source.pl:915
 #, 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:914
+#: scripts/dpkg-source.pl:918
 #, 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:915
+#: scripts/dpkg-source.pl:919
 msgid "reopen stdin from /dev/null"
 msgstr "réouverture de stdin depuis /dev/null"
 
-#: scripts/dpkg-source.pl:922
+#: scripts/dpkg-source.pl:926
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr "stat du répertoire %s impossible (avant suppression)"
 
-#: scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:932
 #, 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:930
+#: scripts/dpkg-source.pl:934
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr "rm -rf n'a pas supprimé %s"
 
-#: scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:948
 msgid "fork for cpio"
 msgstr "fork pour cpio"
 
-#: scripts/dpkg-source.pl:948
+#: scripts/dpkg-source.pl:952
 msgid "reopen gzip for cpio"
 msgstr "réouverture de gzip pour cpio"
 
-#: scripts/dpkg-source.pl:950
+#: scripts/dpkg-source.pl:954
 msgid "exec cpio"
 msgstr "exec cpio"
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:968
 #, 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:972
+#: scripts/dpkg-source.pl:976
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
@@ -2213,7 +2229,7 @@ msgstr ""
 "Votre version de cpio est sans doute ancienne. Cela fonctionne avec GNU cpio "
 "2.4.2-2."
 
-#: scripts/dpkg-source.pl:980
+#: scripts/dpkg-source.pl:984
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
@@ -2222,80 +2238,80 @@ 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:989
+#: scripts/dpkg-source.pl:993
 #, 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:996
+#: scripts/dpkg-source.pl:1000
 #, 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:1024
+#: scripts/dpkg-source.pl:1028
 msgid "fork for tar -t"
 msgstr "fork pour tar -t"
 
-#: scripts/dpkg-source.pl:1028
+#: scripts/dpkg-source.pl:1032
 msgid "reopen gzip for tar -t"
 msgstr "réouverture de gzip pour tar -t"
 
-#: scripts/dpkg-source.pl:1029
+#: scripts/dpkg-source.pl:1033
 msgid "exec tar -vvtf -"
 msgstr "exec tar -vvtf -"
 
-#: scripts/dpkg-source.pl:1039
+#: scripts/dpkg-source.pl:1043
 #, 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:1046
+#: scripts/dpkg-source.pl:1050
 #, 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:1056
+#: scripts/dpkg-source.pl:1060
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'"
 msgstr "le fichier tar %s contient une entrée incomplète %s"
 
-#: scripts/dpkg-source.pl:1079
+#: scripts/dpkg-source.pl:1083
 #, perl-format
 msgid "filename `%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 "le nom %s a été tronqué par cpio, impossible de vérifier le nom complet."
 
-#: scripts/dpkg-source.pl:1086
+#: scripts/dpkg-source.pl:1090
 #, 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:1095
+#: scripts/dpkg-source.pl:1099
 #, 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:1100
+#: scripts/dpkg-source.pl:1104
 #, 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:1104
+#: scripts/dpkg-source.pl:1108
 #, 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:1109
+#: scripts/dpkg-source.pl:1113
 #, 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:1118
+#: scripts/dpkg-source.pl:1122
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
@@ -2304,132 +2320,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:1157 scripts/dpkg-source.pl:1194
-#: scripts/dpkg-source.pl:1203
+#: scripts/dpkg-source.pl:1161 scripts/dpkg-source.pl:1198
+#: scripts/dpkg-source.pl:1207
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr "le caractère nouvelle ligne manque dans diff %s"
 
-#: scripts/dpkg-source.pl:1158
+#: scripts/dpkg-source.pl:1162
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "dans la ligne %d du diff %s, « ^--- » attendu"
 
-#: scripts/dpkg-source.pl:1161
+#: scripts/dpkg-source.pl:1165
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr "diff %s et fichier sans sous-répertoire"
 
-#: scripts/dpkg-source.pl:1163
+#: scripts/dpkg-source.pl:1167
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "diff %s et fichier dont le nom de termine par .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1167
+#: scripts/dpkg-source.pl:1171
 #, 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:1171 scripts/dpkg-source.pl:1177
+#: scripts/dpkg-source.pl:1175 scripts/dpkg-source.pl:1181
 #, 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:1185
+#: scripts/dpkg-source.pl:1189
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diff %s et objet qui n'est pas un fichier normal"
 
-#: scripts/dpkg-source.pl:1187
+#: scripts/dpkg-source.pl:1191
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diff et correction en double du fichier %s"
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1201
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr "^@@ attendu ligne %d du diff %s"
 
-#: scripts/dpkg-source.pl:1202
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "fin inattendue de diff %s"
 
-#: scripts/dpkg-source.pl:1208
+#: scripts/dpkg-source.pl:1212
 #, 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:1211
+#: scripts/dpkg-source.pl:1215
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "^@@ attendu ligne %d du diff %s"
 
-#: scripts/dpkg-source.pl:1221
+#: scripts/dpkg-source.pl:1225
 msgid "fork for tar -xkf -"
 msgstr "fork pour tar -xkf -"
 
-#: scripts/dpkg-source.pl:1223
+#: scripts/dpkg-source.pl:1227
 msgid "reopen gzip for tar -xkf -"
 msgstr "réouverture de gzip pour tar -xkf -"
 
-#: scripts/dpkg-source.pl:1225
+#: scripts/dpkg-source.pl:1229
 #, 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:1226
+#: scripts/dpkg-source.pl:1230
 msgid "exec tar -xkf -"
 msgstr "exec tar -xkf -"
 
-#: scripts/dpkg-source.pl:1229
+#: scripts/dpkg-source.pl:1233
 msgid "wait for tar -xkf -"
 msgstr "attente tar -xkf -"
 
-#: scripts/dpkg-source.pl:1233
+#: scripts/dpkg-source.pl:1237
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr "impossible d'ouvrir le répertoire %s"
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1239
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr "impossible de fermer le répertoire %s"
 
-#: scripts/dpkg-source.pl:1238 scripts/dpkg-source.pl:1247
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1242 scripts/dpkg-source.pl:1251
+#: scripts/dpkg-source.pl:1256
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr "impossible de modifier %s en %s"
 
-#: scripts/dpkg-source.pl:1243
+#: scripts/dpkg-source.pl:1247
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr "mkdir %s impossible"
 
-#: scripts/dpkg-source.pl:1260
+#: scripts/dpkg-source.pl:1264
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr "reopen stderr for tar to grep out blocks message"
 
-#: scripts/dpkg-source.pl:1267
+#: scripts/dpkg-source.pl:1273
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr "checktype %s (%s)"
 
-#: scripts/dpkg-source.pl:1275
+#: scripts/dpkg-source.pl:1281
 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:1280
+#: scripts/dpkg-source.pl:1286
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr "%s : cannot represent change to %s : %s"
 
-#: scripts/dpkg-source.pl:1282 scripts/dpkg-source.pl:1291
+#: scripts/dpkg-source.pl:1288 scripts/dpkg-source.pl:1297
 msgid "write syserr unrep"
 msgstr "write syserr unrep"
 
-#: scripts/dpkg-source.pl:1287
+#: scripts/dpkg-source.pl:1293
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2440,80 +2456,85 @@ msgstr ""
 "%s :  la nouvelle version est %s\n"
 "%s :  l'ancienne version est %s\n"
 
-#: scripts/dpkg-source.pl:1296
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid "create file %s"
 msgstr "création du fichier %s"
 
-#: scripts/dpkg-source.pl:1297
+#: scripts/dpkg-source.pl:1303
 msgid "pipe for gzip"
 msgstr "pipe for gzip"
 
-#: scripts/dpkg-source.pl:1298
+#: scripts/dpkg-source.pl:1304
 msgid "fork for gzip"
 msgstr "fork for gzip"
 
-#: scripts/dpkg-source.pl:1300
+#: scripts/dpkg-source.pl:1306
 msgid "reopen gzip pipe"
 msgstr "reopen gzip pipe"
 
-#: scripts/dpkg-source.pl:1301
+#: scripts/dpkg-source.pl:1307
 msgid "reopen tar.gz"
 msgstr "reopen tar.gz"
 
-#: scripts/dpkg-source.pl:1302
+#: scripts/dpkg-source.pl:1308
 msgid "exec gzip"
 msgstr "exec gzip"
 
-#: scripts/dpkg-source.pl:1311
+#: scripts/dpkg-source.pl:1325
+#, fuzzy, perl-format
+msgid "unknown compression type on file %s"
+msgstr "option inconnue %s"
+
+#: scripts/dpkg-source.pl:1328
 #, perl-format
 msgid "read file %s"
 msgstr "lecture du fichier %s"
 
-#: scripts/dpkg-source.pl:1312
+#: scripts/dpkg-source.pl:1329
 #, perl-format
 msgid "pipe for %s"
 msgstr "pipe pour %s"
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1330
 #, perl-format
 msgid "fork for %s"
 msgstr "fork for %s"
 
-#: scripts/dpkg-source.pl:1315
+#: scripts/dpkg-source.pl:1332
 #, perl-format
 msgid "reopen %s pipe"
 msgstr "reopen %s pipe"
 
-#: scripts/dpkg-source.pl:1316
+#: scripts/dpkg-source.pl:1333
 msgid "reopen input file"
 msgstr "réouverture du fichier d'entrée"
 
-#: scripts/dpkg-source.pl:1317
+#: scripts/dpkg-source.pl:1334
 #, perl-format
 msgid "exec %s"
 msgstr "exec %s"
 
-#: scripts/dpkg-source.pl:1324
+#: scripts/dpkg-source.pl:1341
 msgid "wait for gzip"
 msgstr "attente gzip"
 
-#: scripts/dpkg-source.pl:1334
+#: scripts/dpkg-source.pl:1351
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "fichier %s ajouté deux fois"
 
-#: scripts/dpkg-source.pl:1335
+#: scripts/dpkg-source.pl:1352
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr "stat du fichier %s impossible"
 
-#: scripts/dpkg-source.pl:1356
+#: scripts/dpkg-source.pl:1373
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr "caractère anormal \\%s dans `%s'"
 
-#: scripts/changelog/debian.pl:38
+#: scripts/changelog/debian.pl:37
 #, perl-format
 msgid ""
 "Usage: %s [<option>]\n"
@@ -2532,77 +2553,77 @@ msgstr ""
 "   -h, --help           afficher ce message d'aide.\n"
 "       --version        afficher la version du programme.\n"
 
-#: scripts/changelog/debian.pl:80
+#: scripts/changelog/debian.pl:79
 msgid "-v<since> option specifies most recent version"
 msgstr "l'option -v<since> indique la version la plus récente"
 
-#: scripts/changelog/debian.pl:87
+#: scripts/changelog/debian.pl:86
 #, perl-format
 msgid "found start of entry where expected %s"
 msgstr "début d'une entrée trouvé, %s attendu"
 
-#: scripts/changelog/debian.pl:93
+#: scripts/changelog/debian.pl:92
 #, perl-format
 msgid "bad key-value after `;': `%s'"
 msgstr "mauvaise clé-valeur après « ; » : %s"
 
-#: scripts/changelog/debian.pl:95
+#: scripts/changelog/debian.pl:94
 #, perl-format
 msgid "repeated key-value %s"
 msgstr "clé-valeur répété %s"
 
-#: scripts/changelog/debian.pl:98
+#: scripts/changelog/debian.pl:97
 msgid "badly formatted urgency value"
 msgstr "valeur urgency mal formée"
 
-#: scripts/changelog/debian.pl:102
+#: scripts/changelog/debian.pl:101
 #, perl-format
 msgid "unknown urgency value %s - comparing very low"
 msgstr "valeur urgency %s inconnue ; comparaison très basse"
 
-#: scripts/changelog/debian.pl:105
+#: scripts/changelog/debian.pl:104
 #, perl-format
 msgid "urgency >%s<"
 msgstr "urgency >%s<"
 
-#: scripts/changelog/debian.pl:123
+#: scripts/changelog/debian.pl:122
 #, perl-format
 msgid "unknown key-value key %s - copying to %s"
 msgstr "clé inconnue %s, copie dans %s"
 
-#: scripts/changelog/debian.pl:130
+#: scripts/changelog/debian.pl:129
 msgid "badly formatted heading line"
 msgstr "ligne de tête mal formée"
 
-#: scripts/changelog/debian.pl:133
+#: scripts/changelog/debian.pl:132
 #, perl-format
 msgid "found trailer where expected %s"
 msgstr "ligne de fin trouvée, attendu %s"
 
-#: scripts/changelog/debian.pl:140
+#: scripts/changelog/debian.pl:139
 msgid "badly formatted trailer line"
 msgstr "ligne de fin mal formée"
 
-#: scripts/changelog/debian.pl:143
+#: scripts/changelog/debian.pl:142
 #, perl-format
 msgid "found change data where expected %s"
 msgstr "changements trouvés, %s attendu"
 
-#: scripts/changelog/debian.pl:149
+#: scripts/changelog/debian.pl:148
 #, perl-format
 msgid "found blank line where expected %s"
 msgstr "ligne blanche trouvée, attendu %s"
 
-#: scripts/changelog/debian.pl:152
+#: scripts/changelog/debian.pl:151
 msgid "unrecognised line"
 msgstr "ligne non reconnue"
 
-#: scripts/changelog/debian.pl:156
+#: scripts/changelog/debian.pl:155
 #, perl-format
 msgid "found eof where expected %s"
 msgstr "eof trouvé, %s attendu"
 
-#: scripts/changelog/debian.pl:170 scripts/changelog/debian.pl:175
+#: scripts/changelog/debian.pl:169 scripts/changelog/debian.pl:174
 #, perl-format
 msgid "%s, at file %s line %d"
 msgstr "%s, fichier %s ligne %d"
@@ -2610,8 +2631,5 @@ msgstr "%s, fichier %s ligne %d"
 #~ msgid "%s: %s"
 #~ msgstr "%s : %s"
 
-#~ msgid "unknown option %s"
-#~ msgstr "option inconnue %s"
-
 #~ msgid "unknown option or argument `%s'"
 #~ msgstr "option ou argument inconnu %s"
-- 
2.39.5